From 20949e6fca97907fee99e66346222eb7bff2ea9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 25 Sep 2019 14:47:39 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/shixunHomework/shixunHomework.js |  8 +++++---
 public/react/src/modules/login/LoginDialog.js        | 12 +++++++-----
 .../paths/PathDetail/DetailCardsEditAndAdd.js        |  2 +-
 .../paths/PathDetail/DetailCardsEditAndEdit.js       |  2 +-
 .../tpm/shixunchild/Collaborators/Collaborators.js   |  8 ++++----
 5 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
index eb59ce6f1..5298baffc 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js
@@ -84,7 +84,8 @@ class ShixunHomework extends Component{
 	}
   componentDidMount() {
 		this.setState({
-			isSpin:true
+			isSpin:true,
+
 		})
 		if(this.props.match.params.main_id){
 			this.setState({
@@ -108,7 +109,8 @@ class ShixunHomework extends Component{
   }
   seactall=(id)=>{
    this.setState({
-     isSpin:true
+     isSpin:true,
+		 checkBoxValues:[]
    })
     let coursesId=this.props.match.params.coursesId;
     let url="/courses/"+coursesId+"/homework_commons.json?type=4";
@@ -1080,7 +1082,7 @@ class ShixunHomework extends Component{
                   </span>:
                   <WordsBtn style="blue" onClick={()=>this.editDir(datas&&datas.category_name)} className={"mr30 font-16"}>目录重命名</WordsBtn>:""}
               {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?<WordsBtn style="blue" className="mr30 font-16" onClick={this.createCommonpath}>选用实践课程</WordsBtn>:"":""}
-              {this.props.isAdmin()===true?<a className={"btn colorblue font-16"} onClick={()=>this.showNewShixunModelType()}>选用实训</a>:""}
+              {this.props.isAdmin()===true?<a className={"btn colorblue font-16"} onClick={()=>this.showNewShixunModelType()}>选用实训项目</a>:""}
             </li>
             </p>
 
diff --git a/public/react/src/modules/login/LoginDialog.js b/public/react/src/modules/login/LoginDialog.js
index f46d549ed..dd34d8605 100644
--- a/public/react/src/modules/login/LoginDialog.js
+++ b/public/react/src/modules/login/LoginDialog.js
@@ -399,12 +399,14 @@ class LoginDialog extends Component {
     }
     handleDialogClose = () => {
 
+     	console.log(this.props.match)
+debugger
 			if(this.props.match===undefined){
-				// window.location.href="/";
-				this.setState({
-					isRender: false
-				})
-				this.props.Modifyloginvalue();
+			 window.location.href="/";
+				// this.setState({
+				// 	isRender: false
+				// })
+				// this.props.Modifyloginvalue();
 			}else{
         this.setState({
           isRender: false
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index 433146b8c..ed4cc85eb 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -374,7 +374,7 @@ class DetailCardsEditAndAdd extends Component{
               <p className="clearfix mb30">
                 <a onClick={this.AddShixunBox} className="fl defalutGreyBorder color-grey-6 ml37">
                   <i className="iconfont icon-tianjiafangda fl mr5"></i>
-                  选择实训</a>
+									选用实训项目</a>
                 <span id="sx_notice" className="fl ml20 color-grey-9 mt5">选择下面实训后，可以通过拖拽进行排序调整</span>
               </p>
 
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
index 3d1559797..a37dffecb 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
@@ -378,7 +378,7 @@ class DetailCardsEditAndEdit extends Component{
               </div>
               <p className="clearfix mb30">
                 <a onClick={this.AddShixunBox} className="fl defalutGreyBorder color-grey-6 ml37">
-                  <i className="iconfont icon-tianjiafangda fl mr5"></i>选择实训
+                  <i className="iconfont icon-tianjiafangda fl mr5"></i>选用实训项目
                 </a>
                 <span id="sx_notice" className="fl ml20 color-grey-9 mt5">选择下面实训后，可以通过拖拽进行排序调整</span>
               </p>
diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
index 0212b4ba4..7921941df 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
@@ -34,7 +34,7 @@ class Collaborators extends Component {
             Collaboratorsvisibleadmin: false,
             value: 1,
 					  page: 1,
-            Searchadmin: [],
+            Searchadmin: undefined,
             allChangechecked: false,
             Collaboratorslist: [],
             Collaboratorslisttype: false,
@@ -434,10 +434,10 @@ class Collaborators extends Component {
             height: '30px',
             lineHeight: '30px',
         };
-         // console.log(collaboratorList)
 
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
 
+		console.log(Searchadmin)
 		return (
             <React.Fragment>
                 <p className="clearfix mt30"
@@ -533,9 +533,9 @@ class Collaborators extends Component {
 											<Spin indicator={antIcon} spinning={this.state.spinnings}>
 												<div className="clearfix">
 													<ul className="upload_select_box fl" id="search_not_teachers_list"    onScroll={this.contentViewScrolledit}>
-														{Searchadmin.length === 0 ? <li style={{textAlign: 'center'}}>
+														{Searchadmin === undefined ? <li style={{textAlign: 'center'}}>
 															<span>请试试搜索一下</span>
-														</li> : Searchadmin.map((item, key) => {
+														</li>:Searchadmin.length === 0 ? "": Searchadmin.map((item, key) => {
 															return (
 																<li key={key} style={{display: item.identify === "专业人士" ? "none" : "block"}}>
 																	<Checkbox className="fl mr20" checked={item.checked}