调整毕设弹窗

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: "eval-source-map",  // 开启调试
+   //  devtool: "eval-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.

public/react/src/AppConfig.js

@@ -83,9 +83,9 @@ export function initAxiosInterceptors(props) {
                     }
                     config.url = `${proxy}${url}`;
                     if (config.url.indexOf('?') == -1) {
-                        config.url = `${config.url}?debug=${'student'}`
+                        config.url = `${config.url}?debug=${debugType}`
                     } else {
-                        config.url = `${config.url}&debug=${'student'}`
+                        config.url = `${config.url}&debug=${debugType}`
                     }
                 } else {
                     // 加api前缀

public/react/src/modules/courses/graduation/style.css

@@ -47,8 +47,8 @@
   width:40px;
   height:24px;
   line-height: 20px;
-  border:1px solid rgba(76,172,255,1);
-  color: #4CACFF!important;
+  /*border:1px solid rgba(76,172,255,1);*/
+  /*color: #4CACFF!important;*/
   float: left;
   border-radius:4px;
   text-align: center

public/react/src/modules/courses/graduation/tasks/GraduationAcross.js

@@ -226,7 +226,7 @@ class GraduationAcross extends Component{
 
   // 确定分配
   sureAcross=()=>{
-    let { AcrossTeamIds , chooseId , group_ids , comment_status }=this.state;
+    let { AcrossTeamIds , chooseId , group_ids , comment_status,page }=this.state;
     let { task_Id }=this.props;
 
     let type = comment_status == 2 ? "user_ids" : "graduation_group_ids";
@@ -246,7 +246,7 @@ class GraduationAcross extends Component{
     }).then((result)=>{
       if(result){
         this.props.showNotification(result.data.message);
-        this.getList(1,group_ids,comment_status);
+        this.getList(page,group_ids,comment_status);
         this.setState({
           showflag:false,
           AcrossTeamIds:undefined,
@@ -344,6 +344,18 @@ class GraduationAcross extends Component{
       width="775px"
       destroyOnClose={true}
       >
+				{modalVisible===true?<style>
+					{
+						`
+						  bady{
+								overflow: hidden !important;
+						  }
+						`
+					}
+				</style>:""}
+				<div id="closeIcon" onClick={()=>this.props.modalCloss()}>
+					<i className="iconfont icon-shanchudiao"></i>
+				</div>
         <style>
           {`
             .AcrossModal .ant-modal-body{
@@ -412,7 +424,7 @@ class GraduationAcross extends Component{
         <div className="clearfix mb15 mt15 pl30 pr30" id="acrossContent">
           <span className="fl color-grey-c mt5">已选 { chooseCount == 0 ? 0 : <span className="color-blue">{chooseCount}</span>} 个</span>
           <span className="fr">
-            <span className={"fl mt5"}>分配给{ comment_status && comment_status == 2 ? "老师":"答辩组"}：</span>
+						<span className={"fl mt5"}><span className={"color-orange"}>分配</span>给{ comment_status && comment_status == 2 ? "老师":"答辩组"}：</span>
             <span className={"fl"} style={{height:"32px"}} id="selectTags">
               <Select 
               mode="tags"
@@ -437,7 +449,7 @@ class GraduationAcross extends Component{
                   {menu}
                   <Divider style={{ margin: '4px 0 0' }} />
                   <div style={{ padding: '8px 12px', cursor: 'pointer' }}>
-                    <a onClick={this.sureAcross} className="acrossSureBtn">确定</a>
+                    <a onClick={this.sureAcross} className="acrossSureBtn color-orange">提交</a>
                     <a onClick={this.clearSelect} className="ml20"><span className="acrossResetBtn color-blue">重置</span></a>
                   </div>
                 </div>
@@ -463,10 +475,10 @@ class GraduationAcross extends Component{
               <Pagination defaultCurrent={page} current={page} pageSize={limit} total={user_count} onChange={this.onPageChange}></Pagination>:""
             }
           </div>
-          <div className="fr">
-            <a  className="task-btn color-white mr30" onClick={this.props.modalCloss}>关闭</a>
-            <a className="task-btn task-btn-orange" onClick={this.props.modalCloss}>确认</a>
-          </div>
+          {/*<div className="fr">*/}
+            {/*<a  className="task-btn color-white mr30" onClick={this.props.modalCloss}>关闭</a>*/}
+            {/*<a className="task-btn task-btn-orange" onClick={this.props.modalCloss}>确认</a>*/}
+          {/*</div>*/}
         </div>
       </Modal>
     )

public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js

@@ -343,6 +343,7 @@ class GraduationTaskssettingapp extends Component{
   }
 
   updatesfuncrosscomment=(types,newlatetime,newcommenttime)=>{
+  	debugger
 		let {endtimetype}=this.state;
 		if(types===1){
 				this.setState({
@@ -372,7 +373,7 @@ class GraduationTaskssettingapp extends Component{
   funcrosscomment=(e)=>{
 		let {latetime,end_time,allowlate,commenttime,commenttimeone}=this.state;
 		let commenttimetype=commenttime===null||commenttime==="";
-
+debugger
 		let newlatetimea=moment(new Date()).add(7, 'days').format("YYYY-MM-DD HH:mm");
 		let newcommenttimea=moment(new Date()).format("YYYY-MM-DD HH:mm");
 
@@ -386,7 +387,7 @@ class GraduationTaskssettingapp extends Component{
 		let newcommenttimed=moment(end_time).add(8, 'days').format("YYYY-MM-DD HH:mm");
 
 		if(e.target.checked===true){
-       if(commenttimetype===true){
+			debugger
 
 					if(allowlate===1||allowlate===true){
 						if(latetime===null||latetime===""){
@@ -401,12 +402,6 @@ class GraduationTaskssettingapp extends Component{
 							this.updatesfuncrosscomment(2,newend_timed,newcommenttimed)
 						}
 					}
-				}else{
-				 this.setState({
-					 crosscomment:e.target.checked,
-					 commenttime:commenttimeone,
-				 })
-			 }
 
 		}else{
 			this.setState({
@@ -545,25 +540,29 @@ class GraduationTaskssettingapp extends Component{
         endTimetypes:false
       })
     }
-
+		debugger
     if(moment(latetime)<=moment(publish_time)){
+
+    	debugger
       this.setState({
         latetimetype:true,
         latetimetypeval:"结束时间必须晚于发布时间"
       })
       return
     }else if(moment(latetime)<=moment(end_time)){
+			debugger
       this.setState({
         latetimetype:true,
         latetimetypeval:"结束时间必须晚于截止时间"
       })
       return
     }else{
+			debugger
       this.setState({
         latetimetype:false
       })
     }
-
+		debugger
 
     if(crosscomment===true){
       if(this.state.commenttime===undefined||this.state.commenttime===null||this.state.commenttime===""){
@@ -950,9 +949,7 @@ class GraduationTaskssettingapp extends Component{
 
     //
     // console.log(moment(publish_time))
-    //  console.log(this.props.isSuperAdmin())
-
-
+     console.log(commenttime)
 
     return(
       <React.Fragment>