From eae00a74e6b2956c29870c830064da23a45b09c0 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 16:06:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/GraduationTaskssetting.js           |   2 +-
 .../Collaborators/Collaborators.js            | 154 +++++++++---------
 2 files changed, 82 insertions(+), 74 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index 830525af2..5ca6ee537 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -1169,7 +1169,7 @@ class GraduationTaskssettingapp extends Component{
                 <div className="stud-class-set bor-bottom-greyE pd20 edu-back-white pl36">
                   <div className={" font-16 color-dark h20 mb20"}>评分设置 </div>
                   <div className={"font-16 h20 mb20"}>最终成绩组成 <span className={"font-14 color-grey-c"}>（取各教师最终评分的平均分）</span></div>
-									<Tooltip placement="bottom" title={this.props.isAdmin()===true?flagPageEdit===true?commentstatustype===3?"正在交叉评阅，不可取消":"":"":""}>
+									<Tooltip placement="bottomLeft" title={this.props.isAdmin()===true?flagPageEdit===true?commentstatustype===3?"正在交叉评阅，不可取消":"":"":""}>
 										<Checkbox className="ml40 font-16" checked={crosscomment} onChange={this.funcrosscomment}
 															disabled={this.props.isAdmin()===true?flagPageEdit===true?commentstatustype===3?true:false:true:true} >启用交叉评阅 <span className={"font-14 color-grey-c"}>（给老师分配其他指导老师的学生作品）</span>
 										</Checkbox>
diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
index 7921941df..d67599bf1 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
@@ -16,8 +16,10 @@ import { getImageUrl, toPath } from 'educoder'
 
 import axios from 'axios';
 
+import NoneData from "../../../courses/coursesPublic/NoneData";
+
 import './Collaborators.css';
-import SchoolSelect from "../../../courses/members/modal/AddStudentModal";
+
 
 const $ = window.$;
 
@@ -88,6 +90,7 @@ class Collaborators extends Component {
         });
     }
     CollaboratorsshowModal = (type) => {
+
         if (type === "cooperation") {
             this.setState({
                 Collaboratorsvisibleadmin: false,
@@ -108,9 +111,10 @@ class Collaborators extends Component {
     }
 
     showCollaboratorsvisible = (type) => {
+
         this.setState({
             Collaboratorslist: [],
-            Searchadmin:[],
+            Searchadmin:undefined,
             onSearchcalue:""
         })
         let admintype = this.props.identity;
@@ -160,7 +164,7 @@ class Collaborators extends Component {
 
         let {collaboratorList,user_name,school_name} = this.state;
 			  this.setState({
-				       Searchadmin: [],
+				       // Searchadmin: undefined,
 					     spinnings:true,
 				    })
         // if (value === "") {
@@ -199,6 +203,7 @@ class Collaborators extends Component {
     }
 
     selectChangenickname = (e, key) => {
+
         let {Searchadmin} = this.state;
         let newlist = Searchadmin;
         for (var i = 0; i < newlist.length; i++) {
@@ -235,6 +240,7 @@ class Collaborators extends Component {
 
     }
     allChange = (e) => {
+
         let {Searchadmin} = this.state;
         let newlist = Searchadmin;
         for (var i = 0; i < newlist.length; i++) {
@@ -246,6 +252,7 @@ class Collaborators extends Component {
         })
     }
     submit_add_collaborators_form = () => {
+
         let id = this.props.match.params.shixunId;
         let {Searchadmin,collaboratorList} = this.state;
         let newlist = Searchadmin;
@@ -300,6 +307,7 @@ class Collaborators extends Component {
 
     }
     submit_addadminredio = () => {
+
         let {addadminrediovalue} = this.state;
 
         let id = this.props.match.params.shixunId;
@@ -371,6 +379,7 @@ class Collaborators extends Component {
 
 
 	contentViewScrolledit=(e)=>{
+
 		//滑动到底判断
 		let newscrollTop=parseInt(e.currentTarget.scrollTop);
 		let allclientHeight=e.currentTarget.clientHeight+newscrollTop;
@@ -395,7 +404,6 @@ class Collaborators extends Component {
 						newSearchadmin.push(newlist[i])
 					}
 
-					console.log(newSearchadmin)
 					this.setState({
 						Searchadmin: newSearchadmin,
 						collaboratorList: collaboratorList,
@@ -495,68 +503,68 @@ class Collaborators extends Component {
 
                 </Modal>
 
-                <Modal
-                    keyboard={false}
-                    title="添加合作者"
-                    visible={Collaboratorsvisibleadmin}
-                    closable={false}
-                    footer={null}
-										width={800}
-                >
-                    {/*<Search*/}
-                        {/*placeholder="输入用户的姓名、昵称、邮箱进行搜索"*/}
-                        {/*value={onSearchcalue}*/}
-                        {/*onSearch={(value) => this.onSearchadmin(value)}*/}
-                        {/*onInput={this.onSearchadmins}*/}
-                        {/*style={{width: '100%'}}*/}
-                    {/*/>*/}
-									<span className="mr10">姓名或手机号:</span>
-
-									<Input  placeholder="请输入姓名或手机号码搜索" value={user_name} onInput={(e) => {this.setState({user_name: e.target.value})}}
-												 style={{ width: '215px'}}
-									></Input>
-									<span className="label ml10 " style={{ minWidth: '36px' }}>单位:</span>
-								 <Input  placeholder="请输入单位名称" className="ml10" value={school_name} onInput={(e) => {this.setState({school_name: e.target.value})}}
-									style={{ width: '215px'}}
-								 >
+							{Collaboratorsvisibleadmin===true?<Modal
+								keyboard={false}
+								title="添加合作者"
+								visible={Collaboratorsvisibleadmin}
+								closable={false}
+								footer={null}
+								width={800}
+							>
+								{/*<Search*/}
+								{/*placeholder="输入用户的姓名、昵称、邮箱进行搜索"*/}
+								{/*value={onSearchcalue}*/}
+								{/*onSearch={(value) => this.onSearchadmin(value)}*/}
+								{/*onInput={this.onSearchadmins}*/}
+								{/*style={{width: '100%'}}*/}
+								{/*/>*/}
+								<span className="mr10">姓名或手机号:</span>
+
+								<Input  placeholder="请输入姓名或手机号码搜索" value={user_name} onInput={(e) => {this.setState({user_name: e.target.value})}}
+												style={{ width: '215px'}}
+								></Input>
+								<span className="label ml10 " style={{ minWidth: '36px' }}>单位:</span>
+								<Input  placeholder="请输入单位名称" className="ml10" value={school_name} onInput={(e) => {this.setState({school_name: e.target.value})}}
+												style={{ width: '215px'}}
+								>
 								</Input>
 
-									<a className="task-btn task-btn-orange ml20" onClick={() => this.onSearchadmin()}
-										 style={{ height: '30px', lineHeight: '30px', width: '70px'}}
-									>搜索</a>
-									<p className="clearfix pl35 mt20">
-										<span className="fl edu-txt-w100 task-hide font-bd ml10 edu-txt-left">姓名</span>
-										<span className="fl edu-txt-w100 task-hide font-bd">职业</span>
-										<span className="fl edu-txt-w180 task-hide font-bd ml80">单位</span>
-									</p>
-                    <div className="mt5" style={{background: '#f7f9fd'}}>
-											<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 === undefined ? <li style={{textAlign: 'center'}}>
-															<span>请试试搜索一下</span>
-														</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}
-																						onChange={(e) => this.selectChangenickname(e, key)}
-																						id={item.user_id}></Checkbox>
-																	<a className="task-hide color-grey3  fl span1 edu-txt-w80 edu-txt-left">{item.nickname}</a>
-																	<span className="task-hide fl color-grey edu-txt-w80 span2">{item.identify}</span>
-																	<span
-																		title={item.school_name}
-																		style={{width: '150px'}}
-																		className="span3 color-grey fl edu-txt-w260 task-hide ml50 task-hide" >{item.school_name}</span>
-																</li>
-															)
-														})
-
-														}
-													</ul>
-												</div>
-											</Spin>
-                    </div>
-                    <div className="mt10 clearfix">
+								<a className="task-btn task-btn-orange ml20" onClick={() => this.onSearchadmin()}
+									 style={{ height: '30px', lineHeight: '30px', width: '70px'}}
+								>搜索</a>
+								<p className="clearfix pl35 mt20">
+									<span className="fl edu-txt-w100 task-hide font-bd ml10 edu-txt-left">姓名</span>
+									<span className="fl edu-txt-w100 task-hide font-bd">职业</span>
+									<span className="fl edu-txt-w180 task-hide font-bd ml80">单位</span>
+								</p>
+								<div className="mt5" style={{background: '#f7f9fd'}}>
+									<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 === undefined ? <li style={{textAlign: 'center'}}>
+													<span>请试试搜索一下</span>
+												</li>:Searchadmin.length === 0 ?<NoneData/>: Searchadmin.map((item, key) => {
+													return (
+														<li key={key} style={{display: item.identify === "专业人士" ? "none" : "block"}}>
+															<Checkbox className="fl mr20" checked={item.checked}
+																				onChange={(e) => this.selectChangenickname(e, key)}
+																				id={item.user_id}></Checkbox>
+															<a className="task-hide color-grey3  fl span1 edu-txt-w80 edu-txt-left">{item.nickname}</a>
+															<span className="task-hide fl color-grey edu-txt-w80 span2">{item.identify}</span>
+															<span
+																title={item.school_name}
+																style={{width: '150px'}}
+																className="span3 color-grey fl edu-txt-w260 task-hide ml50 task-hide" >{item.school_name}</span>
+														</li>
+													)
+												})
+
+												}
+											</ul>
+										</div>
+									</Spin>
+								</div>
+								<div className="mt10 clearfix">
 
 										<span className="fl mr15">
 												<Checkbox className="fl" checked={allChangechecked} onChange={this.allChange}>全选</Checkbox>
@@ -567,15 +575,15 @@ class Collaborators extends Component {
 										</span>
 
 
-                    </div>
-									{useristrue===true?<span className={"color-red"}>请先选择用户</span>:""}
-                    <div className="clearfix edu-txt-center mt20">
-                        <a className="pop_close task-btn mb10 mr40 colorFFF"
-                           onClick={() => this.CollaboratorsshowModal("cooperation")}>取消</a>
-                        <a className="task-btn task-btn-orange"
-                           onClick={() => this.submit_add_collaborators_form()}>确定</a>
-                    </div>
-                </Modal>
+								</div>
+								{useristrue===true?<span className={"color-red"}>请先选择用户</span>:""}
+								<div className="clearfix edu-txt-center mt20">
+									<a className="pop_close task-btn mb10 mr40 colorFFF"
+										 onClick={() => this.CollaboratorsshowModal("cooperation")}>取消</a>
+									<a className="task-btn task-btn-orange"
+										 onClick={() => this.submit_add_collaborators_form()}>确定</a>
+								</div>
+							</Modal>:""}
 
                 <div  className="pl20" id="collaborators_list_info">
                     {