diff --git a/public/react/src/modules/courses/coursesPublic/Associationmodel.js b/public/react/src/modules/courses/coursesPublic/Associationmodel.js
index 9af795931..d263a933b 100644
--- a/public/react/src/modules/courses/coursesPublic/Associationmodel.js
+++ b/public/react/src/modules/courses/coursesPublic/Associationmodel.js
@@ -59,15 +59,18 @@ class Associationmodel extends Component{
 
 
   goback=()=>{
+  	debugger
     this.setState({
       Modalstype:false,
     })
-		this.props.funlist()
 		this.props.Cancel()
+		this.props.funlist()
+
   }
 
 
    setSaves=()=>{
+  	debugger
      let {projectvalue}=this.state;
      let taskid=this.props.taskid;
      let url="/graduation_tasks/"+taskid+"/graduation_works/relate_project.json";
@@ -76,19 +79,14 @@ class Associationmodel extends Component{
          project_id: projectvalue
      }).then((result)=>{
 
-       if(result.status===200){
-         if(result.data.status===0){
-
+				 this.goback()
            // this.setState({
            //   Modalstype:true,
            //   Modalstopval:result.data.message,
            //   ModalSave:this.goback,
            //   loadtype:true
            // })
-			    this.goback
-         }
 
-       }
 
      }).catch((error)=>{
        console.log(error)
@@ -115,7 +113,7 @@ class Associationmodel extends Component{
          project_id: projectvalue
        }
      }).then((result)=>{
-       if(result.status===200){
+
          if(result.data.is_relate===false){
               this.setSaves()
          }else{
@@ -126,7 +124,7 @@ class Associationmodel extends Component{
              loadtype:true
            })
          }
-       }
+
      }).catch((error)=>{
        console.log(error)
      })
diff --git a/public/react/src/modules/courses/coursesPublic/CoursesListType.js b/public/react/src/modules/courses/coursesPublic/CoursesListType.js
index c8f38fca5..67d39a649 100644
--- a/public/react/src/modules/courses/coursesPublic/CoursesListType.js
+++ b/public/react/src/modules/courses/coursesPublic/CoursesListType.js
@@ -1,90 +1,91 @@
-import React, { Component } from 'react';
-import {Tooltip} from 'antd';
-class CoursesListType extends Component {
-  constructor(props) {
-    super(props);
-    this.state={
-      // typelist:[],
-      // typesylename:"",
-      // tipval:""
-    }
-
-  }
-
-  componentDidMount() {
-    // let{typelist,typesylename,tipval}=this.props;
-    //
-    // this.setState({
-    //   typelist:typelist,
-    //   typesylename:typesylename,
-    //   tipval:tipval
-    // })
-    // console.log("CoursesListType")
-    // console.log(typelist)
-  }
-
-  render() {
-    let {typelist,typesylename,tipval}=this.props;
-
-    return(
-      <span style={{display:'inline-block'}}>
-        {
-          typelist===undefined?"":typelist.map((item,key)=>{
-            return(
-              <Tooltip placement="bottom" title={tipval} getPopupContainer={()=>document.querySelector('.TabsWarp')}>
-                <span key={key}>
-                  {item==="公开"?<span className={"edu-filter-btn edu-filter-btn-028d01 ml15 fl typestyle " + typesylename} >公开</span>:""}
-                  {item==="已开启补交"?<span className={"edu-filter-btn edu-filter-btn-028d01 ml15 fl typestyle "+ typesylename} >已开启补交</span>:""}
-                  {item==="未开启补交"?<span className={"edu-filter-btn edu-filter-btn-CC317C ml15 fl typestyle "+ typesylename} >未开启补交</span>:""}
-                  {item==="匿名作品"?<span className={"edu-filter-btn edu-filter-btn-006B75 ml15 fl typestyle "+ typesylename} >匿名作品</span>:""}
-                  {item==="已选择"?<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "+ typesylename} >已选择</span>:""}
-                  {item==="已结束"?<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "+ typesylename} >已结束</span>:""}
-                  {item==="提交中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >提交中</span>:""}
-                  {item==="匿评中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >匿评中</span>:""}
-                  {item==="申诉中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >申诉中</span>:""}
-                  {item==="补交中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >补交中</span>:""}
-                  {item==="评阅中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >评阅中</span>:""}
-                  {item==="待选中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >待选中</span>:""}
-                  {item==="交叉评阅中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >交叉评阅中</span>:""}
-                  {item==="已开启交叉评阅"?<span className={"edu-filter-btn edu-filter-btn-E99695 ml15 fl typestyle "+ typesylename} >已开启交叉评阅</span>:""}
-                  {item==="待确认"?<span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle "+ typesylename} >待确认</span>:""}
-                  {item==="待处理"?<span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle mr10 "+ typesylename} >待处理</span>:""}
-                  {item==="未发布"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未发布</span>:""}
-                  {item==="私有"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >私有</span>:""}
-                  {item==="未提交"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未提交</span>:""}
-                  {item==="已确认"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已确认</span>:""}
-                  {item==="已截止"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已截止</span>:""}
-                </span>
-              </Tooltip>
-          )
-         })
-        }
-      </span>
-    )
-  }
-}
-export default CoursesListType;
-
-
-// let typelist=["公开",
-//               "已开启补交",
-//               "未开启补交",
-//               "匿名作品",
-//               "已选择",
-//               "已结束",
-//               "提交中",
-//               "匿评中",
-//               "申诉中",
-//               "补交中",
-//               "评阅中",
-//               "待选中",
-//               "交叉评阅中",
-//               "已开启交叉评阅",
-//               "待确认",
-//               "待处理",
-//               "未发布",
-//               "私有",
-//               "未提交",
-//               "已确认",
-//               "已截止",
+import React, { Component } from 'react';
+import {Tooltip} from 'antd'
+import '../css/Courses.css';
+class CoursesListType extends Component {
+  constructor(props) {
+    super(props);
+    this.state={
+      // typelist:[],
+      // typesylename:"",
+      // tipval:""
+    }
+
+  }
+
+  componentDidMount() {
+    // let{typelist,typesylename,tipval}=this.props;
+    //
+    // this.setState({
+    //   typelist:typelist,
+    //   typesylename:typesylename,
+    //   tipval:tipval
+    // })
+    // console.log("CoursesListType")
+    // console.log(typelist)
+  }
+
+  render() {
+    let {typelist,typesylename,tipval}=this.props;
+
+    return(
+      <span style={{display:'inline-block'}}>
+        {
+          typelist===undefined?"":typelist.map((item,key)=>{
+            return(
+              <Tooltip placement="bottom" title={tipval} getPopupContainer={()=>document.querySelector('.TabsWarp')}>
+                <span key={key}>
+                  {item==="公开"?<span className={"edu-filter-btn edu-filter-btn-028d01 ml15 fl typestyle " + typesylename} >公开</span>:""}
+                  {item==="已开启补交"?<span className={"edu-filter-btn edu-filter-btn-028d01 ml15 fl typestyle "+ typesylename} >已开启补交</span>:""}
+                  {item==="未开启补交"?<span className={"edu-filter-btn edu-filter-btn-CC317C ml15 fl typestyle "+ typesylename} >未开启补交</span>:""}
+                  {item==="匿名作品"?<span className={"edu-filter-btn edu-filter-btn-006B75 ml15 fl typestyle "+ typesylename} >匿名作品</span>:""}
+                  {item==="已选择"?<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "+ typesylename} >已选择</span>:""}
+                  {item==="已结束"?<span className={"edu-filter-btn edu-filter-btn-EDEDED ml15 fl typestyle color666666 "+ typesylename} >已结束</span>:""}
+                  {item==="提交中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >提交中</span>:""}
+                  {item==="匿评中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >匿评中</span>:""}
+                  {item==="申诉中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >申诉中</span>:""}
+                  {item==="补交中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >补交中</span>:""}
+                  {item==="评阅中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >评阅中</span>:""}
+                  {item==="待选中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >待选中</span>:""}
+                  {item==="交叉评阅中"?<span className={"edu-filter-btn edu-filter-btn-4CACFF ml15 fl typestyle "+ typesylename} >交叉评阅中</span>:""}
+                  {item==="已开启交叉评阅"?<span className={"edu-filter-btn edu-filter-btn-E99695 ml15 fl typestyle "+ typesylename} >已开启交叉评阅</span>:""}
+                  {item==="待确认"?<span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle "+ typesylename} >待确认</span>:""}
+                  {item==="待处理"?<span className={"edu-filter-btn edu-filter-btn-5E5FB9 ml15 fl typestyle mr10 "+ typesylename} >待处理</span>:""}
+                  {item==="未发布"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未发布</span>:""}
+                  {item==="私有"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >私有</span>:""}
+                  {item==="未提交"?<span className={"edu-filter-btn edu-filter-btn-84B6EB ml15 fl typestyle "+ typesylename} >未提交</span>:""}
+                  {item==="已确认"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已确认</span>:""}
+                  {item==="已截止"?<span className={"edu-filter-btn edu-filter-btn-FC2B6A ml15 fl typestyle "+ typesylename} >已截止</span>:""}
+                </span>
+              </Tooltip>
+          )
+         })
+        }
+      </span>
+    )
+  }
+}
+export default CoursesListType;
+
+
+// let typelist=["公开",
+//               "已开启补交",
+//               "未开启补交",
+//               "匿名作品",
+//               "已选择",
+//               "已结束",
+//               "提交中",
+//               "匿评中",
+//               "申诉中",
+//               "补交中",
+//               "评阅中",
+//               "待选中",
+//               "交叉评阅中",
+//               "已开启交叉评阅",
+//               "待确认",
+//               "待处理",
+//               "未发布",
+//               "私有",
+//               "未提交",
+//               "已确认",
+//               "已截止",
 //             ]
\ No newline at end of file
diff --git a/public/react/src/modules/courses/css/Courses.css b/public/react/src/modules/courses/css/Courses.css
index f79800f28..8720dd860 100644
--- a/public/react/src/modules/courses/css/Courses.css
+++ b/public/react/src/modules/courses/css/Courses.css
@@ -849,31 +849,31 @@ a.white-btn.use_scope-btn:hover{
 .edu-filter-btn-028d01{
     /*border: 1px solid #ff6800;*/
     /*color: #ff6800!important;*/
-    background: #028d01;
+    background: #028d01 !important;
 }
 .edu-filter-btn-CC317C{
-    background:#CC317C;
+    background:#CC317C !important;
 }
 .edu-filter-btn-006B75{
-    background:#006B75;
+    background:#006B75 !important;
 }
 .edu-filter-btn-E99695{
-    background:#E99695;
+    background:#E99695 !important;
 }
 .edu-filter-btn-EDEDED{
-    background:#EDEDED;
+    background:#EDEDED !important;
 }
 .edu-filter-btn-4CACFF{
-    background:#4CACFF;
+    background:#4CACFF !important;
 }
 .edu-filter-btn-84B6EB{
-    background:#84B6EB;
+    background:#84B6EB !important;
 }
 .edu-filter-btn-5E5FB9{
-    background:#5E5FB9;
+    background:#5E5FB9 !important;
 }
 .edu-filter-btn-FC2B6A{
-    background:#FC2B6A;
+    background:#FC2B6A !important;
 }
 .color666666{
     color:#666666 !important;
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
index 06523bb38..419f26315 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js
@@ -59,12 +59,12 @@ class GraduateTaskItem extends Component{
     axios.get(url).then((result)=>{
 
       if(result.data.status===0){
-        this.setState({
-          Modalstype:true,
-          Modalstopval:result.data.message,
-          cardsModalsavetype:this.cannerassocition,
-          loadtype:true
-        })
+        // this.setState({
+        //   Modalstype:true,
+        //   Modalstopval:result.data.message,
+        //   cardsModalsavetype:this.cannerassocition,
+        //   loadtype:true
+        // })
 				this.props.funlist()
       }
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index 28955e268..ce7822d97 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -135,7 +135,7 @@ class GraduationTasksappraise extends Component{
     let category_id=this.props.match.params.category_id;
     let graduation_id=datalist===undefined?"":datalist.graduation_id;
     let task_id=datalist===undefined?"":datalist.task_id;
-    console.log(datalist);
+    // console.log(datalist);
     return(
       <React.Fragment>
 
@@ -197,7 +197,7 @@ class GraduationTasksappraise extends Component{
 
               <div className="edu-back-white">
 
-                <div className={"stud-class-set edu-back-white padding20-30"}>
+                <div className={"stud-class-set edu-back-white padding20-30 bor-bottom-greyE"}>
 
                     <div className={"color-grey-6 h20 mb20"}>
                       内容
@@ -249,8 +249,8 @@ class GraduationTasksappraise extends Component{
                 </div>
 
                 {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.length===0?"":
-                <div className={"stud-class-set bor-top-greyE padding20-30 edu-back-white"}>
-                    <div className={"color-grey-6 mb10 bor-top-greyE"}>
+                <div className={"stud-class-set bor-bottom-greyE padding20-30 edu-back-white"}>
+                    <div className={"color-grey-6 mb10 "}>
                       补交附件
                     </div>
                     <div className={"ml20"}>
@@ -291,7 +291,7 @@ class GraduationTasksappraise extends Component{
 
                 </div>}
                 {datalist&&datalist.project_info===undefined?"":
-                  <div className={"stud-class-set edu-back-white padding20-30 bor-top-greyE"}>
+                  <div className={"stud-class-set edu-back-white padding20-30 bor-bottom-greyE"}>
                     <div className={"color-grey-6 mb10"}>
                       关联项目
                     </div>
@@ -301,7 +301,7 @@ class GraduationTasksappraise extends Component{
                 </div>}
                 {/*{*/}
                 { datalist === undefined?"": datalist && datalist.task_type===undefined ?"" : datalist.task_type===1? "": datalist && datalist.work_members && datalist.work_members.length == 0 ?"":
-                  <div className={"stud-class-set edu-back-white padding20-30 bor-top-greyE"} style={{height:"100%"}}>
+                  <div className={"stud-class-set edu-back-white padding20-30 bor-bottom-greyE"} style={{height:"100%"}}>
                     <div className={"color-grey-6 mb10"}>
                       其他组员
                     </div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index ebb221902..229a8399a 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -544,12 +544,12 @@ class GraduationTaskssettinglist extends Component{
 
 			if(result.data.status===0){
 				this.searchValue()
-				this.setState({
-					Modalstype:true,
-					Modalstopval:result.data.message,
-					ModalSave:this.cannerassocition,
-					loadtype:true
-				})
+				// this.setState({
+				// 	Modalstype:true,
+				// 	Modalstopval:result.data.message,
+				// 	ModalSave:this.cannerassocition,
+				// 	loadtype:true
+				// })
 			}
 
 		}).catch((error)=>{