From b5941cf2e9b2c00723103dd490ec1d124e8a4e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 28 Sep 2019 11:13:30 +0800
Subject: [PATCH] b

---
 public/react/config/webpack.config.dev.js          |  2 +-
 .../courses/coursesPublic/ModulationModal.js       | 14 +++++++++++++-
 .../courses/graduation/tasks/GraduationAcross.js   |  9 +++++----
 .../graduation/tasks/GraduationTaskssettinglist.js | 12 +++++++-----
 .../paths/PathDetail/DetailCardsEditAndAdd.js      |  1 +
 .../paths/PathDetail/DetailCardsEditAndEdit.js     |  1 +
 6 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index fe525154f..ef38a18f8 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -32,7 +32,7 @@ module.exports = {
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
 	// devtool: "cheap-module-eval-source-map",
   // 开启调试
-  devtool: "source-map",  // 开启调试
+  //devtool: "source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.
diff --git a/public/react/src/modules/courses/coursesPublic/ModulationModal.js b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
index 974077793..1857f6814 100644
--- a/public/react/src/modules/courses/coursesPublic/ModulationModal.js
+++ b/public/react/src/modules/courses/coursesPublic/ModulationModal.js
@@ -94,7 +94,19 @@ class ModulationModal extends Component{
 
               <li style={{height:"20px",lineHeight:"20px"}}><span className={textareavaltype===true?"color-red":"none"}>原因不能为空</span></li>
             </div>
-            <li>
+
+							<style>
+								{
+
+									`
+									.pdl10{
+									 padding-left:10px;
+									}
+									`
+								}
+							</style>
+
+            <li className={"pdl10"}>
               <Input style={{
                 width: '20%',
               }}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js b/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
index 46b1533f7..5ff1c0551 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationAcross.js
@@ -337,7 +337,7 @@ class GraduationAcross extends Component{
       chooseCount,
       chooseId,
       AcrossTeamIds,
-      searchValue,showflag
+      searchValue,showflag,
      } = this.state;
     let { modalVisible } = this.props;
     let courseId = this.props.match.params.coursesId;
@@ -372,7 +372,8 @@ class GraduationAcross extends Component{
     // 筛选下拉列表
     const teacherList = searchValue ? teachers&&teachers.filter(e=>e.user_name.indexOf(searchValue)>-1) : teachers;
     const course_groupsList = searchValue ? course_groups&&course_groups.filter(e=>e.name.indexOf(searchValue)>-1) : course_groups;
-    return(
+    const graduation_groupslist =searchValue ? graduation_groups&&graduation_groups.filter(e=>e.name.indexOf(searchValue)>-1) : graduation_groups;
+		return(
       <Modal
       className={"AcrossModal"}
       title={"交叉评阅设置"}
@@ -501,7 +502,7 @@ class GraduationAcross extends Component{
 										></Input>
 									</div>:""}
 									{comment_status == 2 &&teacherList&&teacherList.length>2?	<Checkbox className={"pd8px"} onChange={(e)=>this.checkonChange(e,teacherList)}>全选</Checkbox>:""}
-								  {comment_status != 2 &&course_groupsList&&course_groupsList.length>2?	<Checkbox className={"pd8px"} onChange={(e)=>this.checkonChange(e,course_groupsList)}>全选</Checkbox>:""}
+								  {comment_status != 2 &&graduation_groupslist&&graduation_groupslist.length>2?	<Checkbox className={"pd8px"} onChange={(e)=>this.checkonChange(e,graduation_groupslist)}>全选</Checkbox>:""}
                   {menu}
                   <Divider style={{ margin: '4px 0 0' }} />
                   <div style={{ padding: '8px 12px', cursor: 'pointer' }}>
@@ -515,7 +516,7 @@ class GraduationAcross extends Component{
                   teacherList && teacherList.map((i,key)=>{
                     return <Option key={i.user_id} value={String(i.user_id)}>{i.user_name}</Option>
                   }):
-                  course_groupsList && course_groupsList.map((i,key)=>{
+									graduation_groupslist && graduation_groupslist.map((i,key)=>{
                     return <Option key={i.id} value={String(i.id)}>{i.name}</Option>
                   })
                 }
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 318955479..f3495f7e4 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -535,10 +535,12 @@ class GraduationTaskssettinglist extends Component{
 			// console.log(result)
 			if(result.data.status===0){
 				this.seacthdata(teacher_comment,task_status,course_group,cross_comment,order,b_order,search,this.state.page);
+				this.props.showNotification(result.data.message);
+				this.cancelmodel();
 				this.setState({
-					Modalstype:true,
+					Modalstype:false,
 					Allocationtype:false,
-					Modalstopval:result.data.message,
+					// Modalstopval:result.data.message,
 					ModalSave:this.cancelmodel,
 				})
 			}
@@ -866,10 +868,10 @@ class GraduationTaskssettinglist extends Component{
 													{tag.name}
 												</a>
 												:
-												<p style={{color:tag.name==="调分"?"#000":'#4CACFF',padding:"0px 5px"}}
+												<span style={{color:tag.name==="调分"?"#000":'#4CACFF',padding:"0px 5px"}}
 													 onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?taskslistdata&&taskslistdata.cross_comment===true?"":"":""}>
 													{tag.name==="分配"?taskslistdata&&taskslistdata.cross_comment===true?"":"":tag.name}
-												</p>
+												</span>
 											}
 										</Tooltip>
 									}
@@ -972,7 +974,7 @@ class GraduationTaskssettinglist extends Component{
 						white-space: nowrap;
 						 }
 					 .ant-table-tbody>tr>td, .ant-table-thead>tr>th{
-						     padding:16px 8px;
+						     padding:16px 5px;
 						 }
 						`
 						}
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
index ed4cc85eb..159c40475 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndAdd.js
@@ -389,6 +389,7 @@ class DetailCardsEditAndAdd extends Component{
               </style>:""}
 							{selectShixun===true?<NewShixunModel
 							NewShixunModelType={selectShixun}
+							type={'shixuns'}
 							hideNewShixunModelType={this.cloasShixunBox}
 							pathShixun={this.clickShixunchoose}
 							{...this.props}
diff --git a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
index a37dffecb..9fa97f853 100644
--- a/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
+++ b/public/react/src/modules/paths/PathDetail/DetailCardsEditAndEdit.js
@@ -395,6 +395,7 @@ class DetailCardsEditAndEdit extends Component{
 
 							{selectShixun===true?<NewShixunModel
 								NewShixunModelType={selectShixun}
+								type={'shixuns'}
 								hideNewShixunModelType={this.cloasShixunBox}
 								pathShixun={this.clickShixunchoose}
 								{...this.props}