Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

# Conflicts:
#	public/react/src/modules/courses/new/CoursesNew.js
#	public/react/src/modules/courses/new/Goldsubject.js

app/assets/javascripts/admins/identity_authentications/index.js

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-identity-authentications-index-page').length > 0) {
     var $searchFrom = $('.identity-authentication-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

app/assets/javascripts/admins/professional_authentications/index.js

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-professional-authentications-index-page').length > 0) {
     var $searchFrom = $('.professional-authentication-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

app/assets/javascripts/admins/shixun_authorizations/index.js

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-shixun-authorizations-index-page').length > 0) {
     var $searchFrom = $('.shixun-authorization-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

app/assets/javascripts/admins/subject_authorizations/index.js

@@ -1,6 +1,7 @@
 $(document).on('turbolinks:load', function() {
   if ($('body.admins-subject-authorizations-index-page').length > 0) {
     var $searchFrom = $('.subject-authorization-list-form');
+    $searchFrom.find('select[name="status"]').val('pending');
 
     $searchFrom.on('click', '.search-form-tab', function(){
       var $link = $(this);
@@ -12,6 +13,7 @@ $(document).on('turbolinks:load', function() {
         $searchFrom.find('.status-filter').show();
       } else {
         $searchFrom.find('.status-filter').hide();
+        $searchFrom.find('select[name="status"]').val('pending');
       }
     });
   }

app/controllers/challenges_controller.rb

@@ -74,6 +74,7 @@ class ChallengesController < ApplicationController
               ChallengeTag.create(:name => tag, :challenge_choose_id => @challenge_choose.id, :challenge_id => @challenge.id)
             end
           end
+          @challenge.update_column(:score, @challenge.challenge_chooses.sum(:score))
         end
       rescue Exception => e
         raise ActiveRecord::Rollback
@@ -95,6 +96,7 @@ class ChallengesController < ApplicationController
         @challenge.update_column(:modify_time, Time.now)
       end
       @challenge_choose.update_attributes(chooce_params)
+      @challenge.update_column(:score, @challenge.challenge_chooses.sum(:score))
       # 单选多选题的更新
       category = @challenge_choose.standard_answer.length > 1 ? 2 : 1
         @challenge_choose.update_column(:category, category)
@@ -208,6 +210,9 @@ class ChallengesController < ApplicationController
           # 测试集的
           @shixun.myshixuns.update_all(:system_tip => 0)
         end
+        if params[:challenge][:show_type].to_i == -1
+          @challenge.update_attributes(picture_path: nil, web_route: nil, expect_picture_path: nil, original_picture_path: nil)
+        end
         # 关卡评测执行文件如果被修改，需要修改脚本内容
         script = modify_shixun_script @shixun, @shixun.evaluate_script
         @shixun.shixun_info.update_column(:evaluate_script, script)

app/controllers/games_controller.rb

@@ -739,7 +739,7 @@ class GamesController < ApplicationController
     experience = 0
     game_status = @game.status
     had_done = @game.had_done
-    game_challenge = Challenge.select([:id, :score, :position, :shixun_id, :web_route]).find(@game.challenge_id)
+    game_challenge = Challenge.select([:id, :score, :position, :shixun_id, :web_route, :show_type]).find(@game.challenge_id)
 
     if params[:resubmit].blank?   # 非重新评测
       if game_status == 2  # 通关
@@ -768,6 +768,7 @@ class GamesController < ApplicationController
     picture = (@game.picture_path.nil? ? 0 : @game.id)
     # 针对web类型的实训
     web_route = game_challenge.try(:web_route)
+
     mirror_name = @shixun.mirror_name
 
     e_record = EvaluateRecord.where(:identifier => sec_key).first
@@ -970,7 +971,7 @@ class GamesController < ApplicationController
     game.update_attribute(:status, 0) if game.status == 1
     game.update_attributes(status: 0, open_time: Time.now) if game.status == 3
     # 开启实训更新myshixuns的时间，方便跟踪用于的学习进度。
-    game.myshixun.update_column(:update_at, Time.now)
+    game.myshixun.update_column(:updated_at, Time.now)
   end
 
 end

app/controllers/subjects_controller.rb

@@ -101,8 +101,9 @@ class SubjectsController < ApplicationController
     @tags = ChallengeTag.where(challenge_id: challenge_ids).pluck(:name).uniq
     # 用户获取的实训标签
     # @user_tags = @subject.shixuns.map(&:user_tags_name).flatten.uniq
-    @user_tags = user_shixun_tags challenge_ids, @user.id
-    @my_subject_progress = @subject.my_subject_progress
+
+    # 用户进展
+    user_subject_progress(challenge_ids)
   end
 
   def new
@@ -436,4 +437,33 @@ class SubjectsController < ApplicationController
       tip_exception("403", "")
     end
   end
+
+  # 用户进展和获取的标签
+  def user_subject_progress challenge_ids
+    pass_games = Game.select(:id, :cost_time, :challenge_id).where(status: 2, user_id: current_user.id, challenge_id: challenge_ids) if current_user.logged?
+    @all_score = Challenge.where(id: challenge_ids).sum(:score)
+
+    # 如果没有通关的，没必要再继续统计了
+    if pass_games.blank?
+      @my_score = 0
+      @learned = 0
+      @time = 0
+      @user_tags = []
+    else
+      pass_challenge_ids = pass_games.map(&:challenge_id)
+      subject_challenge_count = @subject.shixuns.sum(:challenges_count)
+      # 用户通关获得的标签
+      @user_tags = ChallengeTag.where(challenge_id: pass_challenge_ids).pluck(:name)
+      # 用户学习进度
+      @learned =
+          subject_challenge_count == 0 ? 0 :
+              ((pass_challenge_ids.size.to_f / subject_challenge_count).round(2) * 100).to_i
+      # 用户通关分数
+      @my_score = Challenge.where(id: pass_challenge_ids).pluck(:score).sum
+      @time = pass_games.map(&:cost_time).sum
+    end
+
+
+  end
+
 end

app/views/exercise_questions/_exercise_questions.json.jbuilder

@@ -20,10 +20,20 @@ if question.question_type <= 2  #当为选择题或判断题时，只显示选
       #TODO: 旧版本来一个题只有一个标准答案的，新版又做成了一个题有多个标准答案（exercise_choice_id存放的是标准答案的位置..）
       standard_answer_b = standard_answers_array.join("").include?(a.choice_position.to_s)
       user_answer_b = user_answer.include?(a.id)
+      choice_text = a.choice_text
+      if question.question_type == 2
+        if choice_text == "对"
+          choice_text = "正确"
+        end
+        if choice_text == "错"
+          choice_text = "错误"
+        end
+      end
       json.c_position (index+1) if ex_choice_random_boolean  #当选项随机时，选项位置以此为准，否则不出现
       json.choice_id a.id
       # json.choice_text (edit_type.present? || question.question_type == 2) ? a.choice_text : "#{(index+65).chr}.#{a.choice_text}"
-      json.choice_text a.choice_text
+
+      json.choice_text choice_text
       json.choice_position a.choice_position
       if exercise_type == 1 || exercise_type == 4  #1为教师编辑/预览 试卷或问题，2为空白试卷，即标准答案和用户答案都不显示，3为用户开始答题的显示，4为老师评阅试卷或学生在截止后查看试卷
         json.standard_boolean standard_answer_b
@@ -36,6 +46,14 @@ if question.question_type <= 2  #当为选择题或判断题时，只显示选
 
   if exercise_type == 1 || exercise_type == 4   #1为老师，4为试卷截止且答案公开的情况
     json.standard_answer standard_answers_array
+    if question.question_type == 2   #返回答案的文字
+      standard_text = standard_answers_array.first.to_i == 1 ? "正确" : "错误"
+    else
+      array_text_answer = []
+      standard_answers_array.each{|a| array_text_answer.push((a+64).chr)}
+      standard_text = array_text_answer.join("")
+    end
+    json.standard_answer_show  standard_text
   end
   if exercise_type == 3 || exercise_type == 4
     json.user_answer user_answer

app/views/subjects/right_banner.json.jbuilder

@@ -14,8 +14,8 @@ end
 
 # 我的进展
 json.progress do
-  json.my_score @subject.my_subject_score
-  json.all_score @subject.all_score
-  json.learned @subject.my_subject_progress
-  json.time  @subject.my_consume_time
+  json.my_score @my_score
+  json.all_score @all_score
+  json.learned @learned
+  json.time @time
 end

config/environments/development.rb

@@ -55,6 +55,8 @@ Rails.application.configure do
   # Suppress logger output for asset requests.
   config.assets.quiet = true
 
+  # config.assets.prefix = '/dev-assets'
+
   # Raises error for missing translations
   # config.action_view.raise_on_missing_translations = true
 

config/initializers/assets.rb

@@ -11,4 +11,4 @@ Rails.application.config.assets.paths << Rails.root.join('node_modules')
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in the app/assets
 # folder are already added.
-Rails.application.config.assets.precompile += %w( admin.js admin.scss )
+Rails.application.config.assets.precompile += %w( admin.js admin.css )

public/assets/.sprockets-manifest-1c370772f16743f825981ab0e5c94237.json

@@ -0,0 +1 @@
+{"files":{"admin-6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d.js":{"logical_path":"admin.js","mtime":"2019-08-26T15:21:11+08:00","size":907839,"digest":"6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d","integrity":"sha256-ZXXxOZlT+xk1wDenuL0oxK/we3C+2bQfr2iZqJr0tX0="},"admin-8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5.css":{"logical_path":"admin.css","mtime":"2019-08-26T15:21:47+08:00","size":655571,"digest":"8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5","integrity":"sha256-iisDy4oFXcY/RUQ7MEyudzgjMb66VbFXCz08iqQkQtU="},"font-awesome/fontawesome-webfont-7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979.eot":{"logical_path":"font-awesome/fontawesome-webfont.eot","mtime":"2019-08-14T17:22:43+08:00","size":165742,"digest":"7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979","integrity":"sha256-e/yrbbmdXPvxcFygU23ceFhUMsxfpBu9etDwCQM7KXk="},"font-awesome/fontawesome-webfont-2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe.woff2":{"logical_path":"font-awesome/fontawesome-webfont.woff2","mtime":"2019-08-14T17:22:43+08:00","size":77160,"digest":"2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe","integrity":"sha256-Kt78vAQefRj88tQXh53FoJmXqmTWdbejxLbOM9oT8/4="},"font-awesome/fontawesome-webfont-ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07.woff":{"logical_path":"font-awesome/fontawesome-webfont.woff","mtime":"2019-08-14T17:22:43+08:00","size":98024,"digest":"ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07","integrity":"sha256-ugxZ3rVFD1y0Gz+TYJ7i0NmVQVh33foiPoqKdTNHTwc="},"font-awesome/fontawesome-webfont-aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8.ttf":{"logical_path":"font-awesome/fontawesome-webfont.ttf","mtime":"2019-08-14T17:22:43+08:00","size":165548,"digest":"aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8","integrity":"sha256-qljzPyOaD7AvXHpsRcBD16msmgkzNYBmlOzW1O3A1qg="},"font-awesome/fontawesome-webfont-ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4.svg":{"logical_path":"font-awesome/fontawesome-webfont.svg","mtime":"2019-08-14T17:22:43+08:00","size":444379,"digest":"ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4","integrity":"sha256-rWFXkmwWIrpOHQPUePFUE2hSS/xG9R5C/g2UX37zI+Q="},"logo-7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423.png":{"logical_path":"logo.png","mtime":"2019-08-21T15:10:12+08:00","size":2816,"digest":"7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423","integrity":"sha256-f/ESVocJv5f5iY/ockm3qPIA/x9I1TfYWvhyFfGHBCM="},"application-a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533.js":{"logical_path":"application.js","mtime":"2019-08-26T15:21:11+08:00","size":1042232,"digest":"a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533","integrity":"sha256-o6TzVJ1oZwVyuwdwDIWprBHlNu3HP+9udIlyO/U15TM="},"application-a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46.css":{"logical_path":"application.css","mtime":"2019-08-26T15:21:47+08:00","size":1182859,"digest":"a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46","integrity":"sha256-p1CLiOtqaaWzAWAr3cFHRc7AmFPqfZHG+uhWuW54j0Y="}},"assets":{"admin.js":"admin-6575f1399953fb1935c037a7b8bd28c4aff07b70bed9b41faf6899a89af4b57d.js","admin.css":"admin-8a2b03cb8a055dc63f45443b304cae77382331beba55b1570b3d3c8aa42442d5.css","font-awesome/fontawesome-webfont.eot":"font-awesome/fontawesome-webfont-7bfcab6db99d5cfbf1705ca0536ddc78585432cc5fa41bbd7ad0f009033b2979.eot","font-awesome/fontawesome-webfont.woff2":"font-awesome/fontawesome-webfont-2adefcbc041e7d18fcf2d417879dc5a09997aa64d675b7a3c4b6ce33da13f3fe.woff2","font-awesome/fontawesome-webfont.woff":"font-awesome/fontawesome-webfont-ba0c59deb5450f5cb41b3f93609ee2d0d995415877ddfa223e8a8a7533474f07.woff","font-awesome/fontawesome-webfont.ttf":"font-awesome/fontawesome-webfont-aa58f33f239a0fb02f5c7a6c45c043d7a9ac9a093335806694ecd6d4edc0d6a8.ttf","font-awesome/fontawesome-webfont.svg":"font-awesome/fontawesome-webfont-ad6157926c1622ba4e1d03d478f1541368524bfc46f51e42fe0d945f7ef323e4.svg","logo.png":"logo-7ff112568709bf97f9898fe87249b7a8f200ff1f48d537d85af87215f1870423.png","application.js":"application-a3a4f3549d68670572bb07700c85a9ac11e536edc73fef6e7489723bf535e533.js","application.css":"application-a7508b88eb6a69a5b301602bddc14745cec09853ea7d91c6fae856b96e788f46.css"}}

public/react/public/css/edu-all.css

@@ -119,7 +119,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
 .tag-green .tag-name{display: block;width: auto;
     /*background-image: url("/images/educoder/tag1.png");*/
     background: rgba(000,000,000,0.56);
-    border: 1px solid #fff;
+    border: 1px solid rgba(255,255,255,0.56);
     border-radius: 3px;
     font-size: 12px;
     /*opacity: 0.56;*/
@@ -446,8 +446,8 @@ table.text-file{}
 
 /*-------------------------------实训路径-------------------------------*/
 .path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
-    background-color: #081C4B;
-    background-size: cover;
+    background-color: #000a4f;
+    /*background-size: cover;*/
     background-position: center;
     background-repeat: no-repeat;
 }

public/react/public/js/js_min_all.js

@@ -236,8 +236,7 @@ $(function(){
         if(dragging) {
             clickX = e.pageX || e.originalEvent.touches[0].pageX;;
             if(clickX > leftOffset+0&&clickX<leftOffset+1600) {
-                console.log('resize')
-                //console.log(1);
+                // console.log('resize')
                 lab.css('left', clickX - 7 - leftOffset + 'px');
                 $("#game_left_contents").width( clickX-leftOffset + 'px');
                 nextW2 = clickX-leftOffset;
@@ -314,10 +313,16 @@ $(function(){
 		window.top.__updateWebsshRows && window.top.__updateWebsshRows(rows)
     }
     window.refresh_editor_monaco = function(height) {
+        console.log('refresh_editor_monaco')
         if (window.editor_monaco) {
             height && $('#codetab_con_1').height(height)
             window.editor_monaco.layout();
         } 
+        // if ($('#game_operate_action').width() < 720) {
+        //     $('#game_operate_action .time_limit').hide()
+        // } else {
+        //     $('#game_operate_action .time_limit').show()
+        // }
     }
     // end;
    //解決IE瀏覽器大小改變時webssh佈局變亂。

public/react/scripts/build.js

@@ -203,12 +203,12 @@ function generateNewIndexJsp() {
       <script>
          (function() {
             var _host = '/react/build/'
-            /*
+            /**/
             if (window.location.host == 'pre-newweb.educoder.net') {
                 _host = 'https://testali-cdn.educoder.net/react/build/'
             } else if (window.location.host == 'www.educoder.net') {
-                _host = 'https://ali-newweb.educoder.net/react/build/'
-            }*/
+                _host = 'https://ali-cdn.educoder.net/react/build/'
+            }
             document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\\/script>');
             document.write('<script type="text/javascript" src="' + _host + 'static/js/main.${matchResult[1]}.js"><\\/script>');
          })()

public/react/src/common/components/attachment/AttachmentList.js

@@ -12,7 +12,7 @@ class AttachmentsList extends Component{
         {
           attachments.map((item,key)=>{
             return(
-              <p key={key}>
+              <p key={key} className="clearfix mb3">
                 <a className="color-grey fl">
                   <i className="font-14 color-green iconfont icon-fujian mr8"></i>
                 </a>

public/react/src/modules/courses/gradinforms/Bullsubdirectory.js

@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form } from "antd";
+import { Input,Checkbox,Table, Pagination, Modal,Menu, Tooltip,Spin,Button,Form,Row, Col } from "antd";
 import { WordsBtn,on, off, trigger,markdownToHTML,getImageUrl} from 'educoder';
 import './myysleduinforms.css'
 import axios from 'axios';
@@ -165,18 +165,25 @@ class Bullsubdirectory extends Component{
 											{
 												whethertoeditysl === false?
 													<div>
-														<div  className="" >
-															<div className="fudonyingxiangysl"><div className="ysltitbt fl"><span >{myname}</span></div>
+														<div>
+															<div className="fudonyingxiangysl">
+																<div style={{marginRight:"60px"}}>
+																	<span className="ysltitbt">{myname}</span>
+																</div>
+																<div>
+																	<span className="fr pr25  yslbianji">
 																	{
 																		this.props.isAdmin() === true ?
 																			(this.props.yslbool===false?
-																				<i className="iconfont icon-bianji1 newbianji1 fr pr25  yslbianji" onClick={()=>this.bianji(true)}></i>
+																					<i className="iconfont icon-bianji1 newbianji1" onClick={()=>this.bianji(true)}></i>
 																					:
 																					""
 																			)
-
 																			:""
 																	}
+																</span>
+																</div>
+																<div className="yslclear"></div>
 															</div>
 															<div id="MakedownHTML"className={"markdown-body fonttext yslmtopcg yslminHeigth markdownysltext"}   dangerouslySetInnerHTML={{__html: markdownToHTML(mydescription).replace(/▁/g, "▁▁▁")}}/>
 														</div>

public/react/src/modules/courses/gradinforms/myysleduinforms.css

@@ -68,7 +68,6 @@
 }
 .fudonyingxiangysl{
     width: 100%;
-    height: 66px;
 }
 .yslbianji{
     padding-top: 31px;
@@ -79,3 +78,5 @@
 .ysldashed{
     border:1px dashed #EEE;
 }
+.yslclear{ clear: both;
+}

public/react/src/modules/courses/graduation/tasks/index.js

@@ -563,7 +563,7 @@ class GraduationTasks extends Component{
       //debugger
     let {search,page,order,all_count} = this.state;
     this.fetchAll(search,page,order,all_count)
-		debugger
+
 
   }
   getcourse_groupslist=(id)=>{

public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js

@@ -59,7 +59,7 @@ class GraduateTopicDetailTable extends Component{
             </div>
             {
               topicInfo && topicInfo.attachment_list.length>0 &&
-              <p className="mt30">
+              <div className="mt30">
                 {/* {
                   topicInfo.attachment_list.map((item,key)=>{
                     return(
@@ -75,7 +75,7 @@ class GraduateTopicDetailTable extends Component{
                   })
                 } */}
                 <AttachmentList {...this.props} {...this.state} attachments = {topicInfo.attachment_list}></AttachmentList>
-              </p>
+              </div>
             }
           </div>
           <div className="mt30">

public/react/src/modules/courses/members/studentsList.js

@@ -35,6 +35,7 @@ const buildColumns = (that) => {
     dataIndex: 'login',
     key: 'login',
     align:'center',
+    width:"10%",
     className:"color-grey-6",
     render: (login, record) => {
       return <span className="color-dark overflowHidden1" style={{maxWidth: '160px'}}
@@ -57,9 +58,10 @@ const buildColumns = (that) => {
     dataIndex: 'student_id',
     key: 'student_id',
     align:'center',
+    width:"10%",
     className:"color-grey-6",
     render: (student_id, record) => {
-      return <span className="color-dark overflowHidden1 "title={student_id && student_id.length > 10 ? student_id : ''}
+      return <span className="color-dark overflowHidden1 " title={student_id && student_id.length > 10 ? student_id : ''}
           style={{maxWidth: '160px'}} >{student_id}</span>
     }
   }];
@@ -69,7 +71,7 @@ const buildColumns = (that) => {
       dataIndex: 'course_group_name',
       key: 'course_group_name',
       align:'center',
-      width:"50%",
+      width:"40%",
       className:"color-grey-6"
     })
   }

public/react/src/modules/courses/new/Goldsubject.js

@@ -764,7 +764,6 @@ class Goldsubject extends Component {
 																							onChange={this.handleChange}
 																							className={"fl construction "}
 																							placeholder="例如：数据结构"
-																							addonAfter={String(5)+"/5"}
 																>
 																	{options}
 																</AutoComplete>
@@ -864,6 +863,7 @@ class Goldsubject extends Component {
 																											width={"210px"}
 																											value={datatimetwo === undefined ? "" :datatimetwo === null ? "" : moment(datatimetwo, dateFormat)}
 																											disabledTime={disabledDateTime}
+																											disabledDate={this.isabledStartDate}
 																											dropdownClassName="hideDisable"
 																											onChange={this.onChangeTimepublishstwo}
 																										/>
@@ -887,6 +887,7 @@ class Goldsubject extends Component {
 																											width={"210px"}
 																											value={datatime === undefined ? "" :datatime === null ? "" : moment(datatime, dateFormat)}
 																											disabledTime={disabledDateTime}
+																											disabledDate={this.disabledEndDate}
 																											dropdownClassName="hideDisable"
 																											onChange={this.onChangeTimepublishs}
 																										/>

public/react/src/modules/page/main/ActionView.js

@@ -52,11 +52,18 @@ class ActionView extends Component {
 	componentDidMount() {
 		// request
 		window._tpiWidthResize = () => {
-			if (window.$('#actionView').width() < 580) {
-				window.$('.time_limit').hide()
-			} else {
-				window.$('.time_limit').show()
-			}
+			const _w = window.$('#actionView').width();
+			// if (_w < 446) {
+			// 	window.$('#time-consuming').hide()
+			// 	// window.$('#time-consuming').hide()
+			// } else if (_w < 746) {
+			// 	// 文字放出来之前是 580
+			// 	window.$('#time-consuming').show()
+			// 	window.$('.time_limit').hide()
+			// } else {
+			// 	window.$('#time-consuming').show()
+			// 	window.$('.time_limit').show()
+			// }
  		}
 	}
 
@@ -70,24 +77,50 @@ class ActionView extends Component {
 	    return (
 	      	<div className="-flex -layout-h" id="game_operate_action">
 			  	<style>{`
+				  #game_operate_action {
+					width: 100%;
+				  }
 				  .time_limit {
-					  margin-right: 16px;
+					  margin-right: 0px;
+				  }
+				  .spliter {
+						border-right: 1px solid;
+						padding-right: 8px;
+						margin-right: 8px;
+						height: 14px;
+						display: inline-block;
+						position: relative;
+						top: 3px;
+				  }
+				  #time-consuming {
+					  flex: auto;
+					  overflow: hidden;
+					  white-space: nowrap;  
+				  }
+				  #game_operate_action .act_btn {
+					  flex: 0 0 90px;
 				  }
 				  `}</style>
 	      		<span className="mt10 -flex c_grey ml15" id="time-consuming">
 				  	{!!time_limit && 
-					  <span className="time_limit">{`本关最大执行时间：${real_time_limit}秒`}</span>} 
+					  <span className="time_limit">{`本关最大执行时间：${real_time_limit}秒`}
+					  	{!gameBuilding && record && <span className="spliter"></span>}
+					  </span>} 
 	      			{!gameBuilding && record ? 
-	      				<Tooltip title={ "本次评测耗时(编译、运行总时间)" }>
-	      					<span>{ record } 秒</span>
-	      				</Tooltip>
+	      				// <Tooltip title={ "本次评测耗时(编译、运行总时间)" }></Tooltip>
+	      					<span>本次评测耗时(编译、运行总时间)：{ record } 秒</span>
+	      				
 	      			: ""}
 	      		</span>
 
 	      		{/*将第一个按钮改为visibility方式隐藏，不然加载时测评按钮会出现没有垂直居中的情况*/}
 				  	<Tooltip title={ "倒计时为0时，服务将被关闭" }>
 						<Button size="small" className={classes.button + ' actionViewfirstButton'} onClick={()=>this.showWebDisplay(challenge)}
-								style={{ visibility: challenge.showWebDisplayButton ? '': 'hidden'}} 
+								style={{ visibility: challenge.showWebDisplayButton ? '': 'hidden',
+									minWidth: challenge.showWebDisplayButton ? '': '1px',
+									width: challenge.showWebDisplayButton ? '': '1px',
+									flex: `0 0 ${challenge.showWebDisplayButton ? '110px': '1px'}`
+								}} 
 								id="showWebDisplayButton"
 							// style={{ display: challenge.showWebDisplayButton ? 'flex': 'none'}} 
 						>
@@ -98,7 +131,7 @@ class ActionView extends Component {
 				{
 					!gameBuilding && 
 					(game && !!game.prev_game) ? 
-				<Link to={`/tasks/${game.prev_game}`}  className={classes.buttonText}>
+				<Link to={`/tasks/${game.prev_game}`}  className={classes.buttonText + ' act_btn'}>
 					<Button size="small" className={classes.button}>
 						上一关
 					</Button>
@@ -108,7 +141,7 @@ class ActionView extends Component {
 				{/*未发布的都能跳转*/}
 				{	!gameBuilding && 
 					((game && (game.status === 2 || shixun.status < 2) || shixun && shixun.task_pass ) && !!game.next_game) ? 
-				<Link to={`/tasks/${game.next_game}`} className={classes.buttonText}>
+				<Link to={`/tasks/${game.next_game}`} className={classes.buttonText + ' act_btn'}>
 					<Button size="small" className={classes.button}>
 						下一关
 					</Button>
@@ -117,11 +150,11 @@ class ActionView extends Component {
 
 				
 				
-				<div id="code_test">
+				<div id="code_test" className="act_btn">
 					{
 						st === 1 && game.status === 2 ? 
 							<Tooltip title={ "已通关的选择题任务无法再次测评" }>
-							<a href="javascript:void(0)" className="shixun-task-btn mr15  gray" 
+							<a href="javascript:void(0)" className="shixun-task-btn mr15  gray " 
 						      		>
 				      			<i className="fa fa-play-circle font-16"></i> 
 						      	测评
@@ -130,7 +163,7 @@ class ActionView extends Component {
 						:
 						gameBuilding ?
 						
-				    	<a href="javascript:void(0)" className="shixun-task-btn mr15  gray" 
+				    	<a href="javascript:void(0)" className="shixun-task-btn mr15  gray " 
 					      		>
 			      			<i className="fa fa-play-circle font-16"></i> 
 					      	测评

public/react/src/modules/page/tpiPageForMobile.css

@@ -14,13 +14,16 @@
 		min-width: 280px;
 	}
 
-	#time-consuming .time_limit {
-		display: none;
-	}
+	
 	.actionViewfirstButton {
 		display: none !important;
 	}
 }
+@media (max-width: 800px) {
+	#time-consuming .time_limit {
+		display: none;
+	}
+}
 @media (max-width: 628px) {
 	.-header-right { display: none }	
 	.exitBtn span { display: none }

public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js

@@ -297,8 +297,13 @@ class DetailCardsEditAndAdd extends Component{
 
 
   contentViewScrolladd=(e)=>{
+  	const {ChooseShixunList}=this.state;
     //滑动到底判断
     if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
+
+       if(ChooseShixunList.shixun_list.length===0){
+       	return
+			 }else{
 				 // console.log("到达底部");
 				 this.setState({
 					 hometypepvisible:true
@@ -334,6 +339,7 @@ class DetailCardsEditAndAdd extends Component{
 					 console.log(error);
 				 })
 
+			 }
 
     }
 

public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js

@@ -338,8 +338,12 @@ class DetailCardsEditAndEdit extends Component{
 
   contentViewScrolledit=(e)=>{
     //滑动到底判断
-
+		const {ChooseShixunList}=this.state;
     if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
+
+			if(ChooseShixunList.shixun_list.length===0){
+				return
+			}else{
 				this.setState({
 					hometypepvisible:true
 				})
@@ -383,6 +387,11 @@ class DetailCardsEditAndEdit extends Component{
 					console.log(error);
 				})
 
+
+			}
+
+
+
     }
 
   }

public/react/src/modules/tpm/challengesnew/TPMevaluation.js

@@ -475,7 +475,10 @@ export default class TPMevaluation extends Component {
 	}
 	handpathoptionvalue=(value)=>{
 		this.setState({
-			pathoptionvalue:value
+			pathoptionvalue:value,
+			shixunfileexpectpicturepath:undefined,
+			shixunfilestandardpicturepath:undefined,
+			shixunfilepicturepath:undefined
 		})
 	}
 	showrepositoryurltip=(type)=>{
@@ -640,19 +643,20 @@ export default class TPMevaluation extends Component {
 		let id = this.props.match.params.shixunId;
 		let{checkpointId}=this.state;
 		let url = "/shixuns/"+id+"/challenges/"+checkpointId+".json";
-		axios.put(url,{
-				tab:1,
-				challenge:{
+		let newchallenge={
 			path:shixunfilepath,
 			exec_path:shixunfilepathplay,
 			show_type:pathoptionvalue,
-					original_picture_path:shixunfileexpectpicturepath,
-					expect_picture_path:shixunfilestandardpicturepath,
-					picture_path:shixunfilepicturepath,
+			original_picture_path:pathoptionvalue===-1?undefined:shixunfileexpectpicturepath===undefined?null:shixunfileexpectpicturepath,
+			expect_picture_path:pathoptionvalue===-1?undefined:shixunfilestandardpicturepath===undefined?null:shixunfilestandardpicturepath,
+			picture_path:pathoptionvalue===-1?undefined:shixunfilepicturepath===undefined?null:shixunfilepicturepath,
 			test_set_score:newscorevalue,
 			test_set_average:markvalue,
 			web_route:web_route===null?undefined:web_route
-				},
+		}
+		axios.put(url,{
+				tab:1,
+				challenge:newchallenge,
 				test_set:evaluationlist
 			}
 		).then((response) => {

public/react/src/public-path.js

@@ -1,6 +1,6 @@
 /*global __webpack_public_path__ */
-if (window._enableCDN && window.location.host == 'pre-newweb.educoder.net') {
-    __webpack_public_path__ = 'http://testali-cdn.educoder.net/react/build/'
-} else if (window._enableCDN && window.location.host == 'www.educoder.net') {
-    __webpack_public_path__ = 'https://ali-newweb.educoder.net/react/build/'
+if ( window.location.host == 'pre-newweb.educoder.net') {
+    __webpack_public_path__ = 'https://testali-cdn.educoder.net/react/build/'
+} else if ( window.location.host == 'www.educoder.net') {
+    __webpack_public_path__ = 'https://ali-cdn.educoder.net/react/build/'
 }

public/stylesheets/educoder/edu-all.css

@@ -121,7 +121,7 @@ em.vertical-line{display: inline-block;width: 2px;background: #999;height: 10px}
 .tag-green .tag-name{display: block;width: auto;
     /*background-image: url("/images/educoder/tag1.png");*/
     background: rgba(000,000,000,0.56);
-    border: 1px solid #fff;
+    border: 1px solid rgba(255,255,255,0.56);
     border-radius: 3px;
     font-size: 12px;
     /*opacity: 0.56;*/
@@ -448,8 +448,8 @@ table.text-file{}
 
 /*-------------------------------实训路径-------------------------------*/
 .path-head{width: 100%;height: 300px;background-image: url("/images/educoder/path.png");
-    background-color: #081C4B;
-    background-size: cover;
+    background-color: #000a4f;
+    /*background-size: cover;*/
     background-position: center;
     background-repeat: no-repeat;
 }