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

# Conflicts:
#	public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

app/controllers/courses_controller.rb

@@ -1027,7 +1027,10 @@ class CoursesController < ApplicationController
           tip_exception(403,"无权限操作")
         elsif @all_members.size == 0
           normal_status(-1,"课堂暂时没有学生")
+        elsif params[:export].present? && params[:export]
+            normal_status(0,"正在下载中")
         else
+          set_export_cookies
           member_to_xlsx(@course, @all_members, @c_homeworks, @c_exercises, @c_tasks)
           filename_ = "#{current_user.real_name}_#{@course.name}_全部成绩_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
           render xlsx: "#{format_sheet_name filename_.strip}",template: "courses/export_member_scores_excel.xlsx.axlsx",

app/controllers/exercises_controller.rb

@@ -1261,6 +1261,7 @@ class ExercisesController < ApplicationController
           else
             respond_to do |format|
               format.xlsx{
+                set_export_cookies
                 get_export_users(@exercise,@course,@export_ex_users)
                 exercise_export_name_ =
                     "#{current_user.real_name}_#{@course.name}_#{@exercise.exercise_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
@@ -1286,6 +1287,7 @@ class ExercisesController < ApplicationController
     if params[:export].present? && params[:export]
       normal_status(0,"正在下载中")
     else
+      set_export_cookies
       render pdf: 'exercise_export/blank_exercise', filename: filename_, stylesheets: stylesheets
     end
   end

app/controllers/games_controller.rb

@@ -116,10 +116,11 @@ class GamesController < ApplicationController
       @qrcode_str = Base64.encode64( qr.to_img.resize(400,400).to_s )
 
     else
-      @type = "image"
       #conv = Iconv.new("GBK", "utf-8")
       @game_challenge = @game.challenge
       type = @game_challenge.show_type
+      @type = shixun_show_type type
+
       workspace_path = @game.try(:picture_path)
       @answer_path = "#{Rails.root}/#{workspace_path}/#{@game_challenge.expect_picture_path}"
       @user_path = "#{Rails.root}/#{workspace_path}/#{@game_challenge.picture_path}"

app/controllers/graduation_tasks_controller.rb

@@ -132,6 +132,8 @@ class GraduationTasksController < ApplicationController
           tip_exception(403, "无权限操作")
         elsif complete_works == 0
           normal_status(-1,"暂无用户提交")
+        elsif params[:export].present? && params[:export]
+          normal_status(0,"正在下载中")
         else
           respond_to do |format|
             format.xlsx{
@@ -148,12 +150,17 @@ class GraduationTasksController < ApplicationController
           zip_works = @work_excel.where("work_status > 0")
           status = checkfileSize(zip_works)
           if status == 0
-            respond_to do |format|
-              format.zip{
-                zipfile = zip_homework_common @task, zip_works
-                file = decode64(zipfile[0][:base64file])
-                send_file "#{OUTPUT_FOLDER}/#{file}", filename: filename_for_content_disposition(file), type: 'application/zip'
-              }
+            if params[:export].present? && params[:export]
+            normal_status(0,"正在下载中")
+            else
+              respond_to do |format|
+                format.zip{
+                  set_export_cookies
+                  zipfile = zip_homework_common @task, zip_works
+                  file = decode64(zipfile[0][:base64file])
+                  send_file "#{OUTPUT_FOLDER}/#{file}", filename: filename_for_content_disposition(file), type: 'application/zip'
+                }
+              end
             end
           else
             normal_status(status,status == -2 ? "500M" : "无附件可下载")

app/controllers/graduation_topics_controller.rb

@@ -271,7 +271,12 @@ class GraduationTopicsController < ApplicationController
       students = course.students.joins(user: :user_extension).order("user_extensions.student_id")
       graduation_topic_to_xlsx(students,course)
       topic_export_name_ = "#{current_user.real_name}_#{course.name}_毕设选题_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
-      render xlsx: "#{topic_export_name_.strip}",template: "graduation_topics/export.xlsx.axlsx",locals: {table_columns:@topic_head_cells,topic_users:@topic_body_cells}
+      if params[:export].present? && params[:export]
+        normal_status(0,"正在下载中")
+      else
+        set_export_cookies
+        render xlsx: "#{topic_export_name_.strip}",template: "graduation_topics/export.xlsx.axlsx",locals: {table_columns:@topic_head_cells,topic_users:@topic_body_cells}
+      end
     rescue Exception => e
       uid_logger(e.message)
       missing_template

app/controllers/myshixuns_controller.rb

@@ -24,7 +24,7 @@ class MyshixunsController < ApplicationController
       ActiveRecord::Base.transaction do
         begin
           @shixun = Shixun.select(:id, :identifier).find(@myshixun.shixun_id)
-          @myshixun.destroy
+          @myshixun.destroy!
 
           StudentWork.where(:myshixun_id => @myshixun.id).update_all(:myshixun_id => 0, :work_status => 0)
 

app/controllers/polls_controller.rb

@@ -945,9 +945,12 @@ class PollsController < ApplicationController
             tip_exception(403,"无权限操作")
           elsif (@poll.polls_status == 1) || (@poll_export_questions.size == 0) || (@poll_commit_ids.size == 0)
             normal_status(-1,"暂无用户提交")
+          elsif params[:export].present? && params[:export]
+            normal_status(0,"正在下载中")
           else
             respond_to do |format|
               format.xlsx{
+                set_export_cookies
                 polls_export_name_ = "#{current_user.real_name}_#{@course.name}_#{@poll.polls_name}_#{Time.now.strftime('%Y%m%d_%H%M%S')}"
                 polls_user_commit = poll_commit_result(@poll,@poll_export_questions,@poll_users,@poll_commit_ids)
                 render xlsx: "#{polls_export_name_.strip}",template: "polls/commit_result.xlsx.axlsx",locals: {polls_user_commit:polls_user_commit}

app/controllers/projects_controller.rb

@@ -1,10 +1,2 @@
 class ProjectsController < ApplicationController
-  def search
-    query_params = { keyword: params[:keyword], category: 'manage' }
-    projects = Users::ProjectService.new(current_user, query_params).call
-
-    params[:limit] = params[:per_page].to_i.zero? ? 20 : params[:per_page].to_i
-    @count    = projects.count
-    @projects = paginate projects
-  end
 end

app/controllers/users/base_controller.rb

@@ -43,7 +43,7 @@ class Users::BaseController < ApplicationController
     page     = page_value
     per_page = per_page_value
 
-    return Kaminari.paginate_array(objs).page(page).per(per_page) unless observed_logged_user? && opts[:special]
+    return Kaminari.paginate_array(objs).page(page).per(per_page) unless opts[:special] && observed_logged_user?
 
     # note: 为实现第一页少一条记录，让前端放置新建入口
     if page == 1

app/controllers/users/projects_controller.rb

@@ -1,4 +1,6 @@
 class Users::ProjectsController < Users::BaseController
+  skip_before_action :check_observed_user_exists!, only: [:search]
+
   def index
     projects = Users::ProjectService.new(observed_user, query_params).call
 
@@ -6,6 +8,15 @@ class Users::ProjectsController < Users::BaseController
     @projects = paginate(projects.includes(:project_score, owner: { user_extension: :school }), special: true)
   end
 
+  def search
+    query_params = { keyword: params[:keyword], category: 'manage' }
+    projects = Users::ProjectService.new(current_user, query_params).call
+
+    params[:limit] = params[:per_page].to_i.zero? ? 20 : params[:per_page].to_i
+    @count    = projects.count
+    @projects = paginate projects
+  end
+
   private
 
   def query_params

app/controllers/zips_controller.rb

@@ -27,6 +27,7 @@ class ZipsController < ApplicationController
     if params[:export].present? && params[:export]
       normal_status(0,"正在下载中")
     else
+      set_export_cookies
       send_file exercises.ex_zip, filename: file_name_, type: 'application/zip'
     end
   rescue Exception => e

app/helpers/games_helper.rb

@@ -6,7 +6,7 @@ module GamesHelper
   end
 
   # 获取目录下所有文件，返回一个文件名的数组 type是查看文件的类型image表示图片
-  # type [[1, "图片"], [2, "apk/exe"], [3, "txt"], [4, "html"]]
+  # type [[1, "图片"], [2, "apk/exe"], [3, "txt"], [4, "html"], [5, "mp3"], [6, "mp4"]]
   def get_dir_filename(path, type, game_id)
     answer_picture = []
     return answer_picture unless File.directory?(path)
@@ -39,6 +39,12 @@ module GamesHelper
         end
         f.close
         @type = 'txt'
+      elsif extension == 'mp3' && type == 5
+        answer_picture << file
+        @type = 'mp3'
+      elsif extension == 'mp4' && type == 6
+        answer_picture << file
+        @type = 'mp4'
       end
     end
 
@@ -51,4 +57,21 @@ module GamesHelper
           "编译失败，请在测试结果中查看具体的错误信息" : test_set.try(:actual_output)
     end
   end
+
+  def shixun_show_type type
+    case type.to_i
+    when 1
+      "image"
+    when 2
+      "apk/exe"
+    when 3
+      "txt"
+    when 4
+      "html"
+    when 5
+      "mp3"
+    when 6
+      "mp4"
+    end
+  end
 end

app/models/challenge.rb

@@ -1,5 +1,6 @@
 class Challenge < ApplicationRecord
   # difficulty: 关卡难度: 1.简单 2.中等 3.困难
+  # show_type: 效果展示：-1.无效果 1.图片 2.apk/exe 3.txt 4.html 5.mp3 6.mp4
   default_scope { order("challenges.position asc") }
 
   belongs_to :shixun, :touch => true, counter_cache: true

app/views/games/picture_display.json.jbuilder

@@ -24,5 +24,30 @@ elsif @type == "txt"
   json.contents @contents.html_safe
 elsif @type =="qrcode"
   json.qrcode_str @qrcode_str
+elsif @type == "mp3" || @type == "mp4"
+  if @type == "mp4"
+    json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378171/123.mp4"}]
+    json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378172/456.mp4"}]
+    json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378173/789.mp4"}]
+  else
+    json.orignal_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378174/58099.mp3"}]
+    json.user_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
+    json.answer_file [{"file_url": "http://120.27.231.56:48080/attachments/download/378175/654058514.mp3"}]
+  end
 
+  # json.orignal_file do
+  #   json.array! @orignal_picture do |file|
+  #     json.file_url attachment_show_users_path(:file_name => file, :path => @original_path)
+  #   end
+  # end
+  # json.user_file do
+  #   json.array! @user_picture do |file|
+  #     json.file_url attachment_show_users_path(:file_name => file, :path => @user_path, :time => Time.now.to_i)
+  #   end
+  # end
+  # json.answer_file do
+  #   json.array! @answer_picture do |file|
+  #     json.file_url attachment_show_users_path(:file_name => file, :path => @answer_path)
+  #   end
+  # end
 end

config/routes.rb

@@ -75,7 +75,7 @@ Rails.application.routes.draw do
         get :system_update
 
         resource :trial_apply, only: [:create]
-        resources :projects, only: [] do
+        resources :projects, module: :users, only: [] do
           get :search, on: :collection
         end
 

public/react/src/modules/courses/busyWork/common/TabRightComponents.js

@@ -44,7 +44,7 @@ class TabRightComponents extends Component{
   }
   /// 确认是否下载
   confirmysl(url){
-    axios.get(url).then((response) => {
+    axios.get(url + '?export=true' ).then((response) => {
       if(response.data.status&&response.data.status===-1){
 
       }else if(response.data.status&&response.data.status===-2){

public/react/src/modules/courses/coursesPublic/HomeworkModal.js

@@ -20,6 +20,14 @@ function disabledDateTime() {
 		// disabledSeconds: () => [55, 56],
 	};
 }
+
+
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
+
+
+
 class HomeworkModal extends Component{
   constructor(props){
     super(props);
@@ -81,7 +89,7 @@ class HomeworkModal extends Component{
 		// console.log('startValue',dateString);
 
 		this.setState({
-			endtime: handleDateString(dateString),
+			endtime: date===null?"":handleDateString(dateString),
 		})
 
 	}
@@ -188,6 +196,7 @@ class HomeworkModal extends Component{
 										dropdownClassName="hideDisable"
 										showTime={{ format: 'HH:mm' }}
 										disabledTime={disabledDateTime}
+										disabledDate={disabledDate}
 										showToday={false}
 										locale={locale}
 										format={dateFormat}

public/react/src/modules/courses/coursesPublic/SelectSetting.js

@@ -16,12 +16,17 @@ function range(start, end) {
 	}
 	return result;
 }
+
 function disabledDateTime() {
 	return {
 		disabledMinutes: () => range(1, 30).concat(range(31, 60)),
 		// disabledSeconds: () => range(1,60)
 	}
 }
+
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
 class Selectsetting extends Component{
 	constructor(props){
 		super(props);
@@ -698,6 +703,7 @@ class Selectsetting extends Component{
 														onChange={(e,index)=>this.onChangeTimepublishs(e,index,key)}
 														// onChange={ this.onChangeTimepublish }
 														disabledTime={disabledDateTime}
+														disabledDate={disabledDate}
 													/>
 
 													{key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}
@@ -730,7 +736,7 @@ class Selectsetting extends Component{
 				                 value={datatime===undefined||datatime===""?"":moment(datatime, dateFormat)}
 				                 onChange={this.onChangeTimepublish}
 				                 disabledTime={disabledDateTime}
-
+												 disabledDate={disabledDate}
 			                 />
 			              </span>
 								</p>:""}

public/react/src/modules/courses/coursesPublic/sendResource.js

@@ -22,6 +22,11 @@ function disabledDateTime() {
   };
 }
 
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
+
+
 const dateFormat="YYYY-MM-DD HH:mm";
 class Sendresource extends Component{
   constructor(props){
@@ -525,6 +530,7 @@ class Sendresource extends Component{
                         onChange={(e,index)=>this.onChangeTimepublish(e,index,key,2)}
                         // onChange={ this.onChangeTimepublish }
                         disabledTime={disabledDateTime}
+												disabledDate={disabledDate}
                       />
                       {key!=0?<i className="iconfont icon-shanchu color-grey-c font-14 font-n ml20" onClick={()=>this.deletegrouppublish(key)}></i>:""}
                       {key===course_group_publish_times.length-1&&key<this.state.course_groups_count-1?<i className="iconfont icon-tianjiafangda color-green ml15" onClick={this.addgrouppublish}></i>:""}
@@ -551,7 +557,7 @@ class Sendresource extends Component{
                    value={datatime===undefined||datatime===""?undefined:moment(datatime, dateFormat)}
                    onChange={(e,index)=>this.onChangeTimepublish(e,index,undefined,1)}
                    disabledTime={disabledDateTime}
-
+									 disabledDate={disabledDate}
                  />
               </span>
             </p>:""}

public/react/src/modules/courses/exercise/Exercisesetting.js

@@ -23,6 +23,7 @@ function range(start, end) {
     }
     return result;
 }
+
 function disabledDateTime() {
     return {
         // disabledHours: () => range(0, 24).splice(4, 20),
@@ -30,6 +31,11 @@ function disabledDateTime() {
           // disabledSeconds: () => [0, 60],
     };
 }
+
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
+
 const dataformat="YYYY-MM-DD HH:mm";
 
 class Exercisesetting extends Component{
@@ -636,6 +642,7 @@ class Exercisesetting extends Component{
                                                         format="YYYY-MM-DD HH:mm"
                                                         showToday={false}
                                                         disabledTime={disabledDateTime}
+																												disabledDate={disabledDate}
                                                         onChange={this.onChangeTimepublish}
                                                         value={publish_time && moment(publish_time,"YYYY-MM-DD HH:mm")}
                                                         disabled={ publish_timetype===true?true:!flagPageEdit }
@@ -661,6 +668,7 @@ class Exercisesetting extends Component{
                                                         width={"240px"}
                                                         format="YYYY-MM-DD HH:mm"
                                                         disabledTime={disabledDateTime}
+																												disabledDate={disabledDate}
                                                         onChange={this.onChangeTimeEnd}
                                                         value={end_time && moment(end_time,"YYYY-MM-DD HH:mm")}
                                                         disabled={   end_timetype===true?true:!flagPageEdit}

public/react/src/modules/courses/exercise/Testpapersettinghomepage.js

@@ -357,7 +357,7 @@ class Testpapersettinghomepage extends Component{
                                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
                                         <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`,this.child)}>学生成绩</a></li>
-                                        <li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/export_exercise`,this.child)} >空白试卷</a></li>
+                                        {/*<li><a onClick={()=>this.confirmysl(`/exercises/${this.props.match.params.Id}/export_exercise`)} >空白试卷</a></li>*/}
                                         {/*<li><a onClick={()=>this.confirmysl(`/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval===null||this.state.groupyslsval===undefined?null:this.state.groupyslsval}`)}>学生答题试卷</a></li>*/}
                                     </ul>
                                 </li>:""}

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

@@ -27,6 +27,11 @@ function disabledDateTime() {
   };
 }
 
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
+
+
 class GraduationTaskssettingapp extends Component{
 
   constructor(props){
@@ -896,7 +901,7 @@ class GraduationTaskssettingapp extends Component{
   }
 	/// 确认是否下载
 	confirmysl(url){
-		axios.get(url).then((response) => {
+		axios.get(url + '?export=true' ).then((response) => {
 			if(response === undefined){
 				return
 			}
@@ -1181,6 +1186,7 @@ class GraduationTaskssettingapp extends Component{
                          value={publish_time===null||publish_time===""?"":moment(publish_time, dateFormat)}
                          onChange={this.onChangeTimepublish}
                          disabledTime={disabledDateTime}
+												 disabledDate={disabledDate}
                          disabled={this.props.isAdmin()===true?starttimetype===true?true:flagPageEdit===true?false:true:true}
                          className={ this.state.publishTimetypes===true?"noticeTip":""}
                        />
@@ -1218,6 +1224,7 @@ class GraduationTaskssettingapp extends Component{
                       value={end_time===null||end_time===""?"":moment(end_time, dateFormat)}
                       onChange={this.onChangeTimeend}
                       disabledTime={disabledDateTime}
+											disabledDate={disabledDate}
                       // disabled={this.props.isSuperAdmin()===true?flagPageEdit===true?false:true:this.props.isAdmin()===true?endtimetype===true?true:flagPageEdit===true?false:true:true}
 											disabled={this.props.isAdmin()===true?endtimetype===true?true:flagPageEdit===true?false:true:true}
                       className={this.state.endTimetypes===true||end_timetype===true?"noticeTip":""}
@@ -1269,6 +1276,7 @@ class GraduationTaskssettingapp extends Component{
                           width={"210px"}
                           value={latetime===null||latetime===""?"":moment(latetime, dateFormat)}
                           disabledTime={disabledDateTime}
+												  disabledDate={disabledDate}
                           onChange={this.onChangeTimelatetime}
                           disabled={this.props.isAdmin()===true?allowlate===true||allowlate===1?flagPageEdit===true?false:true:true:true}
                           className={ latetimetype===true?"noticeTip":""}
@@ -1319,6 +1327,7 @@ class GraduationTaskssettingapp extends Component{
                       width={"210px"}
                       value={commenttime===null||commenttime=== ""?"":moment(commenttime, dateFormat)}
                       disabledTime={disabledDateTime}
+										  disabledDate={disabledDate}
                       onChange={this.onChangeTimecommenttime}
                       disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true}
                       className={ commenttimetype===true?"noticeTip":""}

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

@@ -645,7 +645,7 @@ class GraduationTaskssettinglist extends Component{
 			b_order:b_order,
 			search:search,
 		}
-		axios.get(url,{
+		axios.get(url + '?export=true',{
 			params
 		}).then((response) => {
 			if(response === undefined){

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

@@ -199,7 +199,7 @@ class GraduationTasksquestions extends Component{
 
 	/// 确认是否下载
 	confirmysl(url){
-		axios.get(url).then((response) => {
+		axios.get(url + '?export=true').then((response) => {
 			if(response === undefined){
 				return
 			}

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

@@ -322,7 +322,7 @@ onBoardsNew=()=>{
 }
   /// 确认是否下载
   confirmysl(url){
-    axios.get(url).then((response) => {
+    axios.get(url + '?export=true').then((response) => {
       if(response.data.status&&response.data.status===-1){
 
       }else if(response.data.status&&response.data.status===-2){

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

@@ -127,7 +127,7 @@ class studentsList extends Component{
   }
 /// 确认是否下载
   confirmysl(url){
-    axios.get(url).then((response) => {
+    axios.get(url + '&export=true').then((response) => {
       if(response === undefined){
         return
       }

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

@@ -28,6 +28,9 @@ function disabledDateTime() {
     };
 }
 
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
 
 class CoursesNew extends Component {
 
@@ -572,6 +575,7 @@ class CoursesNew extends Component {
                                                         width={"210px"}
                                                         value={datatime === undefined ? "" :datatime === null ? "" : moment(datatime, dateFormat)}
                                                         disabledTime={disabledDateTime}
+																												disabledDate={disabledDate}
                                                         dropdownClassName="hideDisable"
                                                         onChange={this.onChangeTimepublishs}
                                                     />

public/react/src/modules/courses/poll/PollDetailIndex.js

@@ -75,7 +75,7 @@ class PollDetailIndex extends Component{
 
 	/// 确认是否下载
 	confirmysl(url){
-		axios.get(url).then((response) => {
+		axios.get(url + '?export=true' ).then((response) => {
 			if(response.data.status&&response.data.status===-1){
 
 			}else if(response.data.status&&response.data.status===-2){

public/react/src/modules/courses/poll/PollDetailTabForthRules.js

@@ -26,6 +26,12 @@ function disabledDateTime() {
     // disabledSeconds: () => range(1,60)
   }
 }
+
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
+
+
 class PollDetailTabForthRules extends Component{
   constructor(props){
     super(props);
@@ -404,6 +410,7 @@ class PollDetailTabForthRules extends Component{
                       showTime={{ format: 'HH:mm' }}
                       format="YYYY-MM-DD HH:mm"
                       disabledTime={disabledDateTime}
+											disabledDate={disabledDate}
                       disabled={ rule.e_timeflag ===undefined?rule.publish_time===null?false:!flagPageEdit:rule.p_timeflag == true ? true : !flagPageEdit}
                       style={{"height":"42px",width:'100%'}}
                     ></DatePicker>
@@ -429,6 +436,7 @@ class PollDetailTabForthRules extends Component{
                       showTime={{ format: 'HH:mm' }}
                       format="YYYY-MM-DD HH:mm"
                       disabledTime={disabledDateTime}
+											disabledDate={disabledDate}
                       disabled={  rule.e_timeflag ===undefined?rule.publish_time===null?false:!flagPageEdit:rule.e_timeflag == true ? true : !flagPageEdit}
                       style={{"height":"42px"}}
                     ></DatePicker>

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -2214,7 +2214,7 @@ class Listofworksstudentone extends Component {
 
 
 	confirmysl(url){
-		axios.get(url).then((response) => {
+		axios.get(url + '&export=true').then((response) => {
 			if(response === undefined){
 				return
 			}

public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js

@@ -539,7 +539,7 @@ class ShixunStudentWork extends Component {
 	}
 
 	confirmysl(url){
-		axios.get(url).then((response) => {
+		axios.get(url + '?export=true').then((response) => {
 			if(response === undefined){
 				return
 			}

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -47,6 +47,9 @@ function disabledDateTime() {
     }
 }
 
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
 
 class Trainingjobsetting extends Component {
     //unifiedsetting 统一设置
@@ -1766,16 +1769,16 @@ class Trainingjobsetting extends Component {
 
     daochushixunbaogao=()=>{
         let url =`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}`;
-        this.confirmysl(url);
+        this.confirmysl(url, url + '&export=true');
     }
 
     daochuzuoye =() =>{
         let url = `/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx`;
-        this.confirmysl(url);
+        this.confirmysl(url, url + '?export=true');
     }
 
-    confirmysl(url){
-        axios.get(url).then((response) => {
+    confirmysl(url, urlWithExport){
+        axios.get(urlWithExport).then((response) => {
             if(response === undefined){
                 return
             }
@@ -1935,6 +1938,7 @@ class Trainingjobsetting extends Component {
                                                         id={"publishtimeid"}
                                                         disabledDate={this.disabledStartDatestart}
                                                         disabledTime={disabledDateTime}
+																												disabledDate={disabledDate}
                                                         className={borreds}
                                                         showTime={{ format: 'HH:mm' }}
                                                         format="YYYY-MM-DD HH:mm"
@@ -1967,6 +1971,7 @@ class Trainingjobsetting extends Component {
                                                         showToday={false}
                                                         id={"end_timeid"}
                                                         disabledTime={disabledDateTime}
+																												disabledDate={disabledDate}
                                                         showTime={{ format: 'HH:mm' }}
                                                         className={borredss}
                                                         format="YYYY-MM-DD HH:mm"
@@ -2049,6 +2054,7 @@ class Trainingjobsetting extends Component {
                                         showToday={false}
                                         id={"late_timeid"}
                                         disabledTime={disabledDateTime}
+																				disabledDate={disabledDate}
                                         format="YYYY-MM-DD HH:mm"
                                         value={late_time && moment(late_time, dataformat)}
                                         onChange={this.onEndChangeys}

public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js

@@ -339,16 +339,16 @@ class Workquestionandanswer extends Component {
 
 	daochushixunbaogao=()=>{
 		let url =`/zip/shixun_report?homework_common_id=${this.props.match.params.homeworkid}`;
-		this.confirmysl(url);
+		this.confirmysl(url, url + '&export=true');
 	}
 
 	daochuzuoye =() =>{
 		let url = `/homework_commons/${this.props.match.params.homeworkid}/works_list.xlsx`;
-		this.confirmysl(url);
+		this.confirmysl(url, url + '?export=true');
 	}
 
-	confirmysl(url){
-		axios.get(url).then((response) => {
+	confirmysl(url, urlWithExport){
+		axios.get(urlWithExport).then((response) => {
 			if(response === undefined){
 				return
 			}

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

@@ -199,6 +199,10 @@ function disabledDateTime() {
 		// disabledSeconds: () => [0, 60],
 	};
 }
+
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
 export default class TPMsettings extends Component {
   constructor(props) {
     super(props)
@@ -1144,7 +1148,7 @@ export default class TPMsettings extends Component {
   }
   onChangeTimePicker =(value, dateString)=> {
     this.setState({
-      opening_time:moment(handleDateStrings(dateString))
+      opening_time: dateString=== ""?"":moment(handleDateStrings(dateString))
     })
   }
 
@@ -1871,6 +1875,7 @@ export default class TPMsettings extends Component {
 															width={178}
 															locale={locale}
 															disabledTime={disabledDateTime}
+															disabledDate={disabledDate}
 															placeholder="请选择开启时间"
 															value={opening_time===null||opening_time===""?"":moment(opening_time, dateFormat)}
 															onChange={this.onChangeTimePicker}

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -191,7 +191,9 @@ function disabledDateTime() {
 	};
 }
 
-
+function disabledDate(current) {
+	return current && current < moment().endOf('day').subtract(1, 'days');
+}
 class Newshixuns extends Component {
     constructor(props) {
         super(props)
@@ -743,7 +745,7 @@ class Newshixuns extends Component {
 
     onChangeTimePicker = (value, dateString) => {
         this.setState({
-            TimePickervalue: moment(handleDateStrings(dateString))
+            TimePickervalue: dateString=== ""?"":moment(handleDateStrings(dateString))
         })
     }
 
@@ -1288,7 +1290,7 @@ class Newshixuns extends Component {
                                         placeholder="请选择开启时间"
                                         onChange={this.onChangeTimePicker}
 																				value={TimePickervalue && moment(TimePickervalue, "YYYY-MM-DD HH:mm")}
-
+																				disabledDate={disabledDate}
 																				disabledTime={disabledDateTime}
 																				dropdownClassName="hideDisable"
                                     />