From 9601c3b1593a54b5f76b4d1a4d34b1d227af0521 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 29 Aug 2019 16:21:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/coursesPublic/Startshixuntask.js | 3 +--
 public/react/src/modules/courses/elearning/Elearning.js        | 2 +-
 public/react/src/modules/courses/elearning/YslDetailCards.js   | 2 +-
 .../src/modules/courses/shixunHomework/ShixunhomeWorkItem.js   | 3 +--
 public/react/src/modules/paths/PathDetail/DetailCards.js       | 2 +-
 public/react/src/modules/tpm/TPMBanner.js                      | 3 +--
 .../react/src/modules/tpm/shixunchild/Challenges/Challenges.js | 2 +-
 7 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/Startshixuntask.js b/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
index 4075eff03..9b374a443 100644
--- a/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
+++ b/public/react/src/modules/courses/coursesPublic/Startshixuntask.js
@@ -150,8 +150,7 @@ class Startshixuntask extends Component{
 					keyboard={false}
 				>
 					<div className="task-popup-content">
-						<p className="task-popup-text-center font-16 pb20">本实训的开启时间：{shixunsmessage} <br/>开启时间之前不能挑战
-						</p>
+						<p className="task-popup-text-center font-16 pb20">目前该实训项目尚在内测中，将于{shixunsmessage}之后开放，谢谢！</p>
 					</div>
 					<div className="task-popup-submit clearfix">
 						{/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
diff --git a/public/react/src/modules/courses/elearning/Elearning.js b/public/react/src/modules/courses/elearning/Elearning.js
index e4ae3fe94..21d430a2f 100644
--- a/public/react/src/modules/courses/elearning/Elearning.js
+++ b/public/react/src/modules/courses/elearning/Elearning.js
@@ -293,7 +293,7 @@ class Elearning extends Component{
 						footer={null}
 					>
 						<div className="task-popup-content">
-							<p className="task-popup-text-center font-16 pb20">本实训的开启时间：{this.state.shixunsmessages} <br/>开启时间之前不能挑战 </p>
+							<p className="task-popup-text-center font-16 pb20">目前该实训项目尚在内测中，将于{this.state.shixunsmessages}之后开放，谢谢！</p>
 						</div>
 						<div className="task-popup-submit clearfix">
 							{/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
diff --git a/public/react/src/modules/courses/elearning/YslDetailCards.js b/public/react/src/modules/courses/elearning/YslDetailCards.js
index a1ad44e67..eef44346e 100644
--- a/public/react/src/modules/courses/elearning/YslDetailCards.js
+++ b/public/react/src/modules/courses/elearning/YslDetailCards.js
@@ -141,7 +141,7 @@ class YslDetailCards extends Component{
 					footer={null}
 				>
 					<div className="task-popup-content">
-						<p className="task-popup-text-center font-16 pb20">本实训的开启时间：{this.state.shixunsmessage} <br/>开启时间之前不能挑战 </p>
+						<p className="task-popup-text-center font-16 pb20">目前该实训项目尚在内测中，将于{this.state.shixunsmessage}之后开放，谢谢！</p>
 					</div>
 					<div className="task-popup-submit clearfix">
 						{/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
index 9a9f9bd29..c3170bf3a 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js
@@ -218,8 +218,7 @@ class ShixunhomeWorkItem extends Component{
           footer={null}
         >
           <div className="task-popup-content">
-            <p className="task-popup-text-center font-16 pb20">本实训的开启时间：{shixunsmessage} <br/>开启时间之前不能挑战
-            </p>
+            <p className="task-popup-text-center font-16 pb20">目前该实训项目尚在内测中，将于{shixunsmessage}之后开放，谢谢！</p>
           </div>
           <div className="task-popup-submit clearfix">
             {/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
diff --git a/public/react/src/modules/paths/PathDetail/DetailCards.js b/public/react/src/modules/paths/PathDetail/DetailCards.js
index 780ed4071..eec340249 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCards.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCards.js
@@ -361,7 +361,7 @@ class DetailCards extends Component{
 					footer={null}
 				>
 					<div className="task-popup-content">
-						<p className="task-popup-text-center font-16 pb20">本实训的开启时间：{this.state.shixunsmessage} <br/>开启时间之前不能挑战 </p>
+						<p className="task-popup-text-center font-16 pb20">目前该实训项目尚在内测中，将于{this.state.shixunsmessage}之后开放，谢谢！</p>
 					</div>
 					<div className="task-popup-submit clearfix">
 						{/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
diff --git a/public/react/src/modules/tpm/TPMBanner.js b/public/react/src/modules/tpm/TPMBanner.js
index 948c42c50..fc9c53be1 100644
--- a/public/react/src/modules/tpm/TPMBanner.js
+++ b/public/react/src/modules/tpm/TPMBanner.js
@@ -731,8 +731,7 @@ class TPMBanner extends Component {
                     footer={null}
                 >
                     <div className="task-popup-content">
-                        <p className="task-popup-text-center font-16 pb20">本实训的开启时间：{shixunsmessage} <br/>开启时间之前不能挑战
-                        </p>
+                        <p className="task-popup-text-center font-16 pb20">目前该实训项目尚在内测中，将于{shixunsmessage}之后开放，谢谢！</p>
                     </div>
                     <div className="task-popup-submit clearfix">
                         {/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}
diff --git a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
index 66054142a..ef94f7fa4 100644
--- a/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
+++ b/public/react/src/modules/tpm/shixunchild/Challenges/Challenges.js
@@ -587,7 +587,7 @@ class Challenges extends Component {
               footer={null}
             >
               <div className="task-popup-content">
-                <p className="task-popup-text-center font-16 pb20">本实训的开启时间：{shixunsmessage} <br/>开启时间之前不能挑战 </p>
+                <p className="task-popup-text-center font-16 pb20">目前该实训项目尚在内测中，将于{shixunsmessage}之后开放，谢谢！ </p>
               </div>
               <div className="task-popup-submit clearfix">
                 {/*<a onClick={this.hidestartshixunCombattype} className="task-btn fl">取消</a>*/}

From b55b0b2506af97b6f1fc405510dee6104d3bf334 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Thu, 29 Aug 2019 16:48:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=BE=E5=A0=82=E4=B8=AA=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=BF=BB=E9=A1=B5=E9=80=89=E6=8B=A9=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Resource/index.js           | 5 +++--
 public/react/src/modules/courses/boards/index.js             | 5 ++++-
 public/react/src/modules/courses/busyWork/commonWork.js      | 5 +++--
 public/react/src/modules/courses/exercise/Exercise.js        | 5 +++--
 public/react/src/modules/courses/graduation/tasks/index.js   | 5 +++--
 public/react/src/modules/courses/graduation/topics/index.js  | 5 +++--
 public/react/src/modules/courses/poll/Poll.js                | 5 +++--
 .../src/modules/courses/shixunHomework/shixunHomework.js     | 5 +++--
 8 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index 1565f5abb..8d9d3aa44 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -493,7 +493,8 @@ class Fileslists extends Component{
     let selectpagetype=selectpage===page?true:false
     this.setState({
       page:page,
-      checkAllValue:selectpagetype
+      checkAllValue:selectpagetype,
+			checkBoxValues:[]
     })
 
     let{pagesize,tagname,searchValue,sort,sorttype,coursesecondcategoryid}=this.state;
@@ -801,7 +802,7 @@ class Fileslists extends Component{
 
 						{this.props.isAdmin()? files===undefined?'' :files.length===0? "":<div className="mt20 edu-back-white padding20-30" style={{display:this.props.isAdmin()||this.props.isStudent()?"":"none"}}>
               <div className="clearfix">
-                {this.props.isAdmin()? <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>:""}
+                {this.props.isAdmin()? <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个   （不支持跨页勾选）</Checkbox>:""}
                 <div className="studentList_operation_ul">
                   {this.props.isAdmin()?<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onDelete}>删除</a></li>:""}
                   {this.props.isAdmin()?<li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={this.onSend}>发送</a></li>:""}
diff --git a/public/react/src/modules/courses/boards/index.js b/public/react/src/modules/courses/boards/index.js
index 60d327799..dbb6dea1c 100644
--- a/public/react/src/modules/courses/boards/index.js
+++ b/public/react/src/modules/courses/boards/index.js
@@ -283,6 +283,9 @@ class Boards extends Component{
     console.log('checked = ', checkedValues);
   }
   onPageChange = (pageNumber) => {
+  	this.setState({
+			checkBoxValues:[]
+		})
     this.fetchAll(null, pageNumber)
   }
 
@@ -365,7 +368,7 @@ class Boards extends Component{
 
 				{messages&&messages.length == 0?"": isAdmin && <div className="mt20 edu-back-white padding20-30">
 				<div className="clearfix">
-            {isAdmin&&<Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>}
+            {isAdmin&&<Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个   （不支持跨页勾选）</Checkbox>}
             <div className="studentList_operation_ul">
               { !!isAdmin && 
               <React.Fragment>
diff --git a/public/react/src/modules/courses/busyWork/commonWork.js b/public/react/src/modules/courses/busyWork/commonWork.js
index d5ac0be68..9f98b9294 100644
--- a/public/react/src/modules/courses/busyWork/commonWork.js
+++ b/public/react/src/modules/courses/busyWork/commonWork.js
@@ -153,7 +153,8 @@ class commonWork extends Component{
 
   onPageChange=(pageNumber)=>{
     this.setState({
-      page:pageNumber
+      page:pageNumber,
+			checkBoxValues:[]
     })
     let {search,order}=this.state;
     this.getList(pageNumber,search,order);
@@ -430,7 +431,7 @@ class commonWork extends Component{
             mainList && mainList.course_identity < 5 && mainList.homeworks.length>0 &&
           <div className="mt20 edu-back-white padding20-30">
             <div className="clearfix" >
-              <Checkbox className="fl" onChange={this.changeAll}  checked={checkAll}>已选 {checkBoxValues.length} 个</Checkbox>
+              <Checkbox className="fl" onChange={this.changeAll}  checked={checkAll}>已选 {checkBoxValues.length} 个     （不支持跨页勾选）</Checkbox>
               <div className="studentList_operation_ul">
                 <li className="li_line">
                   <a href="javascript:void(0)" className="color-grey-9"
diff --git a/public/react/src/modules/courses/exercise/Exercise.js b/public/react/src/modules/courses/exercise/Exercise.js
index 83227fb5a..2bc646fb3 100644
--- a/public/react/src/modules/courses/exercise/Exercise.js
+++ b/public/react/src/modules/courses/exercise/Exercise.js
@@ -130,7 +130,8 @@ class Exercise extends Component{
     //切换分页
     changePage=(pageNumber)=>{
         this.setState({
-            page:pageNumber
+            page:pageNumber,
+					  checkBoxValues:[]
         })
         let{type,StudentList_value,limit}=this.state
         this.InitList(type,StudentList_value,pageNumber,limit);
@@ -522,7 +523,7 @@ class Exercise extends Component{
                 <Spin size="large" spinning={this.state.isSpin}>
                     {this.props.isAdmin()?exercises && exercises.length ===0?"":<div className="mt20 mb20 edu-back-white padding20-30">
                                 <div className="clearfix">
-                                    <Checkbox className="fl" onChange={this.onCheckAll}  checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>
+                                    <Checkbox className="fl" onChange={this.onCheckAll}  checked={checkAllValue}>已选 {checkBoxValues.length} 个   （不支持跨页勾选）</Checkbox>
                                     <div className="studentList_operation_ul">
                                         <li className="li_line"><a className="color-grey-9" onClick={()=>this.ActionPoll("delete")}>删除</a></li>
                                         <li className="li_line">
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index 18e6f3deb..804533b0c 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -360,7 +360,8 @@ class GraduationTasks extends Component{
    let selectpagetype=selectpage===page?true:false
      this.setState({
        page:page,
-       checkAllValue:selectpagetype
+       checkAllValue:selectpagetype,
+			 checkBoxValues:[]
      })
 
     this.fetchAll(search,page,order);
@@ -700,7 +701,7 @@ class GraduationTasks extends Component{
 
         {this.props.isAdmin()?all_count===undefined?'' :all_count===0?"": <div className="mt20 edu-back-white padding20-30">
           <div className="clearfix">
-             <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>
+             <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个   （不支持跨页勾选）</Checkbox>
              <div className="studentList_operation_ul">
 
               <li className="li_line"><a className="color-grey-9" onClick={this.onDelete}>删除</a></li>
diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js
index 61a9bea67..b5be57564 100644
--- a/public/react/src/modules/courses/graduation/topics/index.js
+++ b/public/react/src/modules/courses/graduation/topics/index.js
@@ -153,7 +153,8 @@ class Boards extends Component{
   // 分页
   onChangePage=(pageNum)=>{
     this.setState({
-      page:pageNum
+      page:pageNum,
+			checkBoxValues:[]
     })
     let {status,searchValue}=this.state;
     this.fetchAll(searchValue,pageNum,status);
@@ -430,7 +431,7 @@ onBoardsNew=()=>{
                   // 超级管理员、教师、助教
                   isAdmin ?
                   <div className="clearfix mt20 edu-back-white padding20-30">
-                    <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>
+                    <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个    （不支持跨页勾选）</Checkbox>
                     <div className="studentList_operation_ul">
                       <li className="li_line"><a href="javascript:void(0)" className="color-grey-9" onClick={()=>this.onDelete(1)}>删除</a></li>
                       {
diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index aae09b41c..b395b2bd2 100644
--- a/public/react/src/modules/courses/poll/Poll.js
+++ b/public/react/src/modules/courses/poll/Poll.js
@@ -151,7 +151,8 @@ class Poll extends Component{
   changePage=(pageNumber)=>{
 
     this.setState({
-      page:pageNumber
+      page:pageNumber,
+			checkBoxValues:[]
     })
     let{type,StudentList_value}=this.state
     this.InitList(type,StudentList_value,pageNumber);
@@ -543,7 +544,7 @@ class Poll extends Component{
           pollsList && pollsList.length > 0 && isAdmin && 
           <div className="mt20 edu-back-white padding20-30">
             <div className="clearfix">
-              <Checkbox className="fl" onChange={this.onCheckAll}  checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>
+              <Checkbox className="fl" onChange={this.onCheckAll}  checked={checkAllValue}>已选 {checkBoxValues.length} 个  （不支持跨页勾选）</Checkbox>
               <div className="studentList_operation_ul">
                 <li className="li_line"><a className="color-grey-9" onClick={()=>this.ActionPoll("delete")}>删除</a></li>
                 <li className="li_line">
diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index 88dffa232..528495a9b 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -559,7 +559,8 @@ class ShixunHomework extends Component{
     let {Coursename,order}=this.state;
 
     this.setState({
-      page:pageNumber
+      page:pageNumber,
+			checkBoxValues:[]
     })
 
     this.homeworkupdatalist(Coursename,pageNumber,order);
@@ -1070,7 +1071,7 @@ class ShixunHomework extends Component{
 					<div className="mt20 edu-back-white padding20-30">
 
           <div className="clearfix">
-            <Checkbox className="fl" style={{marginTop:'0px'}}checked={checkedtype} onClick={this.funselect}>已选 {checkBoxValues&&checkBoxValues.length} 个</Checkbox>
+            <Checkbox className="fl" style={{marginTop:'0px'}}checked={checkedtype} onClick={this.funselect}>已选 {checkBoxValues&&checkBoxValues.length} 个   （不支持跨页勾选）</Checkbox>
             <div className="studentList_operation_ul">
                 <li className="li_line"><a className="color-grey-9" onClick={this.onDelete}>删除</a></li>
                 <li className="li_line"><a className="color-grey-9" onClick={this.homeworkstart}>立即发布</a></li>