From 7dcf103598c8eff8e7074626df030844ed488220 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Sat, 22 Jun 2019 16:52:34 +0800
Subject: [PATCH] fix

---
 .../tasks/GraduationTasksappraise.js          | 17 ++--
 .../tasks/GraduationTaskssettinglist.js       | 99 ++++++++++---------
 2 files changed, 61 insertions(+), 55 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
index 7807e7265..47f38746c 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksappraise.js
@@ -163,8 +163,8 @@ class GraduationTasksappraise extends Component{
             <div className={"educontent mb20"}>
 
               <p className="clearfix mt10">
-                {/*<WordsBtn style="grey" className="fl">  <Link to={"/courses/"+courseId+"/graduation_tasks/"+graduation_id} className="color-grey-6">{datalist&&datalist.course_name}</Link></WordsBtn>*/}
-                {/*<span className="color-grey-9 fl ml3 mr3">&gt;</span>*/}
+                <WordsBtn style="grey" className="fl">  <Link to={"/courses/"+courseId} className="color-grey-6">{datalist&&datalist.course_name}</Link></WordsBtn>
+                <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+graduation_id} className="color-grey-6">{datalist&&datalist.graduation_name}</Link></WordsBtn>
                 <span className="color-grey-9 fl ml3 mr3">&gt;</span>
                 <WordsBtn style="grey" className="fl"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+graduation_id+"/"+task_id+"/list"} className="color-grey-6">任务详情</Link></WordsBtn>
@@ -182,23 +182,22 @@ class GraduationTasksappraise extends Component{
                   `
                 }
               </style>
-              <div style={{ width:'100%',height:'75px'}} >
-                <p className=" fl color-black mt25 summaryname">{datalist&&datalist.task_name}</p>
+              <div className="mt20 mb20 clearfix lineh-25">
+                <p className="fl color-black summaryname lineh-25">{datalist&&datalist.task_name}</p>
                 <CoursesListType
                   typelist={datalist&&datalist.status}
-                  typesylename={"mt23"}
                 />
-                <a className="color-grey-6 fr font-16 mt10 mr20" onClick={this.goback}>返回</a>
+                <a className="color-grey-6 fr font-16 mr20" onClick={this.goback}>返回</a>
                 {this.props.isStudent()?
                   datalist&&datalist.task_status===2?
-                  <a className={"fr color-blue font-16 mt10 mr20"} onClick={this.addAccessory}>补交附件</a>:""
+                  <a className={"fr color-blue font-16 mr20"} onClick={this.addAccessory}>补交附件</a>:""
                   :""}
               </div>
 
 
               <div className=" edu-back-white " style={{"padding": "20px 15px 20px 15px","box-sizing": "border-box"}}>
 
-                <div className={"stud-class-set bor-bottom-greyE edu-back-white"} style={{ padding: '0px 10px 20px 10px'}}>
+                <div className={"stud-class-set edu-back-white"} style={{ padding: '0px 10px 20px 10px'}}>
 
                     <div className={"color-grey-6 h20 mb20"}>
                       内容
@@ -251,7 +250,7 @@ class GraduationTasksappraise extends Component{
 
                 {firelistdata===undefined?"":firelistdata.length===0?"":firelistdata.revise_attachments.length===0?"":<div className={"stud-class-set bor-bottom-greyE pd20 edu-back-white"}>
 
-                    <div className={"color-grey-6 mb10"}>
+                    <div className={"color-grey-6 mb10 bor-top-greyE"}>
                       补交附件
                     </div>
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index b681388f8..752d61d33 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -621,17 +621,17 @@ class GraduationTaskssettinglist extends Component{
                     title: '序号',
                     dataIndex: 'number',
                     key: 'number',
-
+										className:'edu-txt-center'
                 }, {
                     title: '姓名',
                     dataIndex: 'name',
                     key: 'name',
-
+										className:'edu-txt-center'
                 }, {
                     title: '学号',
                     dataIndex: 'stduynumber',
                     key: 'stduynumber',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a style={{color:'#9A9A9A'}}>{record.stduynumber}</a>
@@ -641,7 +641,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '分班',
                     key: 'classroom',
                     dataIndex: 'classroom',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a style={{color:'#9A9A9A'}}>{record.classroom==="未分班"?"--":record.classroom}</a>
@@ -650,7 +650,8 @@ class GraduationTaskssettinglist extends Component{
                 }, {
                     title: '分组',
                     key: 'grouping',
-                    dataIndex: 'grouping',
+										dataIndex: 'grouping',
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a  style={{color:'#676767'}}>{record.grouping}</a>
@@ -659,7 +660,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '关联项目',
                     dataIndex: 'associationitems',
                     key: 'associationitems',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <div>
 														 <a  style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
@@ -671,7 +672,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '提交状态',
                     dataIndex: 'submitstate',
                     key: 'submitstate',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
                 <a style={{color:record.submitstate==="按时提交"?'#29BD8B':record.submitstate==="未提交"?"#9A9A9A":"#DD1717"}}>{record.submitstate}</a>
@@ -681,7 +682,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '更新时间',
                     dataIndex: 'turnovertime',
                     key: 'turnovertime',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a style={{color:'#989898'}}>
@@ -693,7 +694,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '教师评分',
                     key: 'teacherrating',
                     dataIndex: 'teacherrating',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                       <span>
 													<Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
@@ -705,7 +706,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '交叉评分',
                     key: 'crossrating',
                     dataIndex: 'crossrating',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
 										     	<Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
@@ -717,7 +718,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '最终成绩',
                     key: 'finalscore',
                     dataIndex: 'finalscore',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
 												 <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
@@ -728,7 +729,8 @@ class GraduationTaskssettinglist extends Component{
                 }, {
                     title: '操作',
                     key: 'operation',
-                    dataIndex: 'operation',
+										dataIndex: 'operation',
+										className:'edu-txt-center',
                     render: operation => (
                         <div>
                             {this.props.isAdmin()?operation.map((tag,key) => {
@@ -772,17 +774,17 @@ class GraduationTaskssettinglist extends Component{
                     title: '序号',
                     dataIndex: 'number',
                     key: 'number',
-
+										className:'edu-txt-center',
                 }, {
                     title: '姓名',
                     dataIndex: 'name',
                     key: 'name',
-
+										className:'edu-txt-center',
                 }, {
                     title: '学号',
                     dataIndex: 'stduynumber',
                     key: 'stduynumber',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a style={{color:'#9A9A9A'}}>{record.stduynumber}</a>
@@ -791,7 +793,8 @@ class GraduationTaskssettinglist extends Component{
                 },{
                     title: '分组',
                     key: 'grouping',
-                    dataIndex: 'grouping',
+										dataIndex: 'grouping',
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a  style={{color:'#676767'}}>{record.grouping}</a>
@@ -800,7 +803,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '关联项目',
                     dataIndex: 'associationitems',
                     key: 'associationitems',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <div>
 														 <a  style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
@@ -812,7 +815,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '提交状态',
                     dataIndex: 'submitstate',
                     key: 'submitstate',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
                 <a style={{color:record.submitstate==="按时提交"?'#29BD8B':record.submitstate==="未提交"?"#9A9A9A":"#DD1717"}}>{record.submitstate}</a>
@@ -822,7 +825,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '更新时间',
                     dataIndex: 'turnovertime',
                     key: 'turnovertime',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a style={{color:'#989898'}}>
@@ -834,7 +837,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '教师评分',
                     key: 'teacherrating',
                     dataIndex: 'teacherrating',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
 												 <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
@@ -846,7 +849,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '交叉评分',
                     key: 'crossrating',
                     dataIndex: 'crossrating',
-										className:'none',
+										className:'none edu-txt-center',
                     render: (text, record) => (
                         <span>
 												 	<Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
@@ -858,7 +861,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '最终成绩',
                     key: 'finalscore',
                     dataIndex: 'finalscore',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
 													 <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
@@ -870,6 +873,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '操作',
                     key: 'operation',
                     dataIndex: 'operation',
+										className:'edu-txt-center',
                     render: operation => (
                         <div>
                             {this.props.isAdmin()?operation.map((tag,key) => {
@@ -918,17 +922,17 @@ class GraduationTaskssettinglist extends Component{
                     title: '序号',
                     dataIndex: 'number',
                     key: 'number',
-
+										className:'edu-txt-center',
                 }, {
                     title: '姓名',
                     dataIndex: 'name',
                     key: 'name',
-
+										className:'edu-txt-center',
                 }, {
                     title: '学号',
                     dataIndex: 'stduynumber',
                     key: 'stduynumber',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a href="javascript:;"  style={{color:'#9A9A9A'}}>{record.stduynumber}</a>
@@ -938,7 +942,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '分班',
                     key: 'classroom',
                     dataIndex: 'classroom',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a href="javascript:;"  style={{color:'#9A9A9A'}}>{record.classroom==="未分班"?"--":record.classroom}</a>
@@ -948,6 +952,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '分组',
                     key: 'grouping',
                     dataIndex: 'grouping',
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a  style={{color:'#676767'}}>{record.grouping}</a>
@@ -956,7 +961,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '关联项目',
                     dataIndex: 'associationitems',
                     key: 'associationitems',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <div>
 														 <a  style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
@@ -969,7 +974,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '提交状态',
                     dataIndex: 'submitstate',
                     key: 'submitstate',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
            <a style={{color:record.submitstate==="按时提交"?'#29BD8B':record.submitstate==="未提交"?"#9A9A9A":"#DD1717"}}>{record.submitstate}</a>
@@ -979,7 +984,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '更新时间',
                     dataIndex: 'turnovertime',
                     key: 'turnovertime',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a href="javascript:;"  style={{color:'#989898'}}>
@@ -991,7 +996,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '教师评分',
                     key: 'teacherrating',
                     dataIndex: 'teacherrating',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
 												 <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
@@ -1003,7 +1008,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '交叉评分',
                     key: 'crossrating',
                     dataIndex: 'crossrating',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
 											 <Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
@@ -1015,7 +1020,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '最终成绩',
                     key: 'finalscore',
                     dataIndex: 'finalscore',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
 													 <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
@@ -1027,6 +1032,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '操作',
                     key: 'operation',
                     dataIndex: 'operation',
+										className:'edu-txt-center',
                     render: operation => (
                         <div>
                             {this.props.isAdmin()?operation.map((tag,key) => {
@@ -1070,17 +1076,17 @@ class GraduationTaskssettinglist extends Component{
                     title: '序号',
                     dataIndex: 'number',
                     key: 'number',
-
+										className:'edu-txt-center',
                 }, {
                     title: '姓名',
                     dataIndex: 'name',
                     key: 'name',
-
+										className:'edu-txt-center',
                 }, {
                     title: '学号',
                     dataIndex: 'stduynumber',
                     key: 'stduynumber',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a href="javascript:;"  style={{color:'#9A9A9A'}}>{record.stduynumber}</a>
@@ -1090,6 +1096,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '分组',
                     key: 'grouping',
                     dataIndex: 'grouping',
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a  style={{color:'#676767'}}>{record.grouping}</a>
@@ -1098,7 +1105,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '关联项目',
                     dataIndex: 'associationitems',
                     key: 'associationitems',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <div className={"projectsdiv"} >
 														 <a  style={{color:'#4CACFF'}} href={"/projects/"+record.associationitems.id} target={"_blank"}>
@@ -1112,7 +1119,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '提交状态',
                     dataIndex: 'submitstate',
                     key: 'submitstate',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
            <a style={{color:record.submitstate==="按时提交"?'#29BD8B':record.submitstate==="未提交"?"#9A9A9A":"#DD1717"}}>{record.submitstate}</a>
@@ -1122,7 +1129,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '更新时间',
                     dataIndex: 'turnovertime',
                     key: 'turnovertime',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
              <a href="javascript:;"  style={{color:'#989898'}}>
@@ -1134,7 +1141,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '教师评分',
                     key: 'teacherrating',
                     dataIndex: 'teacherrating',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
 											 <Tooltip placement="bottom" title={record.teacherrating==="--"||record.teacherrating==="未批阅"?"未评阅":""}>
@@ -1146,7 +1153,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '交叉评分',
                     key: 'crossrating',
                     dataIndex: 'crossrating',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
 												 	<Tooltip placement="bottom" title={record.crossrating==="--"||record.crossrating==="未批阅"?"未评阅":""}>
@@ -1158,7 +1165,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '最终成绩',
                     key: 'finalscore',
                     dataIndex: 'finalscore',
-
+										className:'edu-txt-center',
                     render: (text, record) => (
                         <span>
 													 <Tooltip placement="bottom" title={record.finalscore==="--"?"未评阅":""}>
@@ -1170,6 +1177,7 @@ class GraduationTaskssettinglist extends Component{
                     title: '操作',
                     key: 'operation',
                     dataIndex: 'operation',
+										className:'edu-txt-center',
                     render: operation => (
                         <div>
                             {this.props.isAdmin()?operation.map((tag,key) => {
@@ -1359,13 +1367,12 @@ class GraduationTaskssettinglist extends Component{
 										<span>任务详情</span>
 									</p>
 
-									<div style={{ width:'100%',height:'75px'}} >
-										<p className=" fl color-black mt25 summaryname"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-6">{taskslistdata.task_name}</Link></p>
+									<div className="clearfix lineh-25 mt20 mb20">
+										<p className=" fl color-black summaryname lineh-25"> <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id} className="color-grey-6">{taskslistdata.task_name}</Link></p>
 										<CoursesListType
 											typelist={taskslistdata.task_status}
-											typesylename={"mt22"}
 										/>
-										<a className="color-grey-6 fr font-16 ml30 mt10 mr20" onClick={this.goback}>返回</a>
+										<a className="color-grey-6 fr font-16 ml30 mr20" onClick={this.goback}>返回</a>
 									</div>
 
 
@@ -1448,7 +1455,7 @@ class GraduationTaskssettinglist extends Component{
 													{taskslistdata.search_assistants && taskslistdata.search_assistants.teacher_comment && taskslistdata.search_assistants.teacher_comment.map((item,key)=>{
 														return(
 															<span key={key}>
-																  <Checkbox value={item.id}  onClick={this.funteachercomment} className="fl ">{item.name}
+																  <Checkbox value={item.id} key={item.id} onClick={this.funteachercomment} className="fl ">{item.name}
 																	  <span>({item.count})</span>
 																  </Checkbox>
 															  </span>