Merge branches 'dev_aliyun' and 'dev_item_bank' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_item_bank

app/templates/shixun_work/shixun_work.html.erb

@@ -101,6 +101,7 @@
         </table>
       </div>
 
+      <% if @work.myshixun.present? %>
         <div class="bor-grey-e mt20">
           <p class="pt10 pb10 pl15 pr15 clearfix bor-bottom-greyE">
             <span class="fl font-bd">图形统计</span>
@@ -224,6 +225,7 @@
             </div>
           <% end %>
         </div>
+      <% end %>
 
     </div>
   </body>
@@ -261,6 +263,7 @@
 
 
       // 基于准备好的dom，初始化echarts实例
+      if(document.getElementById('shixun_skill_chart')){
           var effChart = echarts.init(document.getElementById('shixun_skill_chart'));
           // 指定图表的配置项和数据
           var option = {
@@ -357,6 +360,9 @@
           // 使用刚指定的配置项和数据显示图表
           effChart.setOption(option);
           console.debug(<%= @myself_consume %>);
+      }
+
+        if(document.getElementById('shixun_skill_chart')) {
             var ablChart = echarts.init(document.getElementById('shixun_overall_ablility_chart'));
             var dataBJ = <%= @echart_data[:consume_list] %>;
             var schema = [
@@ -471,5 +477,6 @@
             // 使用刚指定的配置项和数据显示图表。
             ablChart.setOption(option1);
         }
+    }
   </script>
 </html>

lib/tasks/print_date.rake

@@ -0,0 +1,7 @@
+namespace :print_date do
+  desc "print date"
+
+  task :print => :environment do
+    Rails.logger.info("#{Time.now}")
+  end
+end

lib/tasks/zip_pack.rake

@@ -1,7 +1,7 @@
 # 执行示例  bundle exec rake zip_pack:shixun_pack args=123,2323
 namespace :zip_pack do
   desc "手工打包作品"
-  OUTPUT_FOLDER = "#{Rails.root}/files/archiveZip"
+  OUTPUT_FOLDER = "/tmp"
 
   task :shixun_pack => :environment do
 
@@ -19,11 +19,12 @@ namespace :zip_pack do
         student_works = homework.score_student_works
 
         if student_works.size > 0
+          pdfs = []
           Zip::File.open(zipfile_name, Zip::File::CREATE) do |zip|
             student_works.find_each.map do |student_work|
               export = ExportShixunReportService.new(homework, student_work)
               pdf = export.to_pdf
-              # pdfs << pdf
+              pdfs << pdf
               begin
                 zip.add(export.filename, pdf.path)
               rescue => ex

public/react/src/modules/tpm/TPMBanner.js

@@ -135,6 +135,13 @@ class TPMBanner extends Component {
               this.setState({
                 openknow:true
               })
+              setTimeout(()=>{
+                this.openknow()
+                this.setState({
+                  openknow:false
+                })
+              }, 10000);
+
             }else{
               this.setState({
                 openknow:false
@@ -158,6 +165,12 @@ class TPMBanner extends Component {
               this.setState({
                 openshowpublictype: true
               })
+              setTimeout(()=>{
+                this.openshowpublic()
+                this.setState({
+                  openshowpublictype:false
+                })
+              }, 10000);
             } else {
               this.setState({
                 openshowpublictype: false

public/react/src/modules/tpm/TPMIndex.js

@@ -163,7 +163,7 @@ class TPMIndex extends Component {
         openknows:false
       })
       let newTPMsettings=this.props.user&&this.props.user.user_id+'newTPMsettings'
-      storage.setItem(newTPMsettings,true);
+      storage.setItem(newTPMsettings,false);
     }
 
 
@@ -174,7 +174,7 @@ class TPMIndex extends Component {
           let newTPMsettings=window.localStorage.getItem(getnewTPMsettings)
           if(newTPMsettings===undefined||newTPMsettings===false||newTPMsettings===null){
             this.setState({
-              openknows:true
+              openknows:false
             })
           }else{
             this.setState({
@@ -453,20 +453,20 @@ class TPMIndex extends Component {
                         {	this.state.is_jupyter===false? <Menu.Item key="8" className={"competitionmr50"}>
                           <span className={"tpmbannernavstyler"}>排行榜</span>
                         </Menu.Item>:""}
-                        {this.state.identity >4||this.state.identity===undefined ? "":this.state.openknows===true?<span>
-                         <Popover
-                              content={
-                                <pre className={"bannerpd201"}>
-                                  <div>更多设置在这里，点击“配置”看一看~</div>
-                                  <div className={"wechatcenter mt15"}><Button  type="primary" onClick={this.openknow} >我知道了</Button></div>
-                                </pre>
-                              }
-                              trigger="click"
-                              placement="top"
-                              visible={this.state.openknows}
-                            >
-                          </Popover>
-                        </span>:""}
+                        {/*{this.state.identity >4||this.state.identity===undefined ? "":this.state.openknows===true?<span>*/}
+                        {/* <Popover*/}
+                        {/*      content={*/}
+                        {/*        <pre className={"bannerpd201"}>*/}
+                        {/*          <div>更多设置在这里，点击“配置”看一看~</div>*/}
+                        {/*          <div className={"wechatcenter mt15"}><Button  type="primary" onClick={this.openknow} >我知道了</Button></div>*/}
+                        {/*        </pre>*/}
+                        {/*      }*/}
+                        {/*      trigger="click"*/}
+                        {/*      placement="top"*/}
+                        {/*      visible={this.state.openknows}*/}
+                        {/*    >*/}
+                        {/*  </Popover>*/}
+                        {/*</span>:""}*/}
 
                         {this.state.identity >4||this.state.identity===undefined ? "":
                           <Menu.Item key="9" className={"competitionmr50"}>

public/react/src/modules/tpm/jupyter/index.js

@@ -367,7 +367,7 @@ function JupyterTPI (props) {
           <span className="title_time jupytertitle_time">
             <Countdown value={jupytertime} format="HH:mm:ss" onFinish={onFinish}/>
         	<span className={"Countdowntypes"}>
-            {endjupytertime===false?"":<Countdown value={endjupytertime} format="HH:mm:ss" onFinish={endonFinish}/>}
+            {/*{endjupytertime===false?"":<Countdown value={endjupytertime} format="HH:mm:ss" onFinish={endonFinish}/>}*/}
 					</span>
           </span>
         </p>

public/react/src/modules/tpm/shixunchild/Challenges/Challengesjupyter.js

@@ -550,7 +550,7 @@ class Challengesjupyter extends Component {
 					<span className={"Countdowntypes"}>
 								{/*this.state.jupytertime*/}
 						    <Countdown value={this.state.jupytertime} format="HH:mm:ss" onFinish={this.onFinish}/>
-								{endtimes===false?"":<Countdown value={endtimes} format="HH:mm:ss" onFinish={this.onendFinish}/>}
+								{/*{endtimes===false?"":<Countdown value={endtimes} format="HH:mm:ss" onFinish={this.onendFinish}/>}*/}
 					</span>
 
 					<p className="clearfix mb20 edu-back-white">