From 14acd39a07d10c70d601c59b610286d6ee5f445c 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, 15 Aug 2019 14:51:22 +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

---
 .../modules/courses/coursesDetail/CoursesLeftNav.js  |  5 +++--
 .../graduation/tasks/GraduationTasksSubmitnew.js     |  3 +++
 .../src/modules/courses/graduation/tasks/index.js    | 12 +++++++++---
 .../src/modules/courses/graduation/topics/index.js   |  8 ++++++++
 4 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
index 849621259..cb33256fb 100644
--- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
+++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js
@@ -837,7 +837,7 @@ class Coursesleftnav extends Component{
                 .droppableul{
                   max-height: 500px;
                   overflow-y:auto;
-                  overflow:hidden auto;
+                  overflow-x:hidden;
                 }
 
                 .mr13{
@@ -928,8 +928,9 @@ class Coursesleftnav extends Component{
 
                                                                 <a className="fl pl46 pd0  Draggablelichild">
                                                                   <span className={this.props.location.pathname===iem.second_category_url?"color-blue fl ml38 maxwidth155 task-hide  Draggablelichild":"fl ml38 maxwidth155 task-hide  Draggablelichild"}>{iem.category_name}</span>
-                                                                  <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14":item.type===twosandiantypes&&twosandiantype===index?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
+                                                                  <span className={twosandiantype===undefined?this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14":item.type===twosandiantypes&&twosandiantype===index&&iem.category_name!="未分班"?"none":this.props.location.pathname===iem.second_category_url?"fr mr20 color-blue Draggablelichild font-14":"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
                                                                   {item.type===twosandiantypes&&twosandiantype===index?
+																																		iem.category_name==="未分班"?"":
                                                                     iem.category_type==="graduation_topics"||iem.category_type==="graduation_tasks"?
                                                                       <span className={"fr mr20 color999  Draggablelichild font-14"} >{iem.category_count===0?"":iem.category_count}</span>
                                                                       :<Popover placement="right" content={this.content(item,iem,index)} trigger="hover" key={index}>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index a9dd5bc13..dadc621b2 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -472,6 +472,9 @@ class GraduationTasksSubmitnew extends Component{
               // }
             // }
           }).catch((error) => {
+						this.setState({
+							spinnings:false
+						});
             console.log(error)
           })
 
diff --git a/public/react/src/modules/courses/graduation/tasks/index.js b/public/react/src/modules/courses/graduation/tasks/index.js
index 80dceb562..b54815b2f 100644
--- a/public/react/src/modules/courses/graduation/tasks/index.js
+++ b/public/react/src/modules/courses/graduation/tasks/index.js
@@ -179,8 +179,13 @@ class GraduationTasks extends Component{
     })
         .then((result)=>{
           if(result.data.status==0){
+          	this.setState({
+							checkBoxValues:[],
+							checkAllValue:false
+						})
+						this.fetchAll(search,page,order,15)
             this.props.showNotification(`${result.data.message}`);
-            this.fetchAll(search,page,order,15)
+
           }
         }).catch((error)=>{
       console.log(error);
@@ -554,9 +559,10 @@ class GraduationTasks extends Component{
   }
   // 题库选用成功后刷新页面
   useBankSuccess=(checkBoxValues,object_ids)=>{
-  	// debugger
+      //debugger
     let {search,page,order,all_count} = this.state;
     this.fetchAll(search,page,order,all_count)
+
   }
   getcourse_groupslist=(id)=>{
     this.setState({
@@ -651,7 +657,7 @@ class GraduationTasks extends Component{
                 </Link>
               </WordsBtn> : ""}
 
-              {this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={(checkBoxValues,object_ids)=>this.useBankSuccess=(checkBoxValues,object_ids)}></UseBank>:""}
+              {this.props.isAdmin() ?<UseBank {...this.props} {...this.state} object_type={"gtask"} useBankSuccess={(checkBoxValues,object_ids)=>this.useBankSuccess(checkBoxValues,object_ids)}></UseBank>:""}
             </React.Fragment>
 
           }
diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js
index 6587ed0c6..2d47cabf0 100644
--- a/public/react/src/modules/courses/graduation/topics/index.js
+++ b/public/react/src/modules/courses/graduation/topics/index.js
@@ -355,6 +355,14 @@ onBoardsNew=()=>{
       DownloadMessageval:undefined
     })
   }
+
+	// 题库选用成功后刷新页面
+	useBankSuccess=(checkBoxValues,object_ids)=>{
+		//debugger
+		let {search,page,order,all_count} = this.state;
+		this.fetchAll(search,page,order,all_count)
+
+	}
   render(){
     let { 
       searchValue,