From 098049cfca16b539e406496f52e113586ccee951 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 27 Sep 2019 17:23:32 +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

---
 public/react/src/AppConfig.js                 |  4 +--
 .../courses/coursesPublic/NewShixunModel.js   |  2 +-
 .../graduation/tasks/GraduationAcross.js      | 22 +++++++-------
 .../tasks/GraduationTasksSubmitedit.js        | 29 ++++++++++++++-----
 .../tasks/GraduationTasksSubmitnew.js         |  4 ++-
 5 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index d402da0ec..bc7fa8070 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -84,9 +84,9 @@ export function initAxiosInterceptors(props) {
                     }
                     config.url = `${proxy}${url}`;
                     if (config.url.indexOf('?') == -1) {
-                        config.url = `${config.url}?debug=${debugType}`
+                        config.url = `${config.url}?debug=${debugType}`;
                     } else {
-                        config.url = `${config.url}&debug=${debugType}`
+                        config.url = `${config.url}&debug=${debugType}`;
                     }
                 } else {
                     // 加api前缀
diff --git a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
index 2d0271a23..5fe9c8aa0 100644
--- a/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
+++ b/public/react/src/modules/courses/coursesPublic/NewShixunModel.js
@@ -485,7 +485,7 @@ class NewShixunModel extends Component{
 									</span>}
 
 									{this.props.type==='shixuns'?"":<span className="fl color-grey-9 pointer mr30">
-										<a className={" color-grey-6"} onClick={()=>this.updatepathlist("myshixuns_count",order)}>使用人数</a>
+										<a className={" color-grey-6"} onClick={()=>this.updatepathlist("myshixuns_count",order)}>学习人数</a>
 										<sapn className="relativef ml5 " >
 											<i className={order==="asc"&&sort==="myshixuns_count"?"iconfont icon-sanjiaoxing-up font-12 ntopsj color-grey-9 color-blue":"iconfont icon-sanjiaoxing-up font-12 ntopsj  color-grey-9"}></i>
 											<i className={order==="desc"&&sort==="myshixuns_count"?"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj color-grey-9 color-blue":"iconfont icon-sanjiaoxing-down font-12 nyslbottomsj  color-grey-9"}></i>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js b/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
index 1fab14d00..46b1533f7 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
@@ -523,17 +523,17 @@ class GraduationAcross extends Component{
             </span>
           </span>
         </div>
-				{
-					<style>
-						{
-							`
-							.ant-table-thead > tr > th .anticon-filter, .ant-table-thead > tr > th .ant-table-filter-icon{
-    						left: 40px;
-							}
-							`
-						}
-					</style>
-				}
+				{/*{*/}
+					{/*<style>*/}
+						{/*{*/}
+							{/*`*/}
+							{/*.ant-table-thead > tr > th .anticon-filter, .ant-table-thead > tr > th .ant-table-filter-icon{*/}
+    						{/*left: 40px;*/}
+							{/*}*/}
+							{/*`*/}
+						{/*}*/}
+					{/*</style>*/}
+				{/*}*/}
         <Table rowSelection={rowSelection} columns={bindTableColumn(this)} dataSource={users} pagination={false} onChange={this.handleTableChange} loading={tableLoading}></Table>
         <div className="clearfix mt20 pb30 pl30 pr30 acrossfoot">
           <div className="fl">
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index 7c697e31b..21d340200 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -334,22 +334,27 @@ class GraduationTasksSubmitedit extends Component{
 
   }
 
-  delecttask_status=(id)=>{
+  delecttask_status=(id,student_id)=>{
+  	let newid=id===undefined||id===null?student_id:id;
     let{selectmemberslist,task_status}=this.state;
     let newlist=task_status;
     let selects=selectmemberslist;
 
     for(var i=0; i<newlist.length; i++){
-      if(newlist[i]===id){
+      if(newlist[i]===newid){
         newlist.splice(i,1)
       }
     }
 
     for(var z=0; z<selects.length; z++){
-      if(selects[z].user_id===id){
+      if(selects[z].user_id===newid){
         selects.splice(z,1)
-      }
+      }else if(selects[z].student_id===newid){
+				selects.splice(z,1)
+			}
     }
+		console.log(newlist)
+    console.log(selects)
     this.setState({
       task_status:newlist,
       selectmemberslist:selects
@@ -380,10 +385,12 @@ class GraduationTasksSubmitedit extends Component{
 
     for(var list of selectmemberslist){
 
-      if(list.user_id!=undefined&&list.user_id!=null){
-        userids.push(list.user_id)
+      if(list.student_id!=undefined&&list.student_id!=null){
+        userids.push(list.student_id)
       }
-
+      if(list.user_id!=undefined&&list.user_id!=null){
+				userids.push(list.user_id)
+			}
     }
 
     let listid=[];
@@ -392,6 +399,7 @@ class GraduationTasksSubmitedit extends Component{
       listid.push(list.response == undefined ? list.id : list.response.id)
     }
 
+    console.log(userids)
       this.props.form.validateFields((err, values) => {
 
 
@@ -401,6 +409,7 @@ class GraduationTasksSubmitedit extends Component{
 						// debugger
             return
           }
+
           if(workslist.task_type===2){
             if(userids.length<workslist.min_num){
               this.setState({
@@ -460,6 +469,9 @@ class GraduationTasksSubmitedit extends Component{
             // }
           }).catch((error) => {
             console.log(error)
+						this.setState({
+							spinnings:false
+						})
           })
 
 
@@ -785,6 +797,7 @@ class GraduationTasksSubmitedit extends Component{
                     <div className={"members fl autos"}>
 
                       {selectmemberslist&&selectmemberslist.map((item,key)=>{
+                      	console.log(item)
 												if(item.group_name!=undefined) {
 													return (
 														<div key={key} style={{
@@ -799,7 +812,7 @@ class GraduationTasksSubmitedit extends Component{
 															{key > 0 ?
 																<div className={"fr ml20"}><i className={"iconfont icon-shanchudiao fl  color-grey-9"}
 																															style={{marginTop: '-4px'}}
-																															onClick={() => this.delecttask_status(item.user_id)}></i>
+																															onClick={() => this.delecttask_status(item.user_id,item.student_id)}></i>
 																</div> : ""}
 																<div className={"both"}></div>
 														</div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 7438b36a4..698ab5c97 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -383,7 +383,7 @@ class GraduationTasksSubmitnew extends Component{
     let  userids=[];
 
     for(var list of selectmemberslist){
-
+debugger
       if(list.user_id!=undefined&&list.user_id!=null){
         userids.push(list.user_id)
       }
@@ -408,6 +408,8 @@ class GraduationTasksSubmitnew extends Component{
 						// debugger
             return
           }
+
+
           if(workslist&&workslist.task_type===2){
             if(userids!=undefined){
               if(userids.length<workslist.min_num){