From 1f49c1b45dc763756c3efe990816fad06397c37d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 28 Jun 2019 15:21:42 +0800
Subject: [PATCH 01/39] b

---
 public/react/config/webpack.config.dev.js | 30 +++++++++++------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index ceddbd81b..dfd54f38b 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -114,21 +114,21 @@ module.exports = {
       // First, run the linter.
       // It's important to do this before Babel processes the JS.
         // 上线然后要注释回来
-      // {
-      //   test: /\.(js|jsx|mjs)$/,
-      //   enforce: 'pre',
-      //   use: [
-      //     {
-      //       options: {
-      //         formatter: eslintFormatter,
-      //         eslintPath: require.resolve('eslint'),
-			//
-      //       },
-      //       loader: require.resolve('eslint-loader'),
-      //     },
-      //   ],
-      //   include: paths.appSrc,
-      // },
+      {
+        test: /\.(js|jsx|mjs)$/,
+        enforce: 'pre',
+        use: [
+          {
+            options: {
+              formatter: eslintFormatter,
+              eslintPath: require.resolve('eslint'),
+
+            },
+            loader: require.resolve('eslint-loader'),
+          },
+        ],
+        include: paths.appSrc,
+      },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall

From b6de31849466cdb43672769d60b9b5df02bab145 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 28 Jun 2019 15:36:31 +0800
Subject: [PATCH 02/39] CreateGroupByImportModal

---
 .../members/modal/CreateGroupByImportModal.js | 158 ++++++++++++++++++
 .../modules/courses/members/studentsList.js   |   9 +-
 2 files changed, 166 insertions(+), 1 deletion(-)
 create mode 100644 public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js

diff --git a/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
new file mode 100644
index 000000000..fe2a88dce
--- /dev/null
+++ b/public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js
@@ -0,0 +1,158 @@
+import React, { Component } from "react";
+import { Modal, Checkbox, Input, Spin, Upload, Divider, Icon  } from "antd";
+import axios from 'axios'
+import ModalWrapper from "../../common/ModalWrapper"
+
+import { ConditionToolTip, getUploadActionUrl } from 'educoder'
+
+const { Dragger } = Upload;
+
+
+
+class CreateGroupByImportModal extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+    }
+  }
+  fetchMemberList = (arg_page) => {
+  }
+  componentDidMount() {
+    
+    
+  }
+  onSendOk = () => {
+    const courseId = this.props.match.params.coursesId    
+    
+    let url = `/courses/${courseId}/create_group_by_importing_file.json`
+    let { fileList } =this.state;
+
+    if (!fileList || fileList.length == 0) {
+        // this.props.showNotification('请先上传附件')
+        this.setState({
+            errorTip :'请先上传附件',
+        })
+        return;
+    }
+    let newfileList=[];
+    for(var list of fileList){
+        newfileList.push(list.response.id)
+    }
+
+    axios.post(url, {
+        attachment_ids: newfileList
+    })
+    .then((response) => {
+      if (response.data.status == 0) {
+          this.props.showNotification(response.data.message)
+          this.setVisible(false)
+      } else {
+          
+      }
+    })
+    .catch(function (error) {
+      console.log(error);
+    });
+  }
+  setVisible = (visible) => {
+    if (visible) {
+        this.setState({ fileList: [] });    
+    }
+    this.refs.modalWrapper.setVisible(visible)
+    
+  }
+  handleChange = (info) => {
+    let fileList = info.fileList;
+    console.log(fileList)
+    this.setState({ fileList });
+  }
+
+  onOk = () => {
+    this.onSendOk()
+  }
+
+  onAttachmentRemove = (file) => {
+    this.props.confirm({
+      content: '是否确认删除?',
+      
+      onOk: () => {
+        this.deleteAttachment(file)
+      },
+      onCancel() {
+        console.log('Cancel');
+      },
+    });
+    
+    return false;
+  }
+  deleteAttachment = (file) => {
+    const url = `/attachments/${file.response ? file.response.id : file.uid}.json`
+    axios.delete(url, {
+    })
+      .then((response) => {
+        if (response.data) {
+          // const { status } = response.data;
+          if (response.data.status === 0) {
+
+            this.setState((state) => {
+              const index = state.fileList.indexOf(file);
+              const newFileList = state.fileList.slice();
+              newFileList.splice(index, 1);
+              return {
+                fileList: newFileList,
+              };
+            });
+          }
+        }
+      })
+      .catch(function (error) {
+        console.log(error);
+      });
+  }
+
+  render(){
+    const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
+        , graduationGroup, graduation_groups, courseGroup, course_groups } = this.state
+    const { moduleName } = this.props
+    
+    const props = {
+        name: 'file',
+        multiple: true,
+        action: getUploadActionUrl(),
+        onRemove: this.onAttachmentRemove,
+        onChange: this.handleChange
+    };
+    return(
+      <ModalWrapper
+        ref="modalWrapper"
+        width="700px"
+        title={`导入创建分班`}
+        {...this.props }
+        onOk={this.onOk}
+        className="createGroupByImport"
+      >
+      
+        <style>
+        {`
+        
+        `}
+        </style>
+        <div className="df">
+
+        
+        
+        </div>
+        <Dragger {...props}>
+            <p className="ant-upload-drag-icon">
+                <Icon type="inbox" />
+            </p>
+            <p className="ant-upload-text">点击或拖拽文件到这里上传</p>
+            <p className="ant-upload-hint">
+                单个文件最大150MB
+            </p>
+        </Dragger>
+      </ModalWrapper>
+    )
+  }
+}
+export default CreateGroupByImportModal;
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 9c6254cbd..ba41f1f9e 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -14,6 +14,8 @@ import axios from 'axios'
 import _ from 'lodash'
 import NoneData from "../coursesPublic/NoneData"
 
+import CreateGroupByImportModal from './modal/CreateGroupByImportModal'
+
 const Search =Input.Search;
 const dataSource = [{
   check:<Checkbox></Checkbox>,
@@ -488,7 +490,10 @@ class studentsList extends Component{
           searchPlaceholder={ '请输入姓名、学号进行搜索' }
           firstRowRight={
             <React.Fragment>
-              {/* { isSuperAdmin && <WordsBtn style="blue" className="mr30" onClick={()=>this.addTeacher()}>导入创建分班</WordsBtn> } */}
+              { isSuperAdmin && <React.Fragment>
+                  {/* <CreateGroupByImportModal ref="createGroupByImportModal" {...this.props}></CreateGroupByImportModal> */}
+                  <WordsBtn style="blue" className="mr30" onClick={()=> this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班</WordsBtn>
+                </React.Fragment> }
               { isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>新建分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.renameDir()}>分班重命名</WordsBtn> }
@@ -582,11 +587,13 @@ class studentsList extends Component{
                       )
                     }) }
                     { isAdmin &&
+                      
                       <p className="drop_down_btn">
                         <a href="javascript:void(0)" className="color-grey-6"
                             onClick={()=>this.addDir()}
                         >添加分班...</a>
                       </p>
+
                     }
                   </ul>
                 </li>}

From c96ad91ac10fe0737ee62bbc15859ad3f335b8c8 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 28 Jun 2019 15:40:18 +0800
Subject: [PATCH 03/39] HH

---
 public/react/src/modules/courses/Resource/Fileslistitem.js  | 4 ++--
 public/react/src/modules/courses/busyWork/CommonWorkList.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/Fileslistitem.js b/public/react/src/modules/courses/Resource/Fileslistitem.js
index a20dcf9c3..afcdf35f4 100644
--- a/public/react/src/modules/courses/Resource/Fileslistitem.js
+++ b/public/react/src/modules/courses/Resource/Fileslistitem.js
@@ -271,7 +271,7 @@ class Fileslistitem extends Component{
                     return(
                       <div className="mr50">
                         <span className="mr15 color-dark">{item.course_group_name}</span>
-                        <span className="mr15 color-grey9 ">将发布于 { moment(item.course_group_publish_time).format('YYYY-MM-DD hh:mm')}</span>
+                        <span className="mr15 color-grey9 ">将发布于 { moment(item.course_group_publish_time).format('YYYY-MM-DD HH:mm')}</span>
                       </div>
                     )
                     })}
@@ -289,7 +289,7 @@ class Fileslistitem extends Component{
                             {/*{moment(discussMessage.publish_time).fromNow()}*/}
                           { discussMessage.publish_time===null?"":
                             discussMessage.is_publish===true?"":"发布于"}
-                           { discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD hh:mm')}
+                           { discussMessage.publish_time===null?"":discussMessage.is_publish===true?moment(discussMessage.publish_time).fromNow():moment(discussMessage.publish_time).format('YYYY-MM-DD HH:mm')}
                         </span>
                       </span>
 											{this.props.isAdmin ||this.props.current_user.login===discussMessage.author.login?
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index b1a1d5553..251e39fcb 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -190,7 +190,7 @@ function buildColumns(that, student_works) {
 
     render: (update_time, record) => (
       <span>
-        <a href="javascript:;"  style={{color:'#989898'}}>{update_time ? moment(update_time).format('YYYY-MM-DD hh:mm') : '--'}</a>
+        <a href="javascript:;"  style={{color:'#989898'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a>
     </span>
     ),
   }]) 

From 26989c034d4e9f10c5bf022f1ea7f6f123965d0f Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 28 Jun 2019 15:45:46 +0800
Subject: [PATCH 04/39] unlockedAnswers.length

---
 .../modules/page/main/CodeEvaluateMultiLevelAnswerUnlock.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/page/main/CodeEvaluateMultiLevelAnswerUnlock.js b/public/react/src/modules/page/main/CodeEvaluateMultiLevelAnswerUnlock.js
index 8a0430c8f..672fc26a6 100644
--- a/public/react/src/modules/page/main/CodeEvaluateMultiLevelAnswerUnlock.js
+++ b/public/react/src/modules/page/main/CodeEvaluateMultiLevelAnswerUnlock.js
@@ -28,7 +28,7 @@ class CodeEvaluateMultiLevelAnswerUnlock extends Component {
     }
 
 	render() {
-  		const {  shixun, challenge, lockedAnswers } = this.props;
+  		const {  shixun, challenge, lockedAnswers, unlockedAnswers } = this.props;
   		const {  currentLevel } = this.state;
 	    return (
 	      	<div className="answerMultiLevelUnlock">
@@ -85,7 +85,7 @@ class CodeEvaluateMultiLevelAnswerUnlock extends Component {
                                 <Radio onClick={() => this.onLevelClick(item, index)} 
                                     checked={currentLevel>=index}></Radio>
                             </div>
-                            <div className="twoSpanCol">{index + 1}</div>
+                            <div className="twoSpanCol">{index + 1 + (unlockedAnswers && unlockedAnswers.length || 0) }</div>
                             <div className="autoCol">{item.name}</div>
                             <div className="fourSpanCol">{item.score}%</div>
                             <div className="fourSpanCol goldColor">{challenge.score * item.score / 100}</div>

From cd62a4b289e8b299791d43031ae12d249f11a637 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 28 Jun 2019 15:54:30 +0800
Subject: [PATCH 05/39] width: 1024px;

---
 public/react/src/modules/courses/exercise/new/NullDisplay.js | 2 +-
 public/react/src/modules/courses/members/studentsList.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/new/NullDisplay.js b/public/react/src/modules/courses/exercise/new/NullDisplay.js
index e5c604767..e61c1d2f7 100644
--- a/public/react/src/modules/courses/exercise/new/NullDisplay.js
+++ b/public/react/src/modules/courses/exercise/new/NullDisplay.js
@@ -86,7 +86,7 @@ class NullDisplay extends Component{
                     padding:12px 10px;
                     margin-bottom:10px;
                     border-radius:2px;
-                    max-width: 1024px;
+                    width: 1024px;
                     word-break: break-all;
                 }
                 .answerRow { 
diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index ba41f1f9e..669d8a65d 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -492,7 +492,7 @@ class studentsList extends Component{
             <React.Fragment>
               { isSuperAdmin && <React.Fragment>
                   {/* <CreateGroupByImportModal ref="createGroupByImportModal" {...this.props}></CreateGroupByImportModal> */}
-                  <WordsBtn style="blue" className="mr30" onClick={()=> this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班</WordsBtn>
+                  {/* <WordsBtn style="blue" className="mr30" onClick={()=> this.refs['createGroupByImportModal'].setVisible(true)}>导入创建分班</WordsBtn> */}
                 </React.Fragment> }
               { isAdmin && isParent && <WordsBtn style="blue" className="mr30" onClick={()=>this.addDir()}>新建分班</WordsBtn> }
               { isAdmin && !isParent && course_group_id != 0 && <WordsBtn style="blue" className="mr30" onClick={()=>this.deleteDir()}>删除分班</WordsBtn> }

From 819bfed857fec1c06b238973442301456f0935c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 28 Jun 2019 16:47:03 +0800
Subject: [PATCH 06/39] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../graduation/tasks/GraduationTasksnew.js    | 26 ++++++--
 .../modules/tpm/TPMsettings/TPMsettings.js    |  7 ++-
 .../tpm/challengesnew/TPMevaluation.js        | 25 +++++++-
 .../src/modules/tpm/newshixuns/Newshixuns.js  | 36 +++++++++--
 .../Collaborators/Collaborators.js            | 59 +++++++++++++++++--
 5 files changed, 132 insertions(+), 21 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 560658e9e..74ba21b62 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -342,8 +342,17 @@ class GraduationTasksnew extends Component {
 								</style>
 								{/*内容*/}
 								<div className="stud-class-set bor-bottom-greyE pt20 pl20 pr20 pb25 edu-back-white">
-
-									<Form.Item label="类型" >
+									<style>
+										{
+											`
+											.tasktype .ant-form-explain{
+											   margin-top: -20px;
+   											 margin-bottom: 15px;
+											}
+											`
+										}
+									</style>
+									<Form.Item label="类型" className={"tasktype"}>
 										{getFieldDecorator('tasktype', {
 											rules: [{required: true, message: "请选择任务类型"}],
 										})(<Select className={"greyInput mb20"}
@@ -355,8 +364,17 @@ class GraduationTasksnew extends Component {
 										<input type="hidden" id='tasktypes'/>
 										<span className={"newcoursestitle"}>（选择确认后，无法修改）</span>
 									</Form.Item>
-
-									<Form.Item label="任务标题" >
+									<style>
+										{
+											`
+											.taskname .ant-form-explain{
+											   margin-top: 0px;
+   											 margin-bottom: 0px;
+											}
+											`
+										}
+									</style>
+									<Form.Item label="任务标题" className={"taskname"} >
 										{getFieldDecorator('name', {
 											rules: [{required: true, message: "不能为空"}],
 										})(<Input placeholder="请输入任务名称，最大限制60个字符" value={title_value} onInput={this.changeTitle}
diff --git a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
index 0e3abb947..78010d11a 100644
--- a/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
+++ b/public/react/src/modules/tpm/TPMsettings/TPMsettings.js
@@ -1195,7 +1195,7 @@ export default class TPMsettings extends Component {
                   }
                 </Select>
                 <p
-                  className="edu-txt-right font-12"
+                  className="edu-txt-left font-12"
                   style={{display:operateauthority?"block":'none'}}
                 >
                   列表中没有？
@@ -1214,6 +1214,7 @@ export default class TPMsettings extends Component {
                       <label className="panel-form-label fl"><span
                         className="color-red fl mt3">*</span>详细描述：&nbsp;&nbsp;</label>
                       <textarea className="fl task-form-80 task-height-150"
+																style={{width:'100%'}}
                                 onInput={this.sendsure_applyvalues}
                                 value={sendsure_applyvalue}
                                 placeholder="请输入新增镜像需要安装的软件及版本等信息" id="demand_info"></textarea>
@@ -1354,10 +1355,11 @@ export default class TPMsettings extends Component {
                     <textarea className="task-form-80 task-height-150 panel-box-sizing fl mt10"
                               onInput={this.Executiveorder}
                               value={Executiveordervalue}
+															style={{width:'100%'}}
                               id="executive_command"
                     >
                           </textarea>
-                    <p className="-text-danger fl mt10 ml95"
+                    <p className="-text-danger fl mt5"
                        id="executive_command_notice"
                        style={{display: Executivetyoe === false ? "none" : "block"}}
                     >执行命令不能为空</p>
@@ -1369,6 +1371,7 @@ export default class TPMsettings extends Component {
                               value={Compilecommandvalue}
                               onInput={this.Compilecommand}
                               id="compile_command"
+															style={{width:'100%'}}
                     >
                           </textarea>
                   </li>
diff --git a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
index 73262de74..00141188f 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMevaluation.js
@@ -381,7 +381,7 @@ export default class TPMevaluation extends Component {
     //     })
     // }
     savegetfilepath=(value)=>{
-        let {selectpath} = this.state
+        let {selectpath,saveshixunfilepath} = this.state
         // let newarr =selectpatharr;
         // let arrtype=false;
         // let arrsum=0;
@@ -403,9 +403,28 @@ export default class TPMevaluation extends Component {
         //     newselectpath=newselectpath+newarr[z]+ "；"
         // }
 
-        // let newselectpath=selectpath+value+ "；"
 
-			let newselectpath=value
+
+				let newselectpath;
+
+				if(saveshixunfilepath==="shixunfilepathplay"){
+					newselectpath=value
+				}else{
+					const type = selectpath.split('；');
+					let types=false;
+					for(var i=0; i<type.length; i++){
+						if(type[i]===value){
+							types=true
+							return
+						}
+					}
+
+					if(types===false){
+						newselectpath=selectpath+value+ "；"
+					}else{
+						newselectpath=selectpath
+					}
+				}
         this.setState({
             // selectpatharr:newarr,
             selectpath: newselectpath,
diff --git a/public/react/src/modules/tpm/newshixuns/Newshixuns.js b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
index 8d38ac24d..bec8c703c 100644
--- a/public/react/src/modules/tpm/newshixuns/Newshixuns.js
+++ b/public/react/src/modules/tpm/newshixuns/Newshixuns.js
@@ -4,7 +4,7 @@ import {TPMIndexHOC} from '../TPMIndexHOC';
 
 import {SnackbarHOC} from 'educoder';
 
-import {Input, Select, Radio, Checkbox, Modal, Icon, DatePicker,Upload,Button,message,Form} from 'antd';
+import {Input, Select, Radio, Checkbox, Modal, Icon, DatePicker,Upload,Button,message,Form,notification} from 'antd';
 
 // import "antd/dist/antd.css";
 
@@ -523,9 +523,17 @@ class Newshixuns extends Component {
                 return item.response ? item.response.id : item.id
             })
         }
+        debugger
         if( attachment_ids === undefined ||  attachment_ids.length===0){
-            this.props.showNotification(`请上传附件`);
 
+					notification.open(
+						{
+							message: '提示',
+							description:
+								'请上传附件！',
+
+						}
+					)
             return;
         }
         // console.log("attachment_ids"+attachment_ids);
@@ -563,7 +571,16 @@ class Newshixuns extends Component {
                             testcoderunmode:"",
                         })
                     }
-                    this.props.showNotification('提交成功！');
+                    // this.props.showNotification('提交成功！');
+										notification.open(
+											{
+												message: '提示',
+												description:
+													'提交成功！',
+
+											}
+										)
+									   this.sendhideModaly()
                     // this.props.history.push(`/courses/${cid}/graduation_topics`);
                     // }
                 }
@@ -763,8 +780,15 @@ class Newshixuns extends Component {
                 // console.log('beforeUpload', file.name);
                 const isLt150M = file.size / 1024 / 1024 < 50;
                 if (!isLt150M) {
-                    this.props.showNotification(`文件大小必须小于50MB`);
-
+                    // this.props.showNotification(`文件大小必须小于50MB`);
+									notification.open(
+										{
+											message: '提示',
+											description:
+												'文件大小必须小于50MB',
+
+										}
+									)
                 }
                 if(thiss.state.file !== undefined){
                     console.log("763")
@@ -881,7 +905,7 @@ class Newshixuns extends Component {
                                             })
                                         }
                                     </Select>
-                                    <p className="edu-txt-right font-12">
+                                    <p className="edu-txt-left font-12">
                                         列表中没有？
                                         <a className="color-blue" onClick={this.post_apply}> 申请新建</a>
                                     </p>
diff --git a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
index 07c9f960f..d629a1c5b 100644
--- a/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
+++ b/public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js
@@ -33,6 +33,7 @@ class Collaborators extends Component {
             Collaboratorsvisible: false,
             Collaboratorsvisibleadmin: false,
             value: 1,
+					  page: 1,
             Searchadmin: [],
             allChangechecked: false,
             Collaboratorslist: [],
@@ -155,6 +156,9 @@ class Collaborators extends Component {
     }
     onSearchadmin = (value) => {
         let {collaboratorList,user_name,school_name} = this.state;
+			  this.setState({
+				       Searchadmin: [],
+				    })
         // if (value === "") {
         //     this.setState({
         //         Searchadmin: [],
@@ -172,7 +176,7 @@ class Collaborators extends Component {
 				if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
 
 				}else{
-					let newlist = response.data;
+					let newlist = response.data.users;
 					for (var i = 0; i < newlist.length; i++) {
 						newlist[i].checked = false
 					}
@@ -336,7 +340,48 @@ class Collaborators extends Component {
        collaboratorListsumtype:false
      })
   }
-    render() {
+
+
+	contentViewScrolledit=(e)=>{
+		//滑动到底判断
+
+		if(e.currentTarget.scrollHeight-e.currentTarget.scrollTop===e.currentTarget.clientHeight){
+			let {page,collaboratorList,user_name,school_name,Searchadmin} = this.state;
+			let newpage=page+1;
+      let newSearchadmin=Searchadmin
+			let id = this.props.match.params.shixunId;
+			let url = "/shixuns/" + id + "/add_collaborators.json";
+			axios.get(url,{params:{
+					user_name:user_name ,
+					school_name:school_name,
+					page:newpage
+				}}).then((response) => {
+				if (response.data.status === 403||response.data.status === 401||response.data.status === 500) {
+
+				}else{
+					let newlist = response.data.users;
+					for (var i = 0; i < newlist.length; i++) {
+						newlist[i].checked = false
+						newSearchadmin.push(newlist[i])
+					}
+
+					console.log(newSearchadmin)
+					this.setState({
+						Searchadmin: newSearchadmin,
+						collaboratorList: collaboratorList,
+						page:newpage
+					})
+				}
+
+			}).catch((error) => {
+				console.log(error)
+			});
+
+		}
+
+	}
+
+	render() {
         let {
             collaboratorList,
             Collaboratorsvisible,
@@ -445,13 +490,13 @@ class Collaborators extends Component {
 									>搜索</a>
 									<p className="clearfix pl35 mt20">
 										<span className="fl edu-txt-w80 task-hide font-bd ml10 edu-txt-left">姓名</span>
-										<span className="fl edu-txt-w80 task-hide font-bd">呢称</span>
+										<span className="fl edu-txt-w80 task-hide font-bd">职业</span>
 										<span className="fl edu-txt-w180 task-hide font-bd ml50">单位</span>
 									</p>
                     <div className="mt5" style={{background: '#f7f9fd'}}>
 
                         <div className="clearfix">
-                            <ul className="upload_select_box fl" id="search_not_teachers_list">
+                            <ul className="upload_select_box fl" id="search_not_teachers_list"    onScroll={this.contentViewScrolledit}>
                                 {Searchadmin.length === 0 ? <li style={{textAlign: 'center'}}>
                                     <span>请试试搜索一下</span>
                                 </li> : Searchadmin.map((item, key) => {
@@ -460,10 +505,12 @@ class Collaborators extends Component {
                                             <Checkbox className="fl mr20" checked={item.checked}
                                                       onChange={(e) => this.selectChangenickname(e, key)}
                                                       id={item.user_id}></Checkbox>
-                                            <a className="task-hide color-grey3 ml20 fl span1 edu-txt-w80">{item.nickname}</a>
+                                            <a className="task-hide color-grey3  fl span1 edu-txt-w80 edu-txt-left">{item.nickname}</a>
                                             <span className="task-hide fl color-grey edu-txt-w80 span2">{item.identify}</span>
                                             <span
-                                                className="span3 color-grey fl edu-txt-w260 task-hide">{item.school_name}</span>
+																							  title={item.school_name}
+																								style={{width: '150px'}}
+                                                className="span3 color-grey fl edu-txt-w260 task-hide ml50 task-hide" >{item.school_name}</span>
                                         </li>
                                     )
                                 })

From d0166f5980bf956ac30897ff2d4ee316379abfe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 28 Jun 2019 16:54:55 +0800
Subject: [PATCH 07/39] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/courses/shixunHomework/Listofworks.js   | 2 +-
 .../src/modules/courses/shixunHomework/Trainingjobsetting.js  | 4 ++--
 .../modules/courses/shixunHomework/Workquestionandanswer.js   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 6995db1ba..04a878dc0 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1707,7 +1707,7 @@ class Listofworks extends Component {
 								<Link
 									to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/questions`}>作业问答</Link>
 								{this.props.isAdmin() ?
-									this.state.code_review === false ? "" : <Link
+									this.state.code_review === true ? "" : <Link
 										// to={`/courses/${this.state.props.match.params.coursesId}/${this.state.props.match.params.homeworkid}/student_work`}
 										to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/student_work`}>
 										代码查重</Link> : ""}
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 5d9d2d200..11017259a 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1676,7 +1676,7 @@ class Trainingjobsetting extends Component {
                                 }
                                 <Link
                                     to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/questions`}>作业问答</Link>
-                                {this.props.isAdmin()?this.state.code_review===false?"": <Link
+                                {this.props.isAdmin()?this.state.code_review===true?"": <Link
 																	to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/student_work`}>代码查重</Link> : ""}
 
                                 <style>{
@@ -1708,7 +1708,7 @@ class Trainingjobsetting extends Component {
                                     <a className="fr color-blue font-16" onClick={this.homeworkstart}>立即发布</a> : "": ""}
 
                                 {this.props.isAdmin()?
-                                  this.state.code_review===false?<a className="fr color-blue font-16"  onClick={this.workshowmodel}>代码查重</a>
+                                  this.state.code_review===true?<a className="fr color-blue font-16"  onClick={this.workshowmodel}>代码查重</a>
                                     : "":""}
                             </div>
                         </div>
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index fe6d68c77..46fda3e10 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -401,7 +401,7 @@ class Workquestionandanswer extends Component {
                                     className="active"
                                     to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/questions`}>作业问答</Link>
                                 {this.props.isAdmin()?
-                                  this.state.code_review===false?"":<Link
+                                  this.state.code_review===true?"":<Link
                                     // to={`/courses/${this.state.props.match.params.coursesId}/${this.state.props.match.params.homeworkid}/student_work`}
                                     to={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${this.state.props.match.params.homeworkid}/student_work`}>
                                       代码查重</Link>:""}
@@ -421,7 +421,7 @@ class Workquestionandanswer extends Component {
 
 
                                 {this.props.isAdmin()?
-                                  this.state.code_review===false?
+                                  this.state.code_review===true?
                                     <a className="fr color-blue font-16"  onClick={this.workshowmodel}>代码查重</a>
                                     :"":""}
 

From 5f34758f7512e1fa68d9789727b3ba1734bf82cf Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 28 Jun 2019 18:48:58 +0800
Subject: [PATCH 08/39] account

---
 public/react/src/App.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/App.js b/public/react/src/App.js
index d4c70e6aa..1a1af02d9 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -263,7 +263,7 @@ class App extends Component {
 						<Switch>
 							{/*<Route path="/login" component={LoginRegisterPage}/>*/}
 							{/*认证*/}
-							{/*<Route path="/account" component={AccountPage}/>*/}
+							<Route path="/account" component={AccountPage}/>
 
 							{/*403*/}
 							<Route path="/403" component={Shixunauthority}/>

From 205574281e4f222e4df61d908562dd68ae11cfdb Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Fri, 28 Jun 2019 18:57:08 +0800
Subject: [PATCH 09/39] disable

---
 .../react/src/modules/courses/exercise/new/JudgeEditor.js | 5 +++--
 .../src/modules/courses/exercise/new/SingleEditor.js      | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/new/JudgeEditor.js b/public/react/src/modules/courses/exercise/new/JudgeEditor.js
index 2d6b20398..a5571aab4 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeEditor.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeEditor.js
@@ -189,8 +189,9 @@ class SingleEditor extends Component{
             
             <div>
             <RadioGroup onChange={this.onOptionClick} value={standard_answers[0]}>
-              <Radio value={true} disabled={exerciseIsPublish}>对</Radio>
-              <Radio value={false}  disabled={exerciseIsPublish}>错</Radio>
+              {/* disabled={exerciseIsPublish} */}
+              <Radio value={true} >对</Radio>
+              <Radio value={false} >错</Radio>
             </RadioGroup>
             {/* not work */}
             {/* <Radio value={standard_answers[0]} onClick={() => this.onOptionClick(0)} disabled={exerciseIsPublish}>对</Radio>
diff --git a/public/react/src/modules/courses/exercise/new/SingleEditor.js b/public/react/src/modules/courses/exercise/new/SingleEditor.js
index 6120e9aea..8cbcdec06 100644
--- a/public/react/src/modules/courses/exercise/new/SingleEditor.js
+++ b/public/react/src/modules/courses/exercise/new/SingleEditor.js
@@ -165,9 +165,9 @@ class SingleEditor extends Component{
     
   }
   onOptionClick = (index) => {
-    if (this.props.exerciseIsPublish) {
-      return;
-    }
+    // if (this.props.exerciseIsPublish) {
+    //   return;
+    // }
     let standard_answers = this.state.standard_answers.slice(0)
     standard_answers[index] = !standard_answers[index]
     this.setState({ standard_answers })
@@ -247,7 +247,7 @@ class SingleEditor extends Component{
                 {/* <Tooltip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'}> */}
                   <span class={`option-item fr mr10 color-grey select-choice ${bg} `}
                       name="option_span" onClick={() => this.onOptionClick(index)} style={{flex: '0 0 38px'}}>
-                      <ConditionToolTip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'} placement="left" condition={!exerciseIsPublish}>
+                      <ConditionToolTip title={standard_answers[index] ? '点击取消标准答案设置' : '点击设置为标准答案'} placement="left" condition={true}>
                         <div style={{width: '100%', height: '100%'}}>{tagArray[index]}</div>
                       </ConditionToolTip>
                   </span>

From 94f990a9b95e4303e94817c98457598048ef9e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 29 Jun 2019 00:05:06 +0800
Subject: [PATCH 10/39] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exercise/Exercisestatisticalresult.js     |    2 +-
 .../exercise/Studentshavecompletedthelist.js  | 2458 ++++++++++++-----
 .../exercise/Testpapersettinghomepage.js      |    6 +-
 .../courses/shixunHomework/Listofworks.js     | 2089 +++++++++-----
 4 files changed, 3241 insertions(+), 1314 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
index 1e34838d9..5e2a69dbe 100644
--- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
+++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
@@ -102,7 +102,7 @@ class Exercisestatisticalresult extends Component {
 					 }
 					`}
 				</style>
-				<div className={"educontent mb20" }>
+				<div className={"educontent mb20" } style={{width: "1250px"}}>
 
 					{data&&data.course_groups.length===0?"":<div className="stud-class-set bor-bottom-greyE">
 						<div className="clearfix edu-back-white">
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 7d0a0b54e..391edb90a 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -60,7 +60,7 @@ class Studentshavecompletedthelist extends Component {
 			course_groupsdatas: false,
 			noclassroom: undefined,
 			current_status: props.current_status,
-			course_groupyslstwodata: [{id: 0, tu: "未提交"}, {id: 1, tu: "提交"}],
+			course_groupyslstwodata: [{id: 0, tu: "未提交"}, {id: 1, tu: "已提交"}],
 			columns: [
 				{
 					title: '序号',
@@ -71,7 +71,12 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "84px",}}>{record.number}</a>
+							{record.number === "--" ?
+								<a style={{"color": '#999999', "text-align": "center", "width": "84px",}}>{record.number}</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center", "width": "84px",}}>{record.number}</a>
+
+							}
         </span>
 					)
 				},
@@ -84,7 +89,12 @@ class Studentshavecompletedthelist extends Component {
 					width: "110px",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "110px"}}>{record.name}</a>
+								{record.name === "--" ?
+									<a style={{"color": '#999999', "text-align": "center", "width": "110px"}}>{record.name}</a>
+									:
+									<a style={{"color": '#07111B', "text-align": "center", "width": "110px"}}>{record.name}</a>
+
+								}
         </span>
 					)
 				},
@@ -97,11 +107,26 @@ class Studentshavecompletedthelist extends Component {
 					width: "175px",
 					render: (text, record) => (
 						<span>
-             <a style={{
-							 "color": '#9A9A9A',
-							 "text-align": "center"
-							 , "width": "175px"
-						 }}>{record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+							{record.stduynumber === null ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+									, "width": "175px"
+								}}>--</a> :
+								record.stduynumber ===
+								"" ?
+									<a style={{
+										"color": '#999999',
+										"text-align": "center"
+										, "width": "175px"
+									}}>--</a> :
+									<a style={{
+										"color": '#9A9A9A',
+										"text-align": "center"
+										, "width": "175px"
+									}}>{record.stduynumber}</a>
+							}
+
         </span>
 					),
 				},
@@ -114,11 +139,26 @@ class Studentshavecompletedthelist extends Component {
 					width: "120px",
 					render: (text, record) => (
 						<span>
-             <a style={{
-							 "color": '#07111B',
-							 "text-align": "center"
-							 , "width": "120px"
-						 }}>{record.classroom === null ? "--" : record.classroom === "" ? "--" : record.classroom}</a>
+								{record.classroom === null ?
+									<a style={{
+										"color": '#999999',
+										"text-align": "center"
+										, "width": "120px"
+									}}>--</a> :
+									record.classroom ===
+									"" ?
+										<a style={{
+											"color": '#999999',
+											"text-align": "center"
+											, "width": "120px"
+										}}>--</a> :
+										<a style={{
+											"color": '#07111B',
+											"text-align": "center"
+											, "width": "120px"
+										}}>{record.classroom}</a>
+								}
+
         </span>
 					)
 				},
@@ -132,11 +172,11 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center",
 							 "width": "124px",
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center",
 							 "width": "124px",
 						 }}>{record.submitstate}</a>
@@ -153,36 +193,52 @@ class Studentshavecompletedthelist extends Component {
 					width: "236.4px",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+							{record.updatetime === "--" ?
+								<a style={{"color": '#999999', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+								:
+								<a style={{"color": '#9A9A9A', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+							}
         </span>
 					),
 				},
 				{
-					title: '客观题分',
+					title: '客观题得分',
 					dataIndex: 'completion',
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center",
 					width: "124px",
 					render: (text, record) => (
-						<span>
-                            <a style={parseInt(record.completion) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center"
-															, "width": "124px"
-														} : parseInt(record.completion) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center"
-															, "width": "124px"
-														} : parseInt(record.completion) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center"
-															, "width": "124px"
-														} : {
-															"color": '#747A7F',
-															"text-align": "center"
-															, "width": "124px"
-														}}>{record.completion}</a>
+						<span>   {
+							record.completion === "--" ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+									, "width": "124px"
+								}}>
+									{record.completion}
+								</a>
+								:
+								<a style={parseInt(record.completion) > 90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+									, "width": "124px"
+								} : parseInt(record.completion) <= 90 ? {
+									"color": '#FF6800',
+									"text-align": "center"
+									, "width": "124px"
+								} : parseInt(record.completion) <= 60 ? {
+										"color": '#747A7F',
+										"text-align": "center"
+										, "width": "124px"
+									} :
+									{
+										"color": '#747A7F',
+										"text-align": "center"
+										, "width": "124px"
+									}}>{record.completion}</a>
+						}
+
         </span>
 					)
 				},
@@ -195,20 +251,29 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-                        <a style={parseInt(record.levelscore) > 90 ? {
-													"color": '#DD1717',
-													"text-align": "center"
-													, "width": "124px"
-												} : parseInt(record.levelscore) <= 90 ? {
-													"color": '#FF6800',
-													"text-align": "center"
-													, "width": "124px"
-												} : parseInt(record.levelscore) <= 60 ? {
-													"color": '#747A7F',
-													"text-align": "center"
-													, "width": "124px"
-												} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
-
+							{record.levelscore === "--" ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+									, "width": "124px"
+								}}>
+									{record.levelscore}
+								</a>
+								:
+								<a style={parseInt(record.levelscore) > 90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+									, "width": "124px"
+								} : parseInt(record.levelscore) <= 90 ? {
+									"color": '#FF6800',
+									"text-align": "center"
+									, "width": "124px"
+								} : parseInt(record.levelscore) <= 60 ? {
+									"color": '#747A7F',
+									"text-align": "center"
+									, "width": "124px"
+								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+							}
         </span>
 					)
 				},
@@ -221,22 +286,32 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center"
-															, "width": "124px"
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center"
-															, "width": "124px"
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center"
-															, "width": "124px"
-														}}>{record.efficiencyscore}</a>
+							{record.efficiencyscore === "--" ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+									, "width": "124px"
+								}}>
+									{record.efficiencyscore}
+								</a>
+								:
+								<a style={parseInt(record.efficiencyscore) > 90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+									, "width": "124px"
+								} : parseInt(record.efficiencyscore) <= 90 ? {
+									"color": '#FF6800',
+									"text-align": "center"
+									, "width": "124px"
+								} : parseInt(record.efficiencyscore) <= 60 ? {
+									"color": '#747A7F',
+									"text-align": "center",
+								} : {
+									"color": '#747A7F',
+									"text-align": "center"
+									, "width": "124px"
+								}}>{record.efficiencyscore}</a>
+							}
         </span>
 					)
 				}
@@ -251,7 +326,14 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center tabletd",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "84px",}}>{record.number}</a>
+							{
+								record.number === "--" ?
+									<a style={{"color": '#999999', "text-align": "center", "width": "84px",}}>{record.number}</a>
+
+									:
+									<a style={{"color": '#07111B', "text-align": "center", "width": "84px",}}>{record.number}</a>
+
+							}
         </span>
 					)
 				},
@@ -264,7 +346,13 @@ class Studentshavecompletedthelist extends Component {
 					width: "110px",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "110px"}}>{record.name}</a>
+							{
+								record.name === "--" ?
+									<a style={{"color": '#999999', "text-align": "center", "width": "110px"}}>{record.name}</a>
+									:
+									<a style={{"color": '#07111B', "text-align": "center", "width": "110px"}}>{record.name}</a>
+
+							}
         </span>
 					)
 				},
@@ -277,11 +365,27 @@ class Studentshavecompletedthelist extends Component {
 					width: "175px",
 					render: (text, record) => (
 						<span>
-             <a style={{
-							 "color": '#9A9A9A',
-							 "text-align": "center"
-							 , "width": "175px"
-						 }}>{record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+							{record.stduynumber === null ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+									, "width": "175px"
+								}}>--</a>
+								:
+								record.stduynumber === "" ?
+									<a style={{
+										"color": '#999999',
+										"text-align": "center"
+										, "width": "175px"
+									}}>--</a>
+									:
+									<a style={{
+										"color": '#9A9A9A',
+										"text-align": "center"
+										, "width": "175px"
+									}}>{record.stduynumber}</a>
+							}
+
         </span>
 					),
 				},
@@ -294,11 +398,24 @@ class Studentshavecompletedthelist extends Component {
 					width: "120px",
 					render: (text, record) => (
 						<span>
-             <a style={{
-							 "color": '#07111B',
-							 "text-align": "center"
-							 , "width": "120px"
-						 }}>{record.classroom === null ? "--" : record.classroom === "" ? "--" : record.classroom}</a>
+							{record.classroom === null ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+									, "width": "120px"
+								}}>--</a>: record.classroom === "" ?
+									<a style={{
+										"color": '#999999',
+										"text-align": "center"
+										, "width": "120px"
+									}}>--</a>:
+									<a style={{
+										"color": '#07111B',
+										"text-align": "center"
+										, "width": "120px"
+									}}>{record.classroom}</a>
+									}
+
         </span>
 					)
 				},
@@ -312,11 +429,11 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center",
 							 "width": "124px",
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center",
 							 "width": "124px",
 						 }}>{record.submitstate}</a>
@@ -333,12 +450,16 @@ class Studentshavecompletedthelist extends Component {
 					width: "236.4px",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+							{record.updatetime === "--"?
+								<a style={{"color": '#999999', "text-align": "center", "width": "236.4px",}}>--</a>
+								:
+								<a style={{"color": '#9A9A9A', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+							}
         </span>
 					),
 				},
 				{
-					title: '客观题分',
+					title: '客观题得分',
 					dataIndex: 'completion',
 					key: 'completion',
 					align: 'center',
@@ -346,23 +467,34 @@ class Studentshavecompletedthelist extends Component {
 					width: "124px",
 					render: (text, record) => (
 						<span>
-                            <a style={parseInt(record.completion) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center"
-															, "width": "124px"
-														} : parseInt(record.completion) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center"
-															, "width": "124px"
-														} : parseInt(record.completion) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center"
-															, "width": "124px"
-														} : {
-															"color": '#747A7F',
-															"text-align": "center"
-															, "width": "124px"
-														}}>{record.completion}</a>
+							             			{record.completion === "--" ?
+																  <a style={{
+																		"color": '#999999',
+																		"text-align": "center"
+																		, "width": "124px"
+																	}}>
+																		--
+																	</a>
+
+																	:
+																	<a style={parseInt(record.completion) > 90 ? {
+																		"color": '#DD1717',
+																		"text-align": "center"
+																		, "width": "124px"
+																	} : parseInt(record.completion) <= 90 ? {
+																		"color": '#FF6800',
+																		"text-align": "center"
+																		, "width": "124px"
+																	} : parseInt(record.completion) <= 60 ? {
+																		"color": '#747A7F',
+																		"text-align": "center"
+																		, "width": "124px"
+																	} : {
+																		"color": '#747A7F',
+																		"text-align": "center"
+																		, "width": "124px"
+																	}}>{record.completion}</a>
+																}
         </span>
 					)
 				},
@@ -375,20 +507,29 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center tabletd",
 					render: (text, record) => (
 						<span>
-                        <a style={parseInt(record.levelscore) > 90 ? {
-													"color": '#DD1717',
-													"text-align": "center"
-													, "width": "124px"
-												} : parseInt(record.levelscore) <= 90 ? {
-													"color": '#FF6800',
-													"text-align": "center"
-													, "width": "124px"
-												} : parseInt(record.levelscore) <= 60 ? {
-													"color": '#747A7F',
-													"text-align": "center"
-													, "width": "124px"
-												} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
-
+							{record.levelscore === "--"?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+									, "width": "124px"
+								}}>
+									--
+								</a>
+								:
+								<a style={parseInt(record.levelscore) > 90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+									, "width": "124px"
+								} : parseInt(record.levelscore) <= 90 ? {
+									"color": '#FF6800',
+									"text-align": "center"
+									, "width": "124px"
+								} : parseInt(record.levelscore) <= 60 ? {
+									"color": '#747A7F',
+									"text-align": "center"
+									, "width": "124px"
+								} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+							}
         </span>
 					)
 				},
@@ -401,22 +542,32 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center tabletd",
 					render: (text, record) => (
 						<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center"
-															, "width": "124px"
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center"
-															, "width": "124px"
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center"
-															, "width": "124px"
-														}}>{record.efficiencyscore}</a>
+							{
+								record.efficiencyscore === "--"?
+									<a style={{
+										"color": '#DD1717',
+										"text-align": "center"
+										, "width": "124px"
+									}}>--</a>
+									:
+									<a style={parseInt(record.efficiencyscore) > 90 ? {
+										"color": '#DD1717',
+										"text-align": "center"
+										, "width": "124px"
+									} : parseInt(record.efficiencyscore) <= 90 ? {
+										"color": '#FF6800',
+										"text-align": "center"
+										, "width": "124px"
+									} : parseInt(record.efficiencyscore) <= 60 ? {
+										"color": '#747A7F',
+										"text-align": "center",
+									} : {
+										"color": '#747A7F',
+										"text-align": "center"
+										, "width": "124px"
+									}}>{record.efficiencyscore}</a>
+							}
+
         </span>
 					)
 				}
@@ -430,7 +581,13 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+							{
+								record.number=== "--"?
+									<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+									:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+							}
+
         </span>
 					)
 				},
@@ -442,7 +599,12 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+											{
+												record.name === "--" ?
+													<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+													:
+													<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+											}
         </span>
 					)
 				},
@@ -454,10 +616,23 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-             <a style={{
-							 "color": '#9A9A9A',
-							 "text-align": "center"
-						 }}>{record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+							{record.stduynumber === null ?
+								<a style={{
+								"color": '#999999',
+								"text-align": "center"
+							}}>--</a>
+								: record.stduynumber === "" ?
+									<a style={{
+								"color": '#999999',
+								"text-align": "center"
+							}}>--</a>
+									:
+									<a style={{
+										"color": '#9A9A9A',
+										"text-align": "center"
+									}}>{record.stduynumber}</a>
+									}
+
         </span>
 					),
 				},
@@ -469,10 +644,21 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-             <a style={{
-							 "color": '#07111B',
-							 "text-align": "center"
-						 }}>{record.classroom === null ? "--" : record.classroom === "" ? "--" : record.classroom}</a>
+							{record.classroom === null ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+								}}>--</a>  : record.classroom === "" ?
+									<a style={{
+										"color": '#999999',
+										"text-align": "center"
+									}}>--</a> :
+									<a style={{
+										"color": '#07111B',
+										"text-align": "center"
+									}}>{record.classroom}</a>
+								}
+
         </span>
 					)
 				},
@@ -485,10 +671,10 @@ class Studentshavecompletedthelist extends Component {
 					render: (text, record) => (
 						<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center"
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center"
 						 }}>{record.submitstate}</a>
         </span>
@@ -503,31 +689,47 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							{
+								record.updatetime === "--" ?
+									<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+
+									:
+									<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+
+							}
         </span>
 					),
 				},
 				{
-					title: '客观题分',
+					title: '客观题得分',
 					dataIndex: 'completion',
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-                            <a style={parseInt(record.completion) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-														} : parseInt(record.completion) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-														} : parseInt(record.completion) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.completion}</a>
+							{
+								record.completion === "--"?
+									 <a style={{
+										 "color": '#999999',
+										 "text-align": "center",
+									 }}>--</a>
+									:
+									<a style={parseInt(record.completion) > 90 ? {
+										"color": '#DD1717',
+										"text-align": "center",
+									} : parseInt(record.completion) <= 90 ? {
+										"color": '#FF6800',
+										"text-align": "center",
+									} : parseInt(record.completion) <= 60 ? {
+										"color": '#747A7F',
+										"text-align": "center",
+									} : {
+										"color": '#747A7F',
+										"text-align": "center",
+									}}>{record.completion}</a>
+							}
+
         </span>
 					)
 				},
@@ -539,16 +741,23 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-                        <a style={parseInt(record.levelscore) > 90 ? {
-													"color": '#DD1717',
-													"text-align": "center",
-												} : parseInt(record.levelscore) <= 90 ? {
-													"color": '#FF6800',
-													"text-align": "center",
-												} : parseInt(record.levelscore) <= 60 ? {
-													"color": '#747A7F',
-													"text-align": "center",
-												} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+									{
+										record.levelscore === "--" ?
+											<a style={{
+												"color": '#999999',
+												"text-align": "center",
+											}}>--</a> :
+											<a style={parseInt(record.levelscore) > 90 ? {
+												"color": '#DD1717',
+												"text-align": "center",
+											} : parseInt(record.levelscore) <= 90 ? {
+												"color": '#FF6800',
+												"text-align": "center",
+											} : parseInt(record.levelscore) <= 60 ? {
+												"color": '#747A7F',
+												"text-align": "center",
+											} : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}</a>
+									}
 
         </span>
 					)
@@ -561,32 +770,44 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.efficiencyscore}</a>
-        </span>
+							              {
+															record.efficiencyscore === "--" ?
+																<a style={{
+																	"color": '#999999',
+																	"text-align": "center",
+																}}>--</a> :
+																<a style={parseInt(record.efficiencyscore) > 90 ? {
+																	"color": '#DD1717',
+																	"text-align": "center",
+																} : parseInt(record.efficiencyscore) <= 90 ? {
+																	"color": '#FF6800',
+																	"text-align": "center",
+																} : parseInt(record.efficiencyscore) <= 60 ? {
+																	"color": '#747A7F',
+																	"text-align": "center",
+																} : {
+																	"color": '#747A7F',
+																	"text-align": "center",
+																}}>{record.efficiencyscore}</a>
+														}
+						</span>
 					)
 				},
 				{
-					title: '查看',
+					title: '操作',
 					dataIndex: 'operating',
 					key: 'operating',
 					align: 'center',
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-                      <a style={{"text-align": "center"}} className="color-blue"
-												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.operating}</a>
+							       {record.operating==="--"?
+											 <a style={{"text-align": "center","color": '#999999',}}>{record.operating}</a>
+											 :
+											 <a style={{"text-align": "center"}} className="color-blue"
+													href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.operating}</a>
+							       }
+
                     </span>
 					)
 				},
@@ -605,10 +826,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'number',
 					align: 'center',
 					className: "edu-txt-center",
-					width:'76px',
+					width: '76px',
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+							 {rrecord.number === "--" ?
+								 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								 :
+								 <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+							 }
         </span>
 					)
 				},
@@ -618,10 +843,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'name',
 					align: 'center',
 					className: "edu-txt-center",
-					width:'149px',
+					width: '149px',
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+							{record.name==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>{record.name}</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+							}
         </span>
 					)
 				},
@@ -631,10 +860,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'stduynumber',
 					align: 'center',
 					className: "edu-txt-center",
-					width:'159px',
+					width: '159px',
 					render: (text, record) => (
-						<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+				<span>
+						{record.stduynumber === "--" ?
+						<a style={{"color": '#999999', "text-align": "center"}}>{record.stduynumber}</a>
+						:
+						<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+						}
         </span>
 					),
 				},
@@ -646,7 +879,11 @@ class Studentshavecompletedthelist extends Component {
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</a>
+							{record.classroom==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>{record.classroom}</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</a>
+							}
         </span>
 					)
 				},
@@ -656,16 +893,17 @@ class Studentshavecompletedthelist extends Component {
 					key: 'submitstate',
 					align: 'center',
 					className: "edu-txt-center",
-					width:'112px',
+					width: '112px',
 					render: (text, record) => (
 						<span>
-             <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
-							 "text-align": "center"
-						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
+								<a style={record.submitstate === "未提交" ? {
+									"color": '#999999',
+									"text-align": "center"
+								} : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+									"color": '#29BD8B',
+									"text-align": "center"
+								}}>{record.submitstate}</a>
+
         </span>
 					)
 
@@ -675,24 +913,32 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'updatetime',
 					key: 'updatetime',
 					align: 'center',
-					width:'194px',
+					width: '194px',
 					className: "edu-txt-center",
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							{record.updatetime==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							}
         </span>
 					),
 				},
 				{
-					title: '客观题分',
+					title: '客观题得分',
 					dataIndex: 'completion',
 					key: 'completion',
 					align: 'center',
 					className: "edu-txt-center",
-					width:'112px',
+					width: '112px',
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+							{record.completion=== "--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+							}
         </span>
 					)
 				},
@@ -702,10 +948,14 @@ class Studentshavecompletedthelist extends Component {
 					key: 'levelscore',
 					align: 'center',
 					className: "edu-txt-center",
-					width:'130px',
+					width: '130px',
 					render: (text, record) => (
 						<span>
-             <a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+							{record.levelscore==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+							}
         </span>
 					)
 				},
@@ -715,22 +965,27 @@ class Studentshavecompletedthelist extends Component {
 					key: 'efficiencyscore',
 					align: 'center',
 					className: "edu-txt-center",
-					width:'112px',
+					width: '112px',
 					render: (text, record) => (
 						<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.efficiencyscore}</a>
+															{record.efficiencyscore === "--" ?
+                                  <a style={{"color": '#999999',
+																		"text-align": "center",}}>--</a>
+																	:
+															<a style={parseInt(record.efficiencyscore) > 90 ? {
+																"color": '#DD1717',
+																"text-align": "center",
+															} : parseInt(record.efficiencyscore) <= 90 ? {
+																"color": '#FF6800',
+																"text-align": "center",
+															} : parseInt(record.efficiencyscore) <= 60 ? {
+																"color": '#747A7F',
+																"text-align": "center",
+															} : {
+																"color": '#747A7F',
+																"text-align": "center",
+															}}>{record.efficiencyscore}</a>
+														}
         </span>
 					)
 				},
@@ -740,11 +995,17 @@ class Studentshavecompletedthelist extends Component {
 					key: 'finalscore',
 					align: 'center',
 					className: "edu-txt-center",
-					width:'78px',
+					width: '78px',
 					render: (text, record) => (
 						<span>
-                      <a style={{"text-align": "center"}} className="color-blue"
-												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+							{record.finalscore==="--"?
+								<a style={{"text-align": "center","color": '#999999'}}
+								>--</a>
+								:
+								<a style={{"text-align": "center"}} className="color-blue"
+									 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+							}
+
                     </span>
 					)
 				},
@@ -756,13 +1017,13 @@ class Studentshavecompletedthelist extends Component {
 
 	paginationonChange = (pageNumber) => {
 		// console.log('Page: ');
-		if(this.state.loadingstate=== false){
+		if (this.state.loadingstate === false) {
 			this.setState({
 				page: pageNumber,
-				loadingstate:true,
+				loadingstate: true,
 			})
 
-		}else{
+		} else {
 			this.setState({
 				page: pageNumber,
 			})
@@ -773,13 +1034,13 @@ class Studentshavecompletedthelist extends Component {
 	}
 	paginationonChanges = (pageNumber) => {
 		// console.log('Page: ');
-		if(this.state.loadingstate=== false) {
+		if (this.state.loadingstate === false) {
 			this.setState({
 				page: pageNumber,
-				loadingstate:true,
+				loadingstate: true,
 			})
 
-		}else{
+		} else {
 			this.setState({
 				page: pageNumber,
 			})
@@ -851,10 +1112,17 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{
-													 "color": '#07111B',
-													 "text-align": "center",
-												 }}>{record.number}</a>
+												{record.number==="--"?
+													<a style={{
+														"color": '#999999',
+														"text-align": "center",
+													}}>--</a>
+													:
+													<a style={{
+														"color": '#07111B',
+														"text-align": "center",
+													}}>{record.number}</a>
+												}
                     </span>
 										)
 									},
@@ -866,7 +1134,12 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+												{record.name==="--"?
+													<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+													:
+													<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+												}
                     </span>
 										)
 									},
@@ -878,10 +1151,22 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{
-													 "color": '#9A9A9A',
-													 "text-align": "center"
-												 }}>{record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+													{record.stduynumber === null ?
+														<a style={{
+															"color": '#999999',
+															"text-align": "center"
+														}}>--</a>
+														: record.stduynumber === "" ?
+															<a style={{
+																"color": '#999999',
+																"text-align": "center"
+															}}>--</a>
+															:
+															<a style={{
+																"color": '#9A9A9A',
+																"text-align": "center"
+															}}>{record.stduynumber}</a>
+													}
                     </span>
 										),
 									},
@@ -894,7 +1179,7 @@ class Studentshavecompletedthelist extends Component {
 										render: (text, record) => (
 											<span>
                          <a style={record.submitstate === "未提交" ? {
-													 "color": '#DD1717',
+													 "color": '#999999',
 													 "text-align": "center"
 												 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
 													 "color": '#747A7F',
@@ -912,7 +1197,11 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+												{record.updatetime==="--"?
+													<a style={{"color": '#999999', "text-align": "center"}}></a>
+													:
+													<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+												}
                     </span>
 										),
 									},
@@ -924,10 +1213,24 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{
-													 "color": '#FF6800',
-													 "text-align": "center",
-												 }}>{record.efficiencyscore === null ? "--" : record.efficiencyscore === "" ? "--" : record.efficiencyscore}</a>
+                        {record.efficiencyscore === "--" ?
+													<a style={{"color": '#999999',
+														"text-align": "center",}}>--</a>
+													:
+													<a style={parseInt(record.efficiencyscore) > 90 ? {
+														"color": '#DD1717',
+														"text-align": "center",
+													} : parseInt(record.efficiencyscore) <= 90 ? {
+														"color": '#FF6800',
+														"text-align": "center",
+													} : parseInt(record.efficiencyscore) <= 60 ? {
+														"color": '#747A7F',
+														"text-align": "center",
+													} : {
+														"color": '#747A7F',
+														"text-align": "center",
+													}}>{record.efficiencyscore}</a>
+												}
                     </span>
 										)
 									},
@@ -944,7 +1247,7 @@ class Studentshavecompletedthelist extends Component {
 																								<a style={{"text-align": "center"}} className="color-blue"
 																									 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>查看</a>
 																								:
-																								<a style={{"text-align": "center"}}
+																								<a style={{"text-align": "center","color": '#999999'}}
 																									 className="color-blue">{"--"}</a>
 																						}
 
@@ -964,10 +1267,18 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{
-													 "color": '#07111B',
-													 "text-align": "center",
-												 }}>{record.number}</a>
+												{record.number==="--"?
+													<a style={{
+														"color": '#999999',
+														"text-align": "center",
+													}}>--</a>
+													:
+													<a style={{
+														"color": '#07111B',
+														"text-align": "center",
+													}}>{record.number}</a>
+												}
+
                     </span>
 										)
 									},
@@ -979,7 +1290,12 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+                        	{record.name==="--"?
+														<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+														:
+														<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+													}
                     </span>
 										)
 									},
@@ -991,10 +1307,22 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{
-													 "color": '#9A9A9A',
-													 "text-align": "center"
-												 }}>{record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+                        	{record.stduynumber === null ?
+														<a style={{
+															"color": '#999999',
+															"text-align": "center"
+														}}>--</a>
+														: record.stduynumber === "" ?
+															<a style={{
+																"color": '#999999',
+																"text-align": "center"
+															}}>--</a>
+															:
+															<a style={{
+																"color": '#9A9A9A',
+																"text-align": "center"
+															}}>{record.stduynumber}</a>
+													}
                     </span>
 										),
 									},
@@ -1006,10 +1334,21 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{
-													 "color": '#07111B',
-													 "text-align": "center"
-												 }}>{record.classroom === null ? "--" : record.classroom === "" ? "--" : record.classroom} </a>
+                         {record.classroom === null ?
+													 <a style={{
+														 "color": '#999999',
+														 "text-align": "center"
+													 }}>--</a>  : record.classroom === "" ?
+														 <a style={{
+															 "color": '#999999',
+															 "text-align": "center"
+														 }}>--</a> :
+														 <a style={{
+															 "color": '#07111B',
+															 "text-align": "center"
+														 }}>{record.classroom}</a>
+												 }
+
                     </span>
 										)
 									},
@@ -1022,10 +1361,10 @@ class Studentshavecompletedthelist extends Component {
 										render: (text, record) => (
 											<span>
                          <a style={record.submitstate === "未提交" ? {
-													 "color": '#DD1717',
+													 "color": '#999999',
 													 "text-align": "center"
 												 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-													 "color": '#747A7F',
+													 "color": '#29BD8B',
 													 "text-align": "center"
 												 }}>{record.submitstate}</a>
                     </span>
@@ -1040,7 +1379,11 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+                        {record.updatetime==="--"?
+													<a style={{"color": '#999999', "text-align": "center"}}></a>
+													:
+													<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+												}
                     </span>
 										),
 									},
@@ -1052,10 +1395,24 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-                         <a style={{
-													 "color": '#FF6800',
-													 "text-align": "center",
-												 }}>{record.efficiencyscore === null ? "--" : record.efficiencyscore === "" ? "--" : record.efficiencyscore}</a>
+                        {record.efficiencyscore === "--" ?
+													<a style={{"color": '#999999',
+														"text-align": "center",}}>--</a>
+													:
+													<a style={parseInt(record.efficiencyscore) > 90 ? {
+														"color": '#DD1717',
+														"text-align": "center",
+													} : parseInt(record.efficiencyscore) <= 90 ? {
+														"color": '#FF6800',
+														"text-align": "center",
+													} : parseInt(record.efficiencyscore) <= 60 ? {
+														"color": '#747A7F',
+														"text-align": "center",
+													} : {
+														"color": '#747A7F',
+														"text-align": "center",
+													}}>{record.efficiencyscore}</a>
+												}
                     </span>
 										)
 									},
@@ -1072,7 +1429,7 @@ class Studentshavecompletedthelist extends Component {
 																								<a style={{"text-align": "center"}} className="color-blue"
 																									 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>查看</a>
 																								:
-																								<a style={{"text-align": "center"}}
+																								<a style={{"text-align": "center","color": '#999999'}}
 																									 className="color-blue">{"--"}</a>
 																						}
 
@@ -1087,7 +1444,7 @@ class Studentshavecompletedthelist extends Component {
 				} else {
 					//学生已截止
 					if (response.data.exercise_types.subjective === 0) {
-						if(this.state.loadingstate=== false){
+						if (this.state.loadingstate === false) {
 							thiss.setState({
 								columns: [
 									{
@@ -1099,7 +1456,18 @@ class Studentshavecompletedthelist extends Component {
 										width: "84px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "84px"}}>{record.number}</a>
+             	{record.number==="--"?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center",
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#07111B',
+									"text-align": "center",
+								}}>{record.number}</a>
+							}
+
         </span>
 										)
 									},
@@ -1112,7 +1480,12 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "110px",}}>{record.name}</a>
+           {record.name==="--"?
+						 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
+						 :
+						 <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+					 }
         </span>
 										)
 									},
@@ -1125,8 +1498,23 @@ class Studentshavecompletedthelist extends Component {
 										width: "175px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "175px"}}> {record.stduynumber}</a>
-        </span>
+											{record.stduynumber === null ?
+												<a style={{
+													"color": '#999999',
+													"text-align": "center"
+												}}>--</a>
+												: record.stduynumber === "" ?
+													<a style={{
+														"color": '#999999',
+														"text-align": "center"
+													}}>--</a>
+													:
+													<a style={{
+														"color": '#9A9A9A',
+														"text-align": "center"
+													}}>{record.stduynumber}</a>
+											}
+                     </span>
 										),
 									},
 									{
@@ -1138,7 +1526,20 @@ class Studentshavecompletedthelist extends Component {
 										width: "120px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "120px"}}>{record.classroom===""?"--":record.classroom===undefined?"--":record.classroom}</a>
+										 {record.classroom === null ?
+											 <a style={{
+												 "color": '#999999',
+												 "text-align": "center"
+											 }}>--</a>  : record.classroom === "" ?
+												 <a style={{
+													 "color": '#999999',
+													 "text-align": "center"
+												 }}>--</a> :
+												 <a style={{
+													 "color": '#07111B',
+													 "text-align": "center"
+												 }}>{record.classroom}</a>
+										 }
         </span>
 										)
 									},
@@ -1152,11 +1553,11 @@ class Studentshavecompletedthelist extends Component {
 										render: (text, record) => (
 											<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center",
 							 "width": "124px",
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center",
 							 "width": "124px",
 						 }}>{record.submitstate}</a>
@@ -1173,7 +1574,11 @@ class Studentshavecompletedthelist extends Component {
 										width: "236.4px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+               {record.updatetime==="--"?
+								 <a style={{"color": '#999999', "text-align": "center"}}></a>
+								 :
+								 <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							 }
         </span>
 										),
 									},
@@ -1186,7 +1591,24 @@ class Studentshavecompletedthelist extends Component {
 										width: "124px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#FF6800', "text-align": "center", "width": "124px",}}>{record.efficiencyscore}</a>
+             {record.efficiencyscore === "--" ?
+							 <a style={{"color": '#999999',
+								 "text-align": "center",}}>--</a>
+							 :
+							 <a style={parseInt(record.efficiencyscore) > 90 ? {
+								 "color": '#DD1717',
+								 "text-align": "center",
+							 } : parseInt(record.efficiencyscore) <= 90 ? {
+								 "color": '#FF6800',
+								 "text-align": "center",
+							 } : parseInt(record.efficiencyscore) <= 60 ? {
+								 "color": '#747A7F',
+								 "text-align": "center",
+							 } : {
+								 "color": '#747A7F',
+								 "text-align": "center",
+							 }}>{record.efficiencyscore}</a>
+						 }
         </span>
 										)
 									}
@@ -1201,7 +1623,17 @@ class Studentshavecompletedthelist extends Component {
 										width: "84px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "84px"}}>{record.number}</a>
+            	{record.number==="--"?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center",
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#07111B',
+									"text-align": "center",
+								}}>{record.number}</a>
+							}
         </span>
 										)
 									},
@@ -1214,7 +1646,12 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center tabletd",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "110px",}}>{record.name}</a>
+              {record.name==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+							}
         </span>
 										)
 									},
@@ -1227,7 +1664,22 @@ class Studentshavecompletedthelist extends Component {
 										width: "175px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "175px"}}> {record.stduynumber}</a>
+									 {record.stduynumber === null ?
+										 <a style={{
+											 "color": '#999999',
+											 "text-align": "center"
+										 }}>--</a>
+										 : record.stduynumber === "" ?
+											 <a style={{
+												 "color": '#999999',
+												 "text-align": "center"
+											 }}>--</a>
+											 :
+											 <a style={{
+												 "color": '#9A9A9A',
+												 "text-align": "center"
+											 }}>{record.stduynumber}</a>
+									 }
         </span>
 										),
 									},
@@ -1240,7 +1692,20 @@ class Studentshavecompletedthelist extends Component {
 										width: "120px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "120px"}}>{record.classroom}</a>
+									{record.classroom === null ?
+										<a style={{
+											"color": '#999999',
+											"text-align": "center"
+										}}>--</a>  : record.classroom === "" ?
+											<a style={{
+												"color": '#999999',
+												"text-align": "center"
+											}}>--</a> :
+											<a style={{
+												"color": '#07111B',
+												"text-align": "center"
+											}}>{record.classroom}</a>
+									}
         </span>
 										)
 									},
@@ -1254,11 +1719,11 @@ class Studentshavecompletedthelist extends Component {
 										render: (text, record) => (
 											<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center",
 							 "width": "124px",
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center",
 							 "width": "124px",
 						 }}>{record.submitstate}</a>
@@ -1275,7 +1740,11 @@ class Studentshavecompletedthelist extends Component {
 										width: "236.4px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+             {record.updatetime==="--"?
+							 <a style={{"color": '#999999', "text-align": "center"}}></a>
+							 :
+							 <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+						 }
         </span>
 										),
 									},
@@ -1288,14 +1757,31 @@ class Studentshavecompletedthelist extends Component {
 										width: "124px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#FF6800', "text-align": "center", "width": "124px",}}>{record.efficiencyscore}</a>
+                {record.efficiencyscore === "--" ?
+									<a style={{"color": '#999999',
+										"text-align": "center",}}>--</a>
+									:
+									<a style={parseInt(record.efficiencyscore) > 90 ? {
+										"color": '#DD1717',
+										"text-align": "center",
+									} : parseInt(record.efficiencyscore) <= 90 ? {
+										"color": '#FF6800',
+										"text-align": "center",
+									} : parseInt(record.efficiencyscore) <= 60 ? {
+										"color": '#747A7F',
+										"text-align": "center",
+									} : {
+										"color": '#747A7F',
+										"text-align": "center",
+									}}>{record.efficiencyscore}</a>
+								}
         </span>
 										)
 									}
 								],
-								loadingstate:true,
+								loadingstate: true,
 							})
-						}else{
+						} else {
 							thiss.setState({
 								columns: [
 									{
@@ -1307,7 +1793,17 @@ class Studentshavecompletedthelist extends Component {
 										width: "84px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "84px"}}>{record.number}</a>
+            	{record.number==="--"?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center",
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#07111B',
+									"text-align": "center",
+								}}>{record.number}</a>
+							}
         </span>
 										)
 									},
@@ -1320,7 +1816,12 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "110px",}}>{record.name}</a>
+             {record.name==="--"?
+							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							 :
+							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+						 }
         </span>
 										)
 									},
@@ -1333,7 +1834,22 @@ class Studentshavecompletedthelist extends Component {
 										width: "175px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "175px"}}> {record.stduynumber}</a>
+									 {record.stduynumber === null ?
+										 <a style={{
+											 "color": '#999999',
+											 "text-align": "center"
+										 }}>--</a>
+										 : record.stduynumber === "" ?
+											 <a style={{
+												 "color": '#999999',
+												 "text-align": "center"
+											 }}>--</a>
+											 :
+											 <a style={{
+												 "color": '#9A9A9A',
+												 "text-align": "center"
+											 }}>{record.stduynumber}</a>
+									 }
         </span>
 										),
 									},
@@ -1346,7 +1862,20 @@ class Studentshavecompletedthelist extends Component {
 										width: "120px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "120px"}}>{record.classroom===""?"--":record.classroom===undefined?"--":record.classroom}</a>
+										{record.classroom === null ?
+											<a style={{
+												"color": '#999999',
+												"text-align": "center"
+											}}>--</a>  : record.classroom === "" ?
+												<a style={{
+													"color": '#999999',
+													"text-align": "center"
+												}}>--</a> :
+												<a style={{
+													"color": '#07111B',
+													"text-align": "center"
+												}}>{record.classroom}</a>
+										}
         </span>
 										)
 									},
@@ -1360,11 +1889,11 @@ class Studentshavecompletedthelist extends Component {
 										render: (text, record) => (
 											<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center",
 							 "width": "124px",
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center",
 							 "width": "124px",
 						 }}>{record.submitstate}</a>
@@ -1381,7 +1910,11 @@ class Studentshavecompletedthelist extends Component {
 										width: "236.4px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+             {record.updatetime==="--"?
+							 <a style={{"color": '#999999', "text-align": "center"}}></a>
+							 :
+							 <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+						 }
         </span>
 										),
 									},
@@ -1394,7 +1927,24 @@ class Studentshavecompletedthelist extends Component {
 										width: "124px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#FF6800', "text-align": "center", "width": "124px",}}>{record.efficiencyscore}</a>
+									{record.efficiencyscore === "--" ?
+										<a style={{"color": '#999999',
+											"text-align": "center",}}>--</a>
+										:
+										<a style={parseInt(record.efficiencyscore) > 90 ? {
+											"color": '#DD1717',
+											"text-align": "center",
+										} : parseInt(record.efficiencyscore) <= 90 ? {
+											"color": '#FF6800',
+											"text-align": "center",
+										} : parseInt(record.efficiencyscore) <= 60 ? {
+											"color": '#747A7F',
+											"text-align": "center",
+										} : {
+											"color": '#747A7F',
+											"text-align": "center",
+										}}>{record.efficiencyscore}</a>
+									}
         </span>
 										)
 									}
@@ -1409,7 +1959,17 @@ class Studentshavecompletedthelist extends Component {
 										width: "84px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "84px"}}>{record.number}</a>
+             {record.number==="--"?
+							 <a style={{
+								 "color": '#999999',
+								 "text-align": "center",
+							 }}>--</a>
+							 :
+							 <a style={{
+								 "color": '#07111B',
+								 "text-align": "center",
+							 }}>{record.number}</a>
+						 }
         </span>
 										)
 									},
@@ -1422,7 +1982,12 @@ class Studentshavecompletedthelist extends Component {
 										className: "edu-txt-center tabletd",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "110px",}}>{record.name}</a>
+              {record.name==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+							}
         </span>
 										)
 									},
@@ -1435,7 +2000,22 @@ class Studentshavecompletedthelist extends Component {
 										width: "175px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "175px"}}> {record.stduynumber}</a>
+									 {record.stduynumber === null ?
+										 <a style={{
+											 "color": '#999999',
+											 "text-align": "center"
+										 }}>--</a>
+										 : record.stduynumber === "" ?
+											 <a style={{
+												 "color": '#999999',
+												 "text-align": "center"
+											 }}>--</a>
+											 :
+											 <a style={{
+												 "color": '#9A9A9A',
+												 "text-align": "center"
+											 }}>{record.stduynumber}</a>
+									 }
         </span>
 										),
 									},
@@ -1448,7 +2028,20 @@ class Studentshavecompletedthelist extends Component {
 										width: "120px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "120px"}}>{record.classroom}</a>
+										{record.classroom === null ?
+											<a style={{
+												"color": '#999999',
+												"text-align": "center"
+											}}>--</a>  : record.classroom === "" ?
+												<a style={{
+													"color": '#999999',
+													"text-align": "center"
+												}}>--</a> :
+												<a style={{
+													"color": '#07111B',
+													"text-align": "center"
+												}}>{record.classroom}</a>
+										}
         </span>
 										)
 									},
@@ -1462,11 +2055,11 @@ class Studentshavecompletedthelist extends Component {
 										render: (text, record) => (
 											<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center",
 							 "width": "124px",
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center",
 							 "width": "124px",
 						 }}>{record.submitstate}</a>
@@ -1483,7 +2076,11 @@ class Studentshavecompletedthelist extends Component {
 										width: "236.4px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "236.4px",}}>{record.updatetime}</a>
+										{record.updatetime==="--"?
+											<a style={{"color": '#999999', "text-align": "center"}}></a>
+											:
+											<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+										}
         </span>
 										),
 									},
@@ -1496,7 +2093,24 @@ class Studentshavecompletedthelist extends Component {
 										width: "124px",
 										render: (text, record) => (
 											<span>
-             <a style={{"color": '#FF6800', "text-align": "center", "width": "124px",}}>{record.efficiencyscore}</a>
+                  {record.efficiencyscore === "--" ?
+										<a style={{"color": '#999999',
+											"text-align": "center",}}>--</a>
+										:
+										<a style={parseInt(record.efficiencyscore) > 90 ? {
+											"color": '#DD1717',
+											"text-align": "center",
+										} : parseInt(record.efficiencyscore) <= 90 ? {
+											"color": '#FF6800',
+											"text-align": "center",
+										} : parseInt(record.efficiencyscore) <= 60 ? {
+											"color": '#747A7F',
+											"text-align": "center",
+										} : {
+											"color": '#747A7F',
+											"text-align": "center",
+										}}>{record.efficiencyscore}</a>
+									}
         </span>
 										)
 									}
@@ -1505,7 +2119,6 @@ class Studentshavecompletedthelist extends Component {
 						}
 
 
-
 					}
 					thiss.Generatenewdata(response.data.exercise_users, response.data.current_answer_user);
 				}
@@ -1515,9 +2128,9 @@ class Studentshavecompletedthelist extends Component {
 				// console.log(response.data.exercise_users)
 				//  console.log(response)
 
-				if(thiss.state.loadingstate===false){
+				if (thiss.state.loadingstate === false) {
 					thiss.setState({
-						loadingstate:true,
+						loadingstate: true,
 					})
 				}
 
@@ -1531,7 +2144,7 @@ class Studentshavecompletedthelist extends Component {
 	}
 
 	Generatenewdata(exercise_users, current_answer_user) {
-		let {page,limit} = this.state;
+		let {page, limit} = this.state;
 		let datalist = [];
 		let datalisttwo = [];
 		var teacherlist = undefined;
@@ -1543,7 +2156,7 @@ class Studentshavecompletedthelist extends Component {
 					datalist.push({
 						myid: exercise_users[i].login,
 						user_group_id: exercise_users[i].user_group_id,
-						number:(parseInt(page)-1)*parseInt(limit)+(i+1),
+						number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
 						name: exercise_users[i].user_name,
 						stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id,
 						classroom: exercise_users[i].user_group_name,
@@ -1558,7 +2171,7 @@ class Studentshavecompletedthelist extends Component {
 					datalist.push({
 						myid: exercise_users[i].login,
 						user_group_id: exercise_users[i].user_group_id,
-						number: (parseInt(page)-1)*parseInt(limit)+(i+1),
+						number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
 						name: exercise_users[i].user_name,
 						stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id,
 						classroom: exercise_users[i].user_group_name,
@@ -1604,13 +2217,13 @@ class Studentshavecompletedthelist extends Component {
 			data: datalisttwo,
 			datas: datalist,
 			teacherlist: teacherlist,
-			loadingstate:false,
+			loadingstate: false,
 		})
 
 	}
 
 	Generatenewdatas(exercise_users) {
-		let{page,limit} = this.state;
+		let {page, limit} = this.state;
 		let datalist = [];
 		var teacherlist = undefined;
 		var noclassroom = undefined;
@@ -1621,7 +2234,7 @@ class Studentshavecompletedthelist extends Component {
 				datalist.push({
 					myid: exercise_users[i].login,
 					user_group_id: exercise_users[i].user_group_id,
-					number:(parseInt(page)-1)*parseInt(limit)+(i+1),
+					number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
 					name: exercise_users[i].user_name,
 					stduynumber: exercise_users[i].student_id,
 					classroom: exercise_users[i].user_group_name,
@@ -1645,7 +2258,7 @@ class Studentshavecompletedthelist extends Component {
 			datas: datalist,
 			teacherlist: teacherlist,
 			noclassroom: noclassroom,
-			loadingstate:false,
+			loadingstate: false,
 		})
 	}
 
@@ -1681,14 +2294,14 @@ class Studentshavecompletedthelist extends Component {
 		if (e === "end_at") {
 			// 时间
 			// 时间排序是从小到大
-			if(this.state.loadingstate===true){
+			if (this.state.loadingstate === true) {
 				this.setState({
 					order: "end_at",
 				})
-			}else{
+			} else {
 				this.setState({
 					order: "end_at",
-					loadingstate:true,
+					loadingstate: true,
 				})
 			}
 
@@ -1698,14 +2311,14 @@ class Studentshavecompletedthelist extends Component {
 		if (e === "score") {
 			// 成绩
 			//成绩排序是从大到小
-			if(this.state.loadingstate===true) {
+			if (this.state.loadingstate === true) {
 				this.setState({
 					order: "score",
 				})
-			}else{
+			} else {
 				this.setState({
 					order: "score",
-					loadingstate:true,
+					loadingstate: true,
 				})
 			}
 
@@ -1715,14 +2328,14 @@ class Studentshavecompletedthelist extends Component {
 		if (e === "student_id") {
 			//学号
 			//学号排序是从大到小
-			if(this.state.loadingstate===true) {
+			if (this.state.loadingstate === true) {
 				this.setState({
 					order: "student_id",
 				})
-			}else{
+			} else {
 				this.setState({
 					order: "student_id",
-					loadingstate:true
+					loadingstate: true
 				})
 			}
 
@@ -1766,7 +2379,17 @@ class Studentshavecompletedthelist extends Component {
 							width: "84px",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "84px",}}>{record.number}</a>
+            {record.number==="--"?
+							<a style={{
+								"color": '#999999',
+								"text-align": "center",
+							}}>--</a>
+							:
+							<a style={{
+								"color": '#07111B',
+								"text-align": "center",
+							}}>{record.number}</a>
+						}
         </span>
 							)
 						},
@@ -1779,7 +2402,12 @@ class Studentshavecompletedthelist extends Component {
 							width: "110px",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "110px",}}>{record.name}</a>
+            {record.name==="--"?
+							<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							:
+							<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+						}
         </span>
 							)
 						},
@@ -1792,7 +2420,22 @@ class Studentshavecompletedthelist extends Component {
 							className: "edu-txt-center",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "175px",}}>{record.stduynumber}</a>
+            {record.stduynumber === null ?
+							<a style={{
+								"color": '#999999',
+								"text-align": "center"
+							}}>--</a>
+							: record.stduynumber === "" ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#9A9A9A',
+									"text-align": "center"
+								}}>{record.stduynumber}</a>
+						}
         </span>
 							),
 						},
@@ -1805,7 +2448,20 @@ class Studentshavecompletedthelist extends Component {
 							className: "edu-txt-center",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "120px",}}>{record.classroom===""?"--":record.classroom===undefined?"--":record.classroom}</a>
+							{record.classroom === null ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+								}}>--</a>  : record.classroom === "" ?
+									<a style={{
+										"color": '#999999',
+										"text-align": "center"
+									}}>--</a> :
+									<a style={{
+										"color": '#07111B',
+										"text-align": "center"
+									}}>{record.classroom}</a>
+							}
         </span>
 							)
 						},
@@ -1819,11 +2475,11 @@ class Studentshavecompletedthelist extends Component {
 							render: (text, record) => (
 								<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center",
 							 "width": "124px",
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center",
 							 "width": "124px",
 						 }}>{record.submitstate}</a>
@@ -1840,7 +2496,11 @@ class Studentshavecompletedthelist extends Component {
 							width: "236px",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "236px",}}>{record.updatetime}</a>
+            	{record.updatetime==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}></a>
+								:
+								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							}
         </span>
 							),
 						},
@@ -1853,7 +2513,24 @@ class Studentshavecompletedthelist extends Component {
 							width: "124px",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#FF6800', "text-align": "center", "width": "124px"}}>{record.efficiencyscore}</a>
+              {record.efficiencyscore === "--" ?
+								<a style={{"color": '#999999',
+									"text-align": "center",}}>--</a>
+								:
+								<a style={parseInt(record.efficiencyscore) > 90 ? {
+									"color": '#DD1717',
+									"text-align": "center",
+								} : parseInt(record.efficiencyscore) <= 90 ? {
+									"color": '#FF6800',
+									"text-align": "center",
+								} : parseInt(record.efficiencyscore) <= 60 ? {
+									"color": '#747A7F',
+									"text-align": "center",
+								} : {
+									"color": '#747A7F',
+									"text-align": "center",
+								}}>{record.efficiencyscore}</a>
+							}
         </span>
 							)
 						}
@@ -1868,7 +2545,17 @@ class Studentshavecompletedthelist extends Component {
 							width: "84px",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "84px",}}>{record.number}</a>
+              {record.number==="--"?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center",
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#07111B',
+									"text-align": "center",
+								}}>{record.number}</a>
+							}
         </span>
 							)
 						},
@@ -1881,7 +2568,12 @@ class Studentshavecompletedthelist extends Component {
 							width: "110px",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "110px",}}>{record.name}</a>
+              {record.name==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+							}
         </span>
 							)
 						},
@@ -1894,7 +2586,22 @@ class Studentshavecompletedthelist extends Component {
 							className: "edu-txt-center tabletd",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "175px",}}>{record.stduynumber}</a>
+             {record.stduynumber === null ?
+							 <a style={{
+								 "color": '#999999',
+								 "text-align": "center"
+							 }}>--</a>
+							 : record.stduynumber === "" ?
+								 <a style={{
+									 "color": '#999999',
+									 "text-align": "center"
+								 }}>--</a>
+								 :
+								 <a style={{
+									 "color": '#9A9A9A',
+									 "text-align": "center"
+								 }}>{record.stduynumber}</a>
+						 }
         </span>
 							),
 						},
@@ -1907,7 +2614,20 @@ class Studentshavecompletedthelist extends Component {
 							className: "edu-txt-center tabletd",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#07111B', "text-align": "center", "width": "120px",}}>{record.classroom}</a>
+            {record.classroom === null ?
+							<a style={{
+								"color": '#999999',
+								"text-align": "center"
+							}}>--</a>  : record.classroom === "" ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+								}}>--</a> :
+								<a style={{
+									"color": '#07111B',
+									"text-align": "center"
+								}}>{record.classroom}</a>
+						}
         </span>
 							)
 						},
@@ -1921,11 +2641,11 @@ class Studentshavecompletedthelist extends Component {
 							render: (text, record) => (
 								<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center",
 							 "width": "124px",
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center", "width": "124px",} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center",
 							 "width": "124px",
 						 }}>{record.submitstate}</a>
@@ -1942,7 +2662,11 @@ class Studentshavecompletedthelist extends Component {
 							width: "236px",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center", "width": "236px",}}>{record.updatetime}</a>
+            	{record.updatetime==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}></a>
+								:
+								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							}
         </span>
 							),
 						},
@@ -1955,19 +2679,36 @@ class Studentshavecompletedthelist extends Component {
 							width: "124px",
 							render: (text, record) => (
 								<span>
-             <a style={{"color": '#FF6800', "text-align": "center", "width": "124px"}}>{record.efficiencyscore}</a>
+             {record.efficiencyscore === "--" ?
+							 <a style={{"color": '#999999',
+								 "text-align": "center",}}>--</a>
+							 :
+							 <a style={parseInt(record.efficiencyscore) > 90 ? {
+								 "color": '#DD1717',
+								 "text-align": "center",
+							 } : parseInt(record.efficiencyscore) <= 90 ? {
+								 "color": '#FF6800',
+								 "text-align": "center",
+							 } : parseInt(record.efficiencyscore) <= 60 ? {
+								 "color": '#747A7F',
+								 "text-align": "center",
+							 } : {
+								 "color": '#747A7F',
+								 "text-align": "center",
+							 }}>{record.efficiencyscore}</a>
+						 }
         </span>
 							)
 						}
 					],
-					loadingstate:false,
+					loadingstate: false,
 				})
 			}
 			this.Generatenewdata(response.data.exercise_users, response.data.current_answer_user);
 		}).catch((error) => {
 			console.log(error)
 			this.setState({
-				loadingstate:false,
+				loadingstate: false,
 			})
 		});
 	}
@@ -1975,7 +2716,7 @@ class Studentshavecompletedthelist extends Component {
 	//////老师页面调用的
 
 	Generatenewdatasy(exercise_users, response) {
-		let{page,limit} = this.state;
+		let {page, limit} = this.state;
 		var thiss = this;
 		let datalist = [];
 		var indexi = 0;
@@ -1988,7 +2729,7 @@ class Studentshavecompletedthelist extends Component {
 					datalist.push({
 						myid: exercise_users[i].login,
 						user_group_id: exercise_users[i].user_group_id,
-						number: (parseInt(page)-1)*parseInt(limit)+(i+1),
+						number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
 						name: exercise_users[i].user_name,
 						stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id,
 						classroom: exercise_users[i].user_group_name,
@@ -2003,7 +2744,7 @@ class Studentshavecompletedthelist extends Component {
 					datalist.push({
 						myid: exercise_users[i].login,
 						user_group_id: exercise_users[i].user_group_id,
-						number: (parseInt(page)-1)*parseInt(limit)+(i+1),
+						number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
 						name: exercise_users[i].user_name,
 						stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id,
 						classroom: exercise_users[i].user_group_name,
@@ -2032,7 +2773,7 @@ class Studentshavecompletedthelist extends Component {
 				//都没评论 不显示评论
 				if (response.data.exercise_types.groups_count > 0) {
 					// console.log("77771111111");
-					 //分班大于0显示分班
+					//分班大于0显示分班
 					//7ge
 					thiss.setState({
 						data: datalist,
@@ -2050,10 +2791,20 @@ class Studentshavecompletedthelist extends Component {
 								key: 'number',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'110px',
+								width: '110px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+               {record.number==="--"?
+								 <a style={{
+									 "color": '#999999',
+									 "text-align": "center",
+								 }}>--</a>
+								 :
+								 <a style={{
+									 "color": '#07111B',
+									 "text-align": "center",
+								 }}>{record.number}</a>
+							 }
         </span>
 								)
 							},
@@ -2063,10 +2814,15 @@ class Studentshavecompletedthelist extends Component {
 								key: 'name',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'183px',
+								width: '183px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+              {record.name==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+							}
         </span>
 								)
 							},
@@ -2076,10 +2832,25 @@ class Studentshavecompletedthelist extends Component {
 								key: 'stduynumber',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'193px',
+								width: '193px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+								{record.stduynumber === null ?
+									<a style={{
+										"color": '#999999',
+										"text-align": "center"
+									}}>--</a>
+									: record.stduynumber === "" ?
+										<a style={{
+											"color": '#999999',
+											"text-align": "center"
+										}}>--</a>
+										:
+										<a style={{
+											"color": '#9A9A9A',
+											"text-align": "center"
+										}}>{record.stduynumber}</a>
+								}
         </span>
 								),
 							},
@@ -2089,10 +2860,23 @@ class Studentshavecompletedthelist extends Component {
 								dataIndex: 'classroom',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'193px',
+								width: '193px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</a>
+								{record.classroom === null ?
+									<a style={{
+										"color": '#999999',
+										"text-align": "center"
+									}}>--</a>  : record.classroom === "" ?
+										<a style={{
+											"color": '#999999',
+											"text-align": "center"
+										}}>--</a> :
+										<a style={{
+											"color": '#07111B',
+											"text-align": "center"
+										}}>{record.classroom}</a>
+								}
         </span>
 								)
 							},
@@ -2102,14 +2886,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'submitstate',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'146px',
+								width: '146px',
 								render: (text, record) => (
 									<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center"
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center"
 						 }}>{record.submitstate}</a>
         </span>
@@ -2122,10 +2906,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'updatetime',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'228px',
+								width: '228px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+             	{record.updatetime==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}></a>
+								:
+								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							}
         </span>
 								),
 							},
@@ -2135,22 +2923,27 @@ class Studentshavecompletedthelist extends Component {
 								key: 'efficiencyscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'146px',
+								width: '146px',
 								render: (text, record) => (
 									<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.efficiencyscore}</a>
+                         {record.efficiencyscore === "--" ?
+													 <a style={{"color": '#999999',
+														 "text-align": "center",}}>--</a>
+													 :
+													 <a style={parseInt(record.efficiencyscore) > 90 ? {
+														 "color": '#DD1717',
+														 "text-align": "center",
+													 } : parseInt(record.efficiencyscore) <= 90 ? {
+														 "color": '#FF6800',
+														 "text-align": "center",
+													 } : parseInt(record.efficiencyscore) <= 60 ? {
+														 "color": '#747A7F',
+														 "text-align": "center",
+													 } : {
+														 "color": '#747A7F',
+														 "text-align": "center",
+													 }}>{record.efficiencyscore}</a>
+												 }
         </span>
 								)
 							}
@@ -2175,10 +2968,20 @@ class Studentshavecompletedthelist extends Component {
 								key: 'number',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'76px',
+								width: '76px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+              {record.number==="--"?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center",
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#07111B',
+									"text-align": "center",
+								}}>{record.number}</a>
+							}
         </span>
 								)
 							},
@@ -2187,11 +2990,16 @@ class Studentshavecompletedthelist extends Component {
 								dataIndex: 'name',
 								key: 'name',
 								align: 'center',
-								width:'149px',
+								width: '149px',
 								className: "edu-txt-center",
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+            {record.name==="--"?
+							<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							:
+							<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+						}
         </span>
 								)
 							},
@@ -2200,11 +3008,26 @@ class Studentshavecompletedthelist extends Component {
 								dataIndex: 'stduynumber',
 								key: 'stduynumber',
 								align: 'center',
-								width:'159px',
+								width: '159px',
 								className: "edu-txt-center",
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+             {record.stduynumber === null ?
+							 <a style={{
+								 "color": '#999999',
+								 "text-align": "center"
+							 }}>--</a>
+							 : record.stduynumber === "" ?
+								 <a style={{
+									 "color": '#999999',
+									 "text-align": "center"
+								 }}>--</a>
+								 :
+								 <a style={{
+									 "color": '#9A9A9A',
+									 "text-align": "center"
+								 }}>{record.stduynumber}</a>
+						 }
         </span>
 								),
 							},
@@ -2214,14 +3037,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'submitstate',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center"
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center"
 						 }}>{record.submitstate}</a>
         </span>
@@ -2234,10 +3057,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'updatetime',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'194px',
+								width: '194px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+           	{record.updatetime==="--"?
+							<a style={{"color": '#999999', "text-align": "center"}}></a>
+							:
+							<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+						}
         </span>
 								),
 							},
@@ -2247,22 +3074,27 @@ class Studentshavecompletedthelist extends Component {
 								key: 'efficiencyscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.efficiencyscore}</a>
+                             {record.efficiencyscore === "--" ?
+															 <a style={{"color": '#999999',
+																 "text-align": "center",}}>--</a>
+															 :
+															 <a style={parseInt(record.efficiencyscore) > 90 ? {
+																 "color": '#DD1717',
+																 "text-align": "center",
+															 } : parseInt(record.efficiencyscore) <= 90 ? {
+																 "color": '#FF6800',
+																 "text-align": "center",
+															 } : parseInt(record.efficiencyscore) <= 60 ? {
+																 "color": '#747A7F',
+																 "text-align": "center",
+															 } : {
+																 "color": '#747A7F',
+																 "text-align": "center",
+															 }}>{record.efficiencyscore}</a>
+														 }
         </span>
 								)
 							}
@@ -2271,7 +3103,7 @@ class Studentshavecompletedthelist extends Component {
 				}
 
 			} else {
-				   //已经评论
+				//已经评论
 				// response.data.course_groups.length
 				if (response.data.exercise_types.groups_count > 0) {
 					//显示分班
@@ -2292,10 +3124,20 @@ class Studentshavecompletedthelist extends Component {
 								key: 'number',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'96px',
+								width: '96px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+             {record.number==="--"?
+							 <a style={{
+								 "color": '#999999',
+								 "text-align": "center",
+							 }}>--</a>
+							 :
+							 <a style={{
+								 "color": '#07111B',
+								 "text-align": "center",
+							 }}>{record.number}</a>
+						 }
         </span>
 								)
 							},
@@ -2305,10 +3147,15 @@ class Studentshavecompletedthelist extends Component {
 								key: 'name',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'169px',
+								width: '169px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+              {record.name==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+							}
         </span>
 								)
 							},
@@ -2318,10 +3165,25 @@ class Studentshavecompletedthelist extends Component {
 								key: 'stduynumber',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'179px',
+								width: '179px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+              {record.stduynumber === null ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+								}}>--</a>
+								: record.stduynumber === "" ?
+									<a style={{
+										"color": '#999999',
+										"text-align": "center"
+									}}>--</a>
+									:
+									<a style={{
+										"color": '#9A9A9A',
+										"text-align": "center"
+									}}>{record.stduynumber}</a>
+							}
         </span>
 								),
 							},
@@ -2331,10 +3193,23 @@ class Studentshavecompletedthelist extends Component {
 								dataIndex: 'classroom',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'179px',
+								width: '179px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</a>
+             {record.classroom === null ?
+							 <a style={{
+								 "color": '#999999',
+								 "text-align": "center"
+							 }}>--</a>  : record.classroom === "" ?
+								 <a style={{
+									 "color": '#999999',
+									 "text-align": "center"
+								 }}>--</a> :
+								 <a style={{
+									 "color": '#07111B',
+									 "text-align": "center"
+								 }}>{record.classroom}</a>
+						 }
         </span>
 								)
 							},
@@ -2344,14 +3219,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'submitstate',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'132px',
+								width: '132px',
 								render: (text, record) => (
 									<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center"
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center"
 						 }}>{record.submitstate}</a>
         </span>
@@ -2364,10 +3239,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'updatetime',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'214px',
+								width: '214px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+              	{record.updatetime==="--"?
+									<a style={{"color": '#999999', "text-align": "center"}}></a>
+									:
+									<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+								}
         </span>
 								),
 							},
@@ -2377,22 +3256,27 @@ class Studentshavecompletedthelist extends Component {
 								key: 'efficiencyscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'132px',
+								width: '132px',
 								render: (text, record) => (
 									<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.efficiencyscore}</a>
+                             {record.efficiencyscore === "--" ?
+															 <a style={{"color": '#999999',
+																 "text-align": "center",}}>--</a>
+															 :
+															 <a style={parseInt(record.efficiencyscore) > 90 ? {
+																 "color": '#DD1717',
+																 "text-align": "center",
+															 } : parseInt(record.efficiencyscore) <= 90 ? {
+																 "color": '#FF6800',
+																 "text-align": "center",
+															 } : parseInt(record.efficiencyscore) <= 60 ? {
+																 "color": '#747A7F',
+																 "text-align": "center",
+															 } : {
+																 "color": '#747A7F',
+																 "text-align": "center",
+															 }}>{record.efficiencyscore}</a>
+														 }
         </span>
 								)
 							},
@@ -2402,11 +3286,17 @@ class Studentshavecompletedthelist extends Component {
 								key: 'finalscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'98px',
+								width: '98px',
 								render: (text, record) => (
 									<span>
-                      <a style={{"text-align": "center"}} className="color-blue"
+										{record.finalscore==="--"?
+											<a style={{"text-align": "center","color": '#999999'}}
+												>--</a>
+											:
+											<a style={{"text-align": "center"}} className="color-blue"
 												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+										}
+
                     </span>
 								)
 							},
@@ -2431,10 +3321,20 @@ class Studentshavecompletedthelist extends Component {
 								key: 'number',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'110px',
+								width: '110px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+             {record.number==="--"?
+							 <a style={{
+								 "color": '#999999',
+								 "text-align": "center",
+							 }}>--</a>
+							 :
+							 <a style={{
+								 "color": '#07111B',
+								 "text-align": "center",
+							 }}>{record.number}</a>
+						 }
         </span>
 								)
 							},
@@ -2444,10 +3344,15 @@ class Studentshavecompletedthelist extends Component {
 								key: 'name',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'228px',
+								width: '228px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+             {record.name==="--"?
+							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							 :
+							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+						 }
         </span>
 								)
 							},
@@ -2457,10 +3362,25 @@ class Studentshavecompletedthelist extends Component {
 								key: 'stduynumber',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'193px',
+								width: '193px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+           {record.stduynumber === null ?
+						 <a style={{
+							 "color": '#999999',
+							 "text-align": "center"
+						 }}>--</a>
+						 : record.stduynumber === "" ?
+							 <a style={{
+								 "color": '#999999',
+								 "text-align": "center"
+							 }}>--</a>
+							 :
+							 <a style={{
+								 "color": '#9A9A9A',
+								 "text-align": "center"
+							 }}>{record.stduynumber}</a>
+					 }
         </span>
 								),
 							},
@@ -2470,14 +3390,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'submitstate',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'146px',
+								width: '146px',
 								render: (text, record) => (
 									<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center"
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center"
 						 }}>{record.submitstate}</a>
         </span>
@@ -2490,10 +3410,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'updatetime',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'193px',
+								width: '193px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+             	{record.updatetime==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}></a>
+								:
+								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							}
         </span>
 								),
 							},
@@ -2503,22 +3427,27 @@ class Studentshavecompletedthelist extends Component {
 								key: 'efficiencyscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'183px',
+								width: '183px',
 								render: (text, record) => (
 									<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.efficiencyscore}</a>
+                            {record.efficiencyscore === "--" ?
+															<a style={{"color": '#999999',
+																"text-align": "center",}}>--</a>
+															:
+															<a style={parseInt(record.efficiencyscore) > 90 ? {
+																"color": '#DD1717',
+																"text-align": "center",
+															} : parseInt(record.efficiencyscore) <= 90 ? {
+																"color": '#FF6800',
+																"text-align": "center",
+															} : parseInt(record.efficiencyscore) <= 60 ? {
+																"color": '#747A7F',
+																"text-align": "center",
+															} : {
+																"color": '#747A7F',
+																"text-align": "center",
+															}}>{record.efficiencyscore}</a>
+														}
         </span>
 								)
 							},
@@ -2528,11 +3457,17 @@ class Studentshavecompletedthelist extends Component {
 								key: 'finalscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'146px',
+								width: '146px',
 								render: (text, record) => (
 									<span>
-                      <a style={{"text-align": "center"}} className="color-blue"
+										{record.finalscore==="--"?
+											<a style={{"text-align": "center","color": '#999999'}}
+											>--</a>
+											:
+											<a style={{"text-align": "center"}} className="color-blue"
 												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+										}
+
                     </span>
 								)
 							},
@@ -2546,7 +3481,7 @@ class Studentshavecompletedthelist extends Component {
 			//包括主观题
 			if (indexi === exercise_users.length) {
 				console.log("2548包含主观题不包含分班");
-				if (response.data.exercise_types.groups_count> 0){
+				if (response.data.exercise_types.groups_count > 0) {
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -2562,10 +3497,20 @@ class Studentshavecompletedthelist extends Component {
 								key: 'number',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'76px',
+								width: '76px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+              {record.number==="--"?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center",
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#07111B',
+									"text-align": "center",
+								}}>{record.number}</a>
+							}
         </span>
 								)
 							},
@@ -2575,10 +3520,15 @@ class Studentshavecompletedthelist extends Component {
 								key: 'name',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'149px',
+								width: '149px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+              {record.name==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+							}
         </span>
 								)
 							},
@@ -2588,10 +3538,25 @@ class Studentshavecompletedthelist extends Component {
 								key: 'stduynumber',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'159px',
+								width: '159px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+            {record.stduynumber === null ?
+							<a style={{
+								"color": '#999999',
+								"text-align": "center"
+							}}>--</a>
+							: record.stduynumber === "" ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#9A9A9A',
+									"text-align": "center"
+								}}>{record.stduynumber}</a>
+						}
         </span>
 								),
 							},
@@ -2603,7 +3568,20 @@ class Studentshavecompletedthelist extends Component {
 								className: "edu-txt-center",
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</a>
+              {record.classroom === null ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+								}}>--</a>  : record.classroom === "" ?
+									<a style={{
+										"color": '#999999',
+										"text-align": "center"
+									}}>--</a> :
+									<a style={{
+										"color": '#07111B',
+										"text-align": "center"
+									}}>{record.classroom}</a>
+							}
         </span>
 								)
 							},
@@ -2613,14 +3591,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'submitstate',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center"
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center"
 						 }}>{record.submitstate}</a>
         </span>
@@ -2633,23 +3611,31 @@ class Studentshavecompletedthelist extends Component {
 								key: 'updatetime',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'194px',
+								width: '194px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+            	{record.updatetime==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}></a>
+								:
+								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							}
         </span>
 								),
 							},
 							{
-								title: '客观题分',
+								title: '客观题得分',
 								dataIndex: 'completion',
 								key: 'completion',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+            {record.completion=== "--"?
+							<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							:
+							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+						}
         </span>
 								)
 							},
@@ -2659,10 +3645,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'levelscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'130px',
+								width: '130px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+           	{record.levelscore==="--"?
+							<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							:
+							<a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+						}
         </span>
 								)
 							},
@@ -2672,31 +3662,33 @@ class Studentshavecompletedthelist extends Component {
 								key: 'efficiencyscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.efficiencyscore}</a>
+                                {record.efficiencyscore === "--" ?
+																	<a style={{"color": '#999999',
+																		"text-align": "center",}}>--</a>
+																	:
+																	<a style={parseInt(record.efficiencyscore) > 90 ? {
+																		"color": '#DD1717',
+																		"text-align": "center",
+																	} : parseInt(record.efficiencyscore) <= 90 ? {
+																		"color": '#FF6800',
+																		"text-align": "center",
+																	} : parseInt(record.efficiencyscore) <= 60 ? {
+																		"color": '#747A7F',
+																		"text-align": "center",
+																	} : {
+																		"color": '#747A7F',
+																		"text-align": "center",
+																	}}>{record.efficiencyscore}</a>
+																}
         </span>
 								)
 							},
 						]
 					})
-				}else{
+				} else {
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -2712,10 +3704,20 @@ class Studentshavecompletedthelist extends Component {
 								key: 'number',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'76px',
+								width: '76px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+              {record.number==="--"?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center",
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#07111B',
+									"text-align": "center",
+								}}>{record.number}</a>
+							}
         </span>
 								)
 							},
@@ -2725,10 +3727,15 @@ class Studentshavecompletedthelist extends Component {
 								key: 'name',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'149px',
+								width: '149px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+             {record.name==="--"?
+							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							 :
+							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+						 }
         </span>
 								)
 							},
@@ -2738,10 +3745,25 @@ class Studentshavecompletedthelist extends Component {
 								key: 'stduynumber',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'159px',
+								width: '159px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+             {record.stduynumber === null ?
+							 <a style={{
+								 "color": '#999999',
+								 "text-align": "center"
+							 }}>--</a>
+							 : record.stduynumber === "" ?
+								 <a style={{
+									 "color": '#999999',
+									 "text-align": "center"
+								 }}>--</a>
+								 :
+								 <a style={{
+									 "color": '#9A9A9A',
+									 "text-align": "center"
+								 }}>{record.stduynumber}</a>
+						 }
         </span>
 								),
 							},
@@ -2751,14 +3773,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'submitstate',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center"
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center"
 						 }}>{record.submitstate}</a>
         </span>
@@ -2771,23 +3793,31 @@ class Studentshavecompletedthelist extends Component {
 								key: 'updatetime',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'194px',
+								width: '194px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+             	{record.updatetime==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}></a>
+								:
+								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							}
         </span>
 								),
 							},
 							{
-								title: '客观题分',
+								title: '客观题得分',
 								dataIndex: 'completion',
 								key: 'completion',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+             {record.completion=== "--"?
+							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							 :
+							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+						 }
         </span>
 								)
 							},
@@ -2797,10 +3827,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'levelscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'130px',
+								width: '130px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+             	{record.levelscore==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+							}
         </span>
 								)
 							},
@@ -2810,25 +3844,27 @@ class Studentshavecompletedthelist extends Component {
 								key: 'efficiencyscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.efficiencyscore}</a>
+                            {record.efficiencyscore === "--" ?
+															<a style={{"color": '#999999',
+																"text-align": "center",}}>--</a>
+															:
+															<a style={parseInt(record.efficiencyscore) > 90 ? {
+																"color": '#DD1717',
+																"text-align": "center",
+															} : parseInt(record.efficiencyscore) <= 90 ? {
+																"color": '#FF6800',
+																"text-align": "center",
+															} : parseInt(record.efficiencyscore) <= 60 ? {
+																"color": '#747A7F',
+																"text-align": "center",
+															} : {
+																"color": '#747A7F',
+																"text-align": "center",
+															}}>{record.efficiencyscore}</a>
+														}
         </span>
 								)
 							},
@@ -2837,7 +3873,7 @@ class Studentshavecompletedthelist extends Component {
 				}
 			} else {
 				console.log("2699包含主观题包含分班");
-				if (response.data.exercise_types.groups_count> 0) {
+				if (response.data.exercise_types.groups_count > 0) {
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -2854,10 +3890,20 @@ class Studentshavecompletedthelist extends Component {
 								key: 'number',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'76px',
+								width: '76px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+             {record.number==="--"?
+							 <a style={{
+								 "color": '#999999',
+								 "text-align": "center",
+							 }}>--</a>
+							 :
+							 <a style={{
+								 "color": '#07111B',
+								 "text-align": "center",
+							 }}>{record.number}</a>
+						 }
         </span>
 								)
 							},
@@ -2867,10 +3913,15 @@ class Studentshavecompletedthelist extends Component {
 								key: 'name',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'149px',
+								width: '149px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+             {record.name==="--"?
+							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							 :
+							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+						 }
         </span>
 								)
 							},
@@ -2880,10 +3931,25 @@ class Studentshavecompletedthelist extends Component {
 								key: 'stduynumber',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'159px',
+								width: '159px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+            {record.stduynumber === null ?
+							<a style={{
+								"color": '#999999',
+								"text-align": "center"
+							}}>--</a>
+							: record.stduynumber === "" ?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center"
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#9A9A9A',
+									"text-align": "center"
+								}}>{record.stduynumber}</a>
+						}
         </span>
 								),
 							},
@@ -2895,7 +3961,20 @@ class Studentshavecompletedthelist extends Component {
 								className: "edu-txt-center",
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</a>
+               {record.classroom === null ?
+								 <a style={{
+									 "color": '#999999',
+									 "text-align": "center"
+								 }}>--</a>  : record.classroom === "" ?
+									 <a style={{
+										 "color": '#999999',
+										 "text-align": "center"
+									 }}>--</a> :
+									 <a style={{
+										 "color": '#07111B',
+										 "text-align": "center"
+									 }}>{record.classroom}</a>
+							 }
         </span>
 								)
 							},
@@ -2905,14 +3984,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'submitstate',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center"
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center"
 						 }}>{record.submitstate}</a>
         </span>
@@ -2924,24 +4003,32 @@ class Studentshavecompletedthelist extends Component {
 								dataIndex: 'updatetime',
 								key: 'updatetime',
 								align: 'center',
-								width:'194px',
+								width: '194px',
 								className: "edu-txt-center",
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+            	{record.updatetime==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}></a>
+								:
+								<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+							}
         </span>
 								),
 							},
 							{
-								title: '客观题分',
+								title: '客观题得分',
 								dataIndex: 'completion',
 								key: 'completion',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+              {record.completion=== "--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+							}
         </span>
 								)
 							},
@@ -2951,10 +4038,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'levelscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'130px',
+								width: '130px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+             {record.levelscore==="--"?
+							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							 :
+							 <a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+						 }
         </span>
 								)
 							},
@@ -2964,22 +4055,27 @@ class Studentshavecompletedthelist extends Component {
 								key: 'efficiencyscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.efficiencyscore}</a>
+                      {record.efficiencyscore === "--" ?
+												<a style={{"color": '#999999',
+													"text-align": "center",}}>--</a>
+												:
+												<a style={parseInt(record.efficiencyscore) > 90 ? {
+													"color": '#DD1717',
+													"text-align": "center",
+												} : parseInt(record.efficiencyscore) <= 90 ? {
+													"color": '#FF6800',
+													"text-align": "center",
+												} : parseInt(record.efficiencyscore) <= 60 ? {
+													"color": '#747A7F',
+													"text-align": "center",
+												} : {
+													"color": '#747A7F',
+													"text-align": "center",
+												}}>{record.efficiencyscore}</a>
+											}
         </span>
 								)
 							},
@@ -2989,17 +4085,21 @@ class Studentshavecompletedthelist extends Component {
 								key: 'finalscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'78px',
+								width: '78px',
 								render: (text, record) => (
 									<span>
-                      <a style={{"text-align": "center"}} className="color-blue"
+										{record.finalscore==="--"?
+											<a style={{"text-align": "center","color": '#999999'}}>{record.finalscore}</a>
+											:
+											<a style={{"text-align": "center"}} className="color-blue"
 												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+										}
                     </span>
 								)
 							},
 						]
 					})
-				}else{
+				} else {
 					this.setState({
 						data: datalist,
 						teacherlist: teacherlist,
@@ -3016,10 +4116,20 @@ class Studentshavecompletedthelist extends Component {
 								key: 'number',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'76px',
+								width: '76px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+              {record.number==="--"?
+								<a style={{
+									"color": '#999999',
+									"text-align": "center",
+								}}>--</a>
+								:
+								<a style={{
+									"color": '#07111B',
+									"text-align": "center",
+								}}>{record.number}</a>
+							}
         </span>
 								)
 							},
@@ -3029,10 +4139,15 @@ class Studentshavecompletedthelist extends Component {
 								key: 'name',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'149px',
+								width: '149px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+              {record.name==="--"?
+								<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+								:
+								<a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+
+							}
         </span>
 								)
 							},
@@ -3042,10 +4157,25 @@ class Studentshavecompletedthelist extends Component {
 								key: 'stduynumber',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'159px',
+								width: '159px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
+             {record.stduynumber === null ?
+							 <a style={{
+								 "color": '#999999',
+								 "text-align": "center"
+							 }}>--</a>
+							 : record.stduynumber === "" ?
+								 <a style={{
+									 "color": '#999999',
+									 "text-align": "center"
+								 }}>--</a>
+								 :
+								 <a style={{
+									 "color": '#9A9A9A',
+									 "text-align": "center"
+								 }}>{record.stduynumber}</a>
+						 }
         </span>
 								),
 							},
@@ -3055,14 +4185,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'submitstate',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
              <a style={record.submitstate === "未提交" ? {
-							 "color": '#DD1717',
+							 "color": '#999999',
 							 "text-align": "center"
 						 } : record.submitstate === "已提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
+							 "color": '#29BD8B',
 							 "text-align": "center"
 						 }}>{record.submitstate}</a>
         </span>
@@ -3074,24 +4204,32 @@ class Studentshavecompletedthelist extends Component {
 								dataIndex: 'updatetime',
 								key: 'updatetime',
 								align: 'center',
-								width:'194px',
+								width: '194px',
 								className: "edu-txt-center",
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+             {record.updatetime==="--"?
+							 <a style={{"color": '#999999', "text-align": "center"}}></a>
+							 :
+							 <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+						 }
         </span>
 								),
 							},
 							{
-								title: '客观题分',
+								title: '客观题得分',
 								dataIndex: 'completion',
 								key: 'completion',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+             {record.completion=== "--"?
+							 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							 :
+							 <a style={{"color": '#07111B', "text-align": "center"}}>{record.completion}</a>
+						 }
         </span>
 								)
 							},
@@ -3101,10 +4239,14 @@ class Studentshavecompletedthelist extends Component {
 								key: 'levelscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'130px',
+								width: '130px',
 								render: (text, record) => (
 									<span>
-             <a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+            {record.levelscore==="--"?
+							<a style={{"color": '#999999', "text-align": "center"}}>--</a>
+							:
+							<a style={{"color": '#FF6800', "text-align": "center"}}>{record.levelscore}</a>
+						}
         </span>
 								)
 							},
@@ -3114,22 +4256,27 @@ class Studentshavecompletedthelist extends Component {
 								key: 'efficiencyscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'112px',
+								width: '112px',
 								render: (text, record) => (
 									<span>
-                            <a style={parseInt(record.efficiencyscore) > 90 ? {
-															"color": '#DD1717',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 90 ? {
-															"color": '#FF6800',
-															"text-align": "center",
-														} : parseInt(record.efficiencyscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center",
-														} : {
-															"color": '#747A7F',
-															"text-align": "center",
-														}}>{record.efficiencyscore}</a>
+                            {record.efficiencyscore === "--" ?
+															<a style={{"color": '#999999',
+																"text-align": "center",}}>--</a>
+															:
+															<a style={parseInt(record.efficiencyscore) > 90 ? {
+																"color": '#DD1717',
+																"text-align": "center",
+															} : parseInt(record.efficiencyscore) <= 90 ? {
+																"color": '#FF6800',
+																"text-align": "center",
+															} : parseInt(record.efficiencyscore) <= 60 ? {
+																"color": '#747A7F',
+																"text-align": "center",
+															} : {
+																"color": '#747A7F',
+																"text-align": "center",
+															}}>{record.efficiencyscore}</a>
+														}
         </span>
 								)
 							},
@@ -3139,11 +4286,16 @@ class Studentshavecompletedthelist extends Component {
 								key: 'finalscore',
 								align: 'center',
 								className: "edu-txt-center",
-								width:'78px',
+								width: '78px',
 								render: (text, record) => (
 									<span>
-                      <a style={{"text-align": "center"}} className="color-blue"
+										{record.finalscore==="--"?
+											<a style={{"text-align": "center","color": '#999999'}}>{record.finalscore}</a>
+											:
+											<a style={{"text-align": "center"}} className="color-blue"
 												 href={`/courses/${this.props.match.params.coursesId}/exercises/${this.props.match.params.Id}/users/${record.myid}`}>{record.finalscore}</a>
+										}
+
                     </span>
 								)
 							},
@@ -3154,7 +4306,7 @@ class Studentshavecompletedthelist extends Component {
 			}
 		}
 		this.setState({
-			loadingstate:false
+			loadingstate: false
 		})
 	}
 
@@ -3201,13 +4353,13 @@ class Studentshavecompletedthelist extends Component {
 	}
 
 	notlimited = () => {
-		if(this.state.loadingstate === false){
+		if (this.state.loadingstate === false) {
 			this.setState({
 				unlimited: 0,
 				course_groupyslsthree: undefined,
-				loadingstate:true,
+				loadingstate: true,
 			})
-		}else{
+		} else {
 			this.setState({
 				unlimited: 0,
 				course_groupyslsthree: undefined,
@@ -3225,13 +4377,13 @@ class Studentshavecompletedthelist extends Component {
 	//     this.Searchdatasys(this.state.order, null, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
 	// }
 	notlimiteds = () => {
-		if(this.state.loadingstate === false) {
+		if (this.state.loadingstate === false) {
 			this.setState({
 				unlimiteds: 0,
 				course_groupyslstwo: undefined,
 				loadingstate: true,
 			})
-		}else{
+		} else {
 			this.setState({
 				unlimiteds: 0,
 				course_groupyslstwo: undefined,
@@ -3244,13 +4396,13 @@ class Studentshavecompletedthelist extends Component {
 		// console.log(checkedValues)
 		if (JSON.stringify(checkedValues) === "[]") {
 			// console.log(checkedValues);
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
 				})
-			}else{
+			} else {
 				this.setState({
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
@@ -3259,13 +4411,13 @@ class Studentshavecompletedthelist extends Component {
 
 			this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
 		} else if (checkedValues.length === data.length) {
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
 				})
-			}else{
+			} else {
 				this.setState({
 					course_groupyslstwo: undefined,
 					unlimiteds: 0,
@@ -3276,13 +4428,13 @@ class Studentshavecompletedthelist extends Component {
 		} else {
 			// console.log(checkedValues);
 			this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
 					course_groupyslstwo: checkedValues,
 					unlimiteds: 1
 				})
-			}else{
+			} else {
 				this.setState({
 					course_groupyslstwo: checkedValues,
 					unlimiteds: 1
@@ -3317,13 +4469,13 @@ class Studentshavecompletedthelist extends Component {
 
 		if (JSON.stringify(checkedValues) === "[]") {
 			// console.log(checkedValues);
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					unlimited: 0,
 					course_groupyslsthree: undefined,
-					loadingstate:true,
+					loadingstate: true,
 				})
-			}else{
+			} else {
 				this.setState({
 					unlimited: 0,
 					course_groupyslsthree: undefined,
@@ -3332,13 +4484,13 @@ class Studentshavecompletedthelist extends Component {
 
 			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
 		} else if (checkedValues.length === data.length) {
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					unlimited: 0,
 					course_groupyslsthree: undefined,
-					loadingstate:true,
+					loadingstate: true,
 				})
-			}else{
+			} else {
 				this.setState({
 					unlimited: 0,
 					course_groupyslsthree: undefined,
@@ -3348,13 +4500,13 @@ class Studentshavecompletedthelist extends Component {
 			this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, null);
 		} else {
 			// console.log(checkedValues);
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					unlimited: 1,
-					loadingstate:true,
+					loadingstate: true,
 					course_groupyslsthree: checkedValues,
 				})
-			}else {
+			} else {
 				this.setState({
 					unlimited: 1,
 					course_groupyslsthree: checkedValues,
@@ -3367,14 +4519,14 @@ class Studentshavecompletedthelist extends Component {
 	}
 	funtaskstatustwos = () => {
 
-		if(this.state.loadingstate === false) {
+		if (this.state.loadingstate === false) {
 			this.setState({
 				unlimitedtwo: 0,
 				checkedValuesineinfo: undefined,
 				course_groupysls: undefined,
-				loadingstate:true,
+				loadingstate: true,
 			})
-		}else{
+		} else {
 			this.setState({
 				unlimitedtwo: 0,
 				checkedValuesineinfo: undefined,
@@ -3390,13 +4542,13 @@ class Studentshavecompletedthelist extends Component {
 		// console.log(checkedValues);
 		if (JSON.stringify(checkedValues) === "[]") {
 			// console.log(checkedValues);
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
-					loadingstate:true,
+					loadingstate: true,
 				})
-			}else{
+			} else {
 				this.setState({
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
@@ -3405,13 +4557,13 @@ class Studentshavecompletedthelist extends Component {
 
 			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, null, null)
 		} else if (checkedValues.length === data.length) {
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
-					loadingstate:true,
+					loadingstate: true,
 				})
-			}else{
+			} else {
 				this.setState({
 					course_groupysls: undefined,
 					unlimitedtwo: 0,
@@ -3421,14 +4573,14 @@ class Studentshavecompletedthelist extends Component {
 			this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, null, null)
 		} else {
 			// console.log(checkedValues);
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					checkedValuesineinfo: checkedValues,
 					course_groupysls: checkedValues,
 					unlimitedtwo: 1,
-					loadingstate:true,
+					loadingstate: true,
 				})
-			}else{
+			} else {
 				this.setState({
 					checkedValuesineinfo: checkedValues,
 					course_groupysls: checkedValues,
@@ -3451,7 +4603,7 @@ class Studentshavecompletedthelist extends Component {
 			//     message.error("请输入姓名或学号搜索");
 			//     return
 			// }
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					loadingstate: true,
 				})
@@ -3481,7 +4633,7 @@ class Studentshavecompletedthelist extends Component {
 		//        message.error("请输入姓名或学号搜索");
 		//        return
 		//    }
-		if(this.state.loadingstate === false) {
+		if (this.state.loadingstate === false) {
 			this.setState({
 				loadingstate: true,
 			})
@@ -3499,12 +4651,12 @@ class Studentshavecompletedthelist extends Component {
 		if (e === "end_at") {
 			// 时间
 			// 时间排序是从小到大
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					order: "end_at",
-					loadingstate:true,
+					loadingstate: true,
 				})
-			}else{
+			} else {
 				this.setState({
 					order: "end_at",
 				})
@@ -3516,12 +4668,12 @@ class Studentshavecompletedthelist extends Component {
 		if (e === "score") {
 			// 成绩
 			//成绩排序是从大到小
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					order: "score",
-					loadingstate:true,
+					loadingstate: true,
 				})
-			}else{
+			} else {
 				this.setState({
 					order: "score",
 				})
@@ -3534,12 +4686,12 @@ class Studentshavecompletedthelist extends Component {
 		if (e === "student_id") {
 			//学号
 			//学号排序是从大到小
-			if(this.state.loadingstate === false) {
+			if (this.state.loadingstate === false) {
 				this.setState({
 					order: "student_id",
-					loadingstate:true,
+					loadingstate: true,
 				})
-			}else{
+			} else {
 				this.setState({
 					order: "student_id",
 				})
@@ -3563,7 +4715,7 @@ class Studentshavecompletedthelist extends Component {
 				(
 					<div style={{
 						"margin": "0 auto",
-						" min-width": " 1200px",
+						" min-width": " 1250px",
 					}}>
 						<div className="edu-back-white">
 							<ul className="clearfix" style={{padding: '10px 30px 10px 30px'}}>
@@ -3689,7 +4841,8 @@ class Studentshavecompletedthelist extends Component {
 							<div id="graduation_work_list" style={{padding: '0px 30px 10px 30px'}}>
 								<div className="clearfix">
                                 <span
-																	className="fl color-grey-6 font-12" ><span style={{"color": '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.total_users}</span><span
+																	className="fl color-grey-6 font-12"><span
+																	style={{"color": '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.total_users}</span><span
 																	className="color-orange-tip"></span>个检索结果（{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_all_users}学生） </span>
 
 									<div className="fr color-grey-6 edu-menu-panel">
@@ -3699,9 +4852,12 @@ class Studentshavecompletedthelist extends Component {
 													{order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
 												<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
 												<ul className="edu-position-hide undis mt10">
-													<li> <a  onClick={(e) => this.funordersy("end_at")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>提交时间</a></li>
-													<li> <a  onClick={(e) => this.funordersy("score")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
-													<li> <a  onClick={(e) => this.funordersy("student_id")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
+													<li><a onClick={(e) => this.funordersy("end_at")} data-remote="true"
+																 className="color-grey-6 font-12" style={{"text-align": "center "}}>提交时间</a></li>
+													<li><a onClick={(e) => this.funordersy("score")} data-remote="true"
+																 className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
+													<li><a onClick={(e) => this.funordersy("student_id")} data-remote="true"
+																 className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
 												</ul>
 											</li>
 										</ul>
@@ -3768,7 +4924,7 @@ class Studentshavecompletedthelist extends Component {
 
 									<div className="edu-back-white" id="graduation_work_list"
 											 style={{
-											 	  padding: '0px 30px 10px 30px',
+												 padding: '0px 30px 10px 30px',
 												 "height": "50px",
 												 "margin-bottom": "10px"
 											 }}>
@@ -3781,8 +4937,10 @@ class Studentshavecompletedthelist extends Component {
                                   <span
 																		className="ml10"></span><span
 																style={{"color": "#666666"}}> {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.unanswer_users}未交</span>
-																{ Teacherliststudentlist&&Teacherliststudentlist.exercise_types.exercise_end_time==="--"?"":<span className="ml20" style={{"color": "#9A9A9A"}}>     剩余提交时间：</span>}
-																{ Teacherliststudentlist&&Teacherliststudentlist.exercise_types.exercise_end_time==="--"?"":<span style={{"color": '#FF6800'}}>
+																{Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" :
+																	<span className="ml20" style={{"color": "#9A9A9A"}}>     剩余提交时间：</span>}
+																{Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" :
+																	<span style={{"color": '#FF6800'}}>
 																		{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}
 																	</span>}
                                </span>
@@ -3881,8 +5039,11 @@ class Studentshavecompletedthelist extends Component {
 																style={{"color": "#666666"}}>已交</span><span
 																className="ml10"></span> <span
 																style={{"color": "#666666"}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.unanswer_users}未交</span>
-																{ Teacherliststudentlist&&Teacherliststudentlist.exercise_types.exercise_end_time==="--"?"":<span className="ml20" style={{"color": "#9A9A9A"}}> 剩余提交时间：</span>}
-																{ Teacherliststudentlist&&Teacherliststudentlist.exercise_types.exercise_end_time==="--"?"":<span style={{"color": '#FF6800'}}> {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}</span>}
+																{Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" :
+																	<span className="ml20" style={{"color": "#9A9A9A"}}> 剩余提交时间：</span>}
+																{Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" :
+																	<span
+																		style={{"color": '#FF6800'}}> {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}</span>}
 																	</span>
 													<div className="fr color-grey-6 edu-menu-panel">
 														<ul>
@@ -3891,9 +5052,15 @@ class Studentshavecompletedthelist extends Component {
 																	{order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
 																<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
 																<ul className="edu-position-hide undis mt10">
-																	<li> <a  onClick={(e) => this.funorder("end_at")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>提交时间</a></li>
-																	<li> <a  onClick={(e) => this.funorder("score")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
-																	<li> <a  onClick={(e) => this.funorder("student_id")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
+																	<li><a onClick={(e) => this.funorder("end_at")} data-remote="true"
+																				 className="color-grey-6 font-12" style={{"text-align": "center "}}>提交时间</a>
+																	</li>
+																	<li><a onClick={(e) => this.funorder("score")} data-remote="true"
+																				 className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a>
+																	</li>
+																	<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"
+																				 className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a>
+																	</li>
 																</ul>
 															</li>
 														</ul>
@@ -3945,4 +5112,7 @@ class Studentshavecompletedthelist extends Component {
 
 }
 
+// subjective 主要是用于判断答题列表页是否存在 主观题 一栏的
+// 客观题没有判断。当主观题存在时，就会有客观题出现，否则只有总成绩
+// 当subjective 等于1时，就出现3列，客观题，主观题，最终成绩。当subjective等于0时，你就只出现最终成绩一列就行了
 export default Studentshavecompletedthelist;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 818c882e7..aaff6e4a8 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -159,7 +159,7 @@ class Testpapersettinghomepage extends Component{
 
         return(
             <div className="newMain clearfix ">
-                <div className={"educontent mb20"}>
+                <div className={"educontent mb20"} style={{width:"1250px"}}>
 									{/* 公用的提示弹框 */}
 									{this.state.Modalstype===true?<Modals
 										modalsType={this.state.Modalstype}
@@ -177,7 +177,7 @@ class Testpapersettinghomepage extends Component{
                         callback={this.callback}
                     />:""}
 
-                    <div className="educontent mb20">
+                    <div className="educontent mb20" style={{width:"1250px"}}>
                         <p className="clearfix mb20 mt10">
                             <ActionBtn className=" btn colorgrey fl hovercolorblue "  to={`/courses/${this.props.match.params.coursesId}/students}`}>{this.props.coursedata.name}</ActionBtn>
                             <span className="color-grey-9 fl ml3 mr3">&gt;</span>
@@ -195,7 +195,7 @@ class Testpapersettinghomepage extends Component{
                         `}
                     </style>
 
-                    <div className="educontent">
+                    <div className="educontent" style={{width:"1250px"}}>
                         <p className=" fl color-black  summaryname ">
                             {Commonheadofthetestpaper === undefined?"":Commonheadofthetestpaper.exercise_name}
                         </p>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 6995db1ba..8fc4404fa 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -63,7 +63,7 @@ class Listofworks extends Component {
 			page: 1,
 			limit: 20,
 			loadingstate: true,
-			order: undefined,
+			order: "updated_at",
 			search: null,
 			task_status: [],
 			course_group_info: [],
@@ -100,10 +100,9 @@ class Listofworks extends Component {
 					dataIndex: 'number',
 					key: 'number',
 					align: 'center',
-					width:'96px',
+					className:'font-14',
 					render: (text, record) => (
-						<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.number}
         </span>
 					)
 				},
@@ -112,11 +111,9 @@ class Listofworks extends Component {
 					dataIndex: 'name',
 					key: 'name',
 					align: 'center',
-					Width:'147px',
+					className:'font-14',
 					render: (text, record) => (
-						<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-        </span>
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
 					)
 				},
 				{
@@ -124,13 +121,12 @@ class Listofworks extends Component {
 					dataIndex: 'stduynumber',
 					key: 'stduynumber',
 					align: 'center',
-					width:'200px',
+					className:'font-14',
 					render: (text, record) => (
-						<span>
-             <a style={{
+						<span style={{
 							 "color": '#9A9A9A',
 							 "text-align": "center"
-						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}
         </span>
 					),
 				},
@@ -139,10 +135,10 @@ class Listofworks extends Component {
 					key: 'classroom',
 					dataIndex: 'classroom',
 					align: 'center',
+					className:'font-14',
+					width:'288px',
 					render: (text, record) => (
-						<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</a>
-        </span>
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
 					)
 				},
 				{
@@ -150,15 +146,15 @@ class Listofworks extends Component {
 					dataIndex: 'submitstate',
 					key: 'submitstate',
 					align: 'center',
+					className:'font-14',
 					render: (text, record) => (
-						<span>
-             <a style={record.submitstate === "延时提交" ? {
+						<span style={record.submitstate === "延时提交" ? {
 							 "color": '#DD1717',
 							 "text-align": "center"
 						 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
 							 "color": '#747A7F',
 							 "text-align": "center"
-						 }}>{record.submitstate}</a>
+						 }}>{record.submitstate}
         </span>
 					)
 
@@ -168,10 +164,9 @@ class Listofworks extends Component {
 					dataIndex: 'updatetime',
 					key: 'updatetime',
 					align: 'center',
+					className:'font-14',
 					render: (text, record) => (
-						<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-        </span>
+						<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
 					),
 				},
 				{
@@ -179,13 +174,14 @@ class Listofworks extends Component {
 					dataIndex: 'completion',
 					key: 'completion',
 					align: 'center',
+					className:'font-14',
 					render: (text, record) => (
 						<span>
 
 										<Tooltip  placement="bottom" title={<div>
 											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
 										</div>}>
-											<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+											<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
 										</Tooltip>
 
         </span>
@@ -196,9 +192,10 @@ class Listofworks extends Component {
 					dataIndex: 'levelscore',
 					key: 'levelscore',
 					align: 'center',
+					className:'font-14',
 					render: (text, record) => (
 						<span>
-       <a style={parseInt(record.levelscore) <= 60 ? {
+       	<span style={parseInt(record.levelscore) <= 60 ? {
 				 "color": '#747A7F',
 				 "text-align": "center"
 			 } : parseInt(record.levelscore) < 90 ? {
@@ -207,7 +204,7 @@ class Listofworks extends Component {
 			 } : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
 				 "color": '#747A7F',
 				 "text-align": "center"
-			 }}>{record.levelscore}</a>
+			 }}>{record.levelscore}</span>
         </span>
 					)
 				},
@@ -216,6 +213,7 @@ class Listofworks extends Component {
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
+					className:'font-14',
 					render: (text, record) => (
 						<span>
             {
@@ -224,18 +222,18 @@ class Listofworks extends Component {
 										<Tooltip placement="bottom" title={<div>
 											<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
 										</div>}>
-											<a style={{color:"#9A9A9A"}}>
+											<span style={{color:"#9A9A9A"}}>
 												--
-											</a>
+											</span>
 										</Tooltip>
 										:
 										record.submitstate==="延时提交"?
 											<Tooltip placement="bottom" title={<div>
 												<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
 											</div>}>
-												<a style={{color:"#9A9A9A"}}>
+												<span style={{color:"#9A9A9A"}}>
 													--
-												</a>
+												</span>
 											</Tooltip>
 											:
 											<a style={{color:"#9A9A9A"}}>
@@ -243,7 +241,7 @@ class Listofworks extends Component {
 											</a>
 								)
 								:
-								<a style={parseInt(record.efficiencyscore) <= 60 ? {
+								<span style={parseInt(record.efficiencyscore) <= 60 ? {
 									"color": '#747A7F',
 									"text-align": "center"
 								} : parseInt(record.efficiencyscore) < 90 ? {
@@ -252,7 +250,7 @@ class Listofworks extends Component {
 								} : parseInt(record.efficiencyscore) >= 90 ? {
 									"color": '#DD1717',
 									"text-align": "center"
-								} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</a>
+								} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</span>
 						}
 
         </span>
@@ -263,6 +261,7 @@ class Listofworks extends Component {
 					dataIndex: 'finalscore',
 					key: 'finalscore',
 					align: 'center',
+					className:'font-14',
 					render: (text, record) => (
 						<span>
 									{
@@ -273,13 +272,13 @@ class Listofworks extends Component {
 											</div>}>
 												{
 													record.finalscore&&record.finalscore==="--"?
-														<a style=
+														<span style=
 																 {{
 																	 "color": '#9A9A9A',
 																	 "text-align": "center"
-																 }}>{record.finalscore}</a>
+																 }}>{record.finalscore}</span>
 														:
-														<a style={parseInt(record.finalscore) <= 60 ? {
+														<span style={parseInt(record.finalscore) <= 60 ? {
 															"color": '#747A7F',
 															"text-align": "center"
 														} : parseInt(record.finalscore) < 90 ? {
@@ -288,7 +287,7 @@ class Listofworks extends Component {
 														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
 															"color": '#747A7F',
 															"text-align": "center"
-														}}>{record.finalscore}</a>
+														}}>{record.finalscore}</span>
 												}
 											</Tooltip>
 											:
@@ -301,13 +300,13 @@ class Listofworks extends Component {
 											</div>}>
 												{
 												record.finalscore&&record.finalscore==="--"?
-												<a style=
+													<span style=
 														 {{
 															 "color": '#9A9A9A',
 															 "text-align": "center"
-														 }}>{record.finalscore}</a>
+														 }}>{record.finalscore}</span>
 												:
-												<a style={parseInt(record.finalscore) <= 60 ? {
+													<span style={parseInt(record.finalscore) <= 60 ? {
 													"color": '#747A7F',
 													"text-align": "center"
 												} : parseInt(record.finalscore) < 90 ? {
@@ -316,7 +315,7 @@ class Listofworks extends Component {
 												} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
 													"color": '#747A7F',
 													"text-align": "center"
-												}}>{record.finalscore}</a>
+												}}>{record.finalscore}</span>
 												}
 											</Tooltip>
 
@@ -330,7 +329,7 @@ class Listofworks extends Component {
 					key: 'operating',
 					display: 'block',
 					align: 'center',
-					width:'93px',
+					className:'font-14',
 					render: (text, record) => (
 						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
 							<span>
@@ -338,11 +337,263 @@ class Listofworks extends Component {
 									<div>直接调整最终成绩的分数</div>
 							   	<div>其它评分全部作废</div>
 							</div>}>
-                        <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
+                       <span style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</span>
 								</Tooltip>
-                       <a style={{"text-align": "center"}} className="color-blue"
-													onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+                       <span style={{"text-align": "center"}} className="color-blue"
+													onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
+        </span>
+					)
+				},
+			],
+			columnss: [
+				{
+					title: '序号',
+					dataIndex: 'number',
+					key: 'number',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.number}
+        </span>
+					)
+				},
+				{
+					title: '姓名',
+					dataIndex: 'name',
+					key: 'name',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
+					)
+				},
+				{
+					title: '学号',
+					dataIndex: 'stduynumber',
+					key: 'stduynumber',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{
+							"color": '#9A9A9A',
+							"text-align": "center"
+						}}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}
+        </span>
+					),
+				},
+				{
+					title: '分班',
+					key: 'classroom',
+					dataIndex: 'classroom',
+					align: 'center',
+					className:'font-14',
+					width:'288px',
+					render: (text, record) => (
+						<span style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
+					)
+				},
+				{
+					title: '提交状态',
+					dataIndex: 'submitstate',
+					key: 'submitstate',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={record.submitstate === "延时提交" ? {
+							"color": '#DD1717',
+							"text-align": "center"
+						} : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+							"color": '#747A7F',
+							"text-align": "center"
+						}}>{record.submitstate}
+        </span>
+					)
+
+				},
+				{
+					title: '更新时间',
+					dataIndex: 'updatetime',
+					key: 'updatetime',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</span>
+					),
+				},
+				{
+					title: '完成情况',
+					dataIndex: 'completion',
+					key: 'completion',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+
+										<Tooltip  placement="bottom" title={<div>
+											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+										</div>}>
+											<span style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count} </span>
+										</Tooltip>
+
+        </span>
+					)
+				},
+				{
+					title: '关卡得分',
+					dataIndex: 'levelscore',
+					key: 'levelscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+       	<span style={parseInt(record.levelscore) <= 60 ? {
+					"color": '#747A7F',
+					"text-align": "center"
+				} : parseInt(record.levelscore) < 90 ? {
+					"color": '#FF6800',
+					"text-align": "center"
+				} : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+					"color": '#747A7F',
+					"text-align": "center"
+				}}>{record.levelscore}</span>
+        </span>
+					)
+				},
+				{
+					title: '效率分',
+					dataIndex: 'efficiencyscore',
+					key: 'efficiencyscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+            {
+							record.efficiencyscore&& record.efficiencyscore=== "--"?(
+									record.submitstate==="按时提交"?
+										<Tooltip placement="bottom" title={<div>
+											<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
+										</div>}>
+											<span style={{color:"#9A9A9A"}}>
+												--
+											</span>
+										</Tooltip>
+										:
+										record.submitstate==="延时提交"?
+											<Tooltip placement="bottom" title={<div>
+												<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
+											</div>}>
+												<span style={{color:"#9A9A9A"}}>
+													--
+												</span>
+											</Tooltip>
+											:
+											<a style={{color:"#9A9A9A"}}>
+												--
+											</a>
+								)
+								:
+								<span style={parseInt(record.efficiencyscore) <= 60 ? {
+									"color": '#747A7F',
+									"text-align": "center"
+								} : parseInt(record.efficiencyscore) < 90 ? {
+									"color": '#FF6800',
+									"text-align": "center"
+								} : parseInt(record.efficiencyscore) >= 90 ? {
+									"color": '#DD1717',
+									"text-align": "center"
+								} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</span>
+						}
+
+        </span>
+					)
+				},
+				{
+					title: '最终成绩',
+					dataIndex: 'finalscore',
+					key: 'finalscore',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						<span>
+									{
+										record.ultimate_score=== true?
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<span style=
+																		{{
+																			"color": '#9A9A9A',
+																			"text-align": "center"
+																		}}>{record.finalscore}</span>
+														:
+														<span style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</span>
+												}
+											</Tooltip>
+											:
+											<Tooltip placement="bottom" title={<div>
+												<div>{record.user_name}{record.user_login}</div>
+												<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+												<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+												<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+												<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+											</div>}>
+												{
+													record.finalscore&&record.finalscore==="--"?
+														<span style=
+																		{{
+																			"color": '#9A9A9A',
+																			"text-align": "center"
+																		}}>{record.finalscore}</span>
+														:
+														<span style={parseInt(record.finalscore) <= 60 ? {
+															"color": '#747A7F',
+															"text-align": "center"
+														} : parseInt(record.finalscore) < 90 ? {
+															"color": '#FF6800',
+															"text-align": "center"
+														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+															"color": '#747A7F',
+															"text-align": "center"
+														}}>{record.finalscore}</span>
+												}
+											</Tooltip>
+
+									}
+               </span>
+					)
+				},
+				{
+					title: '操作',
+					dataIndex: 'operating',
+					key: 'operating',
+					display: 'block',
+					align: 'center',
+					className:'font-14',
+					render: (text, record) => (
+						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
+							<span>
+								<Tooltip placement="bottom" title={<div>
+									<div>直接调整最终成绩的分数</div>
+									<div>其它评分全部作废</div>
+								</div>}>
+                       <span style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+														 onClick={() => this.Viewstudenttraininginformations(record)}>调分</span>
+								</Tooltip>
+                       <span style={{"text-align": "center"}} className="color-blue"
+														 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
         </span>
 					)
 				},
@@ -385,8 +636,8 @@ class Listofworks extends Component {
 		// course_group:分班情况 [232, 231]， []:不限（空数组）
 		var data = {
 			search: "",
-			order: "desc",
-			b_order: "asc",
+			order: this.state.order,
+			b_order: "desc",
 			work_status: "",
 			course_group: "",
 			page:1,
@@ -465,7 +716,6 @@ class Listofworks extends Component {
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
 				})
-
 				this.seacthdata();
 			}
 
@@ -532,625 +782,1132 @@ class Listofworks extends Component {
 				current: this.state.page,
 			}
 			if (this.state.work_efficiency === false) {
-				if(JSON.stringify(this.state.course_group_info) === "[]" ? "" : this.state.course_group_info === undefined ? "" :this.state.course_group_info === null){
-					columns = [
-						{
-							title: '序号',
-							dataIndex: 'number',
-							key: 'number',
-							align: 'center',
-							width:'96px',
-							render: (text, record) => (
-								<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
-        </span>
-							)
-						},
-						{
-							title: '姓名',
-							dataIndex: 'name',
-							key: 'name',
-							align: 'center',
-							width:'147px',
-							render: (text, record) => (
-								<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-        </span>
-							)
-						},
-						{
-							title: '学号',
-							dataIndex: 'stduynumber',
-							key: 'stduynumber',
-							align: 'center',
-							width:'200px',
-							render: (text, record) => (
-								<span>
-             <a style={{
-							 "color": '#9A9A9A',
-							 "text-align": "center"
-						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
-        </span>
-							),
-						},
-						{
-							title: '提交状态',
-							dataIndex: 'submitstate',
-							key: 'submitstate',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-             <a style={record.submitstate === "延时提交" ? {
-							 "color": '#DD1717',
-							 "text-align": "center"
-						 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-							)
-
-						},
-						{
-							title: '更新时间',
-							dataIndex: 'updatetime',
-							key: 'updatetime',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-										<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-        </span>
-							),
-						},
-						{
-							title: '完成情况',
-							dataIndex: 'completion',
-							key: 'completion',
-							align: 'center',
-
-							render: (text, record) => (
-								<span>
-
-										<Tooltip placement="bottom" title={<div>
-											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
-										</div>}>
-											<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
-										</Tooltip>
-
-        </span>
-							)
-						},
-						{
-							title: '最终成绩',
-							dataIndex: 'finalscore',
-							key: 'finalscore',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-									{
-										record.ultimate_score=== true?
-											<Tooltip placement="bottom" title={<div>
-												<div>{record.user_name}{record.user_login}</div>
-												<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
-											</div>}>
-												{
-													record.finalscore&&record.finalscore==="--"?
-														<a style=
-																 {{
-																	 "color": '#9A9A9A',
-																	 "text-align": "center"
-																 }}>{record.finalscore}</a>
-														:
-														<a style={parseInt(record.finalscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center"
-														} : parseInt(record.finalscore) < 90 ? {
-															"color": '#FF6800',
-															"text-align": "center"
-														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-															"color": '#747A7F',
-															"text-align": "center"
-														}}>{record.finalscore}</a>
-												}
-											</Tooltip>
-											:
-											<Tooltip placement="bottom" title={<div>
-												<div>{record.user_name}{record.user_login}</div>
-												<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
-												<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
-												<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
-												<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
-											</div>}>
-												{
-													record.finalscore&&record.finalscore==="--"?
-														<a style=
-																 {{
-																	 "color": '#9A9A9A',
-																	 "text-align": "center"
-																 }}>{record.finalscore}</a>
-														:
-														<a style={parseInt(record.finalscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center"
-														} : parseInt(record.finalscore) < 90 ? {
-															"color": '#FF6800',
-															"text-align": "center"
-														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-															"color": '#747A7F',
-															"text-align": "center"
-														}}>{record.finalscore}</a>
-												}
-											</Tooltip>
-
-									}
-               </span>
-							)
-						},
-						{
-							title: '操作',
-							dataIndex: 'operating',
-							key: 'operating',
-							display: 'block',
-							align: 'center',
-							width:'96px',
-							render: (text, record) => (
-								record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
-									<span>
-										<Tooltip placement="bottom" title={<div>
-											<div>直接调整最终成绩的分数</div>
-											<div>其它评分全部作废</div>
-										</div>}>
-                        <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
-										</Tooltip>
-                        <a style={{"display": "block", "text-align": "center"}} className="color-blue"
-													 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
-                </span>
-							)
-						},
-					]
-
+				if(JSON.stringify(this.state.course_group_info) === "[]"|| this.state.course_group_info === undefined||this.state.course_group_info === null){
+					//这里没有分班 没有 关卡得分 没有效率分
+				{/*	columns = [*/}
+				{/*		{*/}
+				{/*			title: '序号',*/}
+				{/*			dataIndex: 'number',*/}
+				// 			key: 'number',
+				// 			align: 'center',
+				// 			fixed: 'left',
+				// 			width:'100px',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+        //      <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+        // </span>
+				// 			)
+				// 		},
+				// 		{
+				// 			title: '姓名',
+				// 			dataIndex: 'name',
+				// 			key: 'name',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+        //      <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+        // </span>
+				// 			)
+				// 		},
+				// 		{
+				// 			title: '学号',
+				// 			dataIndex: 'stduynumber',
+				// 			key: 'stduynumber',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+        //      <a style={{
+				// 			 "color": '#9A9A9A',
+				// 			 "text-align": "center"
+				// 		 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+        // </span>
+				// 			),
+				// 		},
+				// 		{
+				// 			title: '提交状态',
+				// 			dataIndex: 'submitstate',
+				// 			key: 'submitstate',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+        //      <a style={record.submitstate === "延时提交" ? {
+				// 			 "color": '#DD1717',
+				// 			 "text-align": "center"
+				// 		 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+				// 			 "color": '#747A7F',
+				// 			 "text-align": "center"
+				// 		 }}>{record.submitstate}</a>
+        // </span>
+				// 			)
+				//
+				// 		},
+				// 		{
+				// 			title: '更新时间',
+				// 			dataIndex: 'updatetime',
+				// 			key: 'updatetime',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+				// 						<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+        // </span>
+				// 			),
+				// 		},
+				// 		{
+				// 			title: '完成情况',
+				// 			dataIndex: 'completion',
+				// 			key: 'completion',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+				//
+				// 						<Tooltip placement="bottom" title={<div>
+				// 							<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+				// 						</div>}>
+				// 							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+				// 						</Tooltip>
+				//
+        // </span>
+				// 			)
+				// 		},
+				// 		{
+				// 			title: '最终成绩',
+				// 			dataIndex: 'finalscore',
+				// 			key: 'finalscore',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+				// 					{
+				// 						record.ultimate_score=== true?
+				// 							<Tooltip placement="bottom" title={<div>
+				// 								<div>{record.user_name}{record.user_login}</div>
+				// 								<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+				// 							</div>}>
+				// 								{
+				// 									record.finalscore&&record.finalscore==="--"?
+				// 										<a style=
+				// 												 {{
+				// 													 "color": '#9A9A9A',
+				// 													 "text-align": "center"
+				// 												 }}>{record.finalscore}</a>
+				// 										:
+				// 										<a style={parseInt(record.finalscore) <= 60 ? {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) < 90 ? {
+				// 											"color": '#FF6800',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										}}>{record.finalscore}</a>
+				// 								}
+				// 							</Tooltip>
+				// 							:
+				// 							<Tooltip placement="bottom" title={<div>
+				// 								<div>{record.user_name}{record.user_login}</div>
+				// 								<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+				// 								<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+				// 								<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+				// 								<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+				// 							</div>}>
+				// 								{
+				// 									record.finalscore&&record.finalscore==="--"?
+				// 										<a style=
+				// 												 {{
+				// 													 "color": '#9A9A9A',
+				// 													 "text-align": "center"
+				// 												 }}>{record.finalscore}</a>
+				// 										:
+				// 										<a style={parseInt(record.finalscore) <= 60 ? {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) < 90 ? {
+				// 											"color": '#FF6800',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										}}>{record.finalscore}</a>
+				// 								}
+				// 							</Tooltip>
+				//
+				// 					}
+        //        </span>
+				// 			)
+				// 		},
+				// 		{
+				// 			title: '操作',
+				// 			dataIndex: 'operating',
+				// 			key: 'operating',
+				// 			display: 'block',
+				// 			align: 'center',
+				// 			fixed: 'right',
+				// 			width:'100px',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
+				// 					<span>
+				// 						<Tooltip placement="bottom" title={<div>
+				// 							<div>直接调整最终成绩的分数</div>
+				// 							<div>其它评分全部作废</div>
+				// 						</div>}>
+        //                 <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+				// 									 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
+				// 						</Tooltip>
+        //                 <a style={{"display": "block", "text-align": "center"}} className="color-blue"
+				// 									 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+        //         </span>
+				// 			)
+				// 		},
+				// 	]
+					columns.map((item,key)=>{
+						if(item.title==="分班"){
+							columns.splice(key,1)
+						}
+						if(item.title==="关卡得分"){
+							columns.splice(key,1)
+						}
+						if(item.title==="效率分"){
+							columns.splice(key,1)
+						}
+					})
 				}else{
-					columns = [
-						{
-							title: '序号',
-							dataIndex: 'number',
-							key: 'number',
-							align: 'center',
-							width:'96px',
-							render: (text, record) => (
-								<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
-        </span>
-							)
-						},
-						{
-							title: '姓名',
-							dataIndex: 'name',
-							key: 'name',
-							align: 'center',
-							width:'147px',
-							render: (text, record) => (
-								<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-        </span>
-							)
-						},
-						{
-							title: '学号',
-							dataIndex: 'stduynumber',
-							key: 'stduynumber',
-							align: 'center',
-							width:'200px',
-							render: (text, record) => (
-								<span>
-             <a style={{
-							 "color": '#9A9A9A',
-							 "text-align": "center"
-						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
-        </span>
-							),
-						},
-						{
-							title: '分班',
-							key: 'classroom',
-							dataIndex: 'classroom',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-								{
-									record.classroom&&record.classroom==="--"?
-										<a style={{"color": '#9A9A9A', "text-align": "center"}}></a>
-										:
-										<a style={{"color": '#07111B', "text-align": "center"}}></a>
-								}
-        </span>
-							)
-						},
-						{
-							title: '提交状态',
-							dataIndex: 'submitstate',
-							key: 'submitstate',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-             <a style={record.submitstate === "延时提交" ? {
-							 "color": '#DD1717',
-							 "text-align": "center"
-						 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-							)
-
-						},
-						{
-							title: '更新时间',
-							dataIndex: 'updatetime',
-							key: 'updatetime',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-										<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-        </span>
-							),
-						},
-						{
-							title: '完成情况',
-							dataIndex: 'completion',
-							key: 'completion',
-							align: 'center',
-
-							render: (text, record) => (
-								<span>
-
-										<Tooltip  placement="bottom" title={<div>
-											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
-										</div>}>
-											<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
-										</Tooltip>
-
-        </span>
-							)
-						},
-						{
-							title: '最终成绩',
-							dataIndex: 'finalscore',
-							key: 'finalscore',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-									{
-										record.ultimate_score=== true?
-											<Tooltip placement="bottom" title={<div>
-												<div>{record.user_name}{record.user_login}</div>
-												<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
-											</div>}>
-												{
-													record.finalscore&&record.finalscore==="--"?
-														<a style=
-																 {{
-																	 "color": '#9A9A9A',
-																	 "text-align": "center"
-																 }}>{record.finalscore}</a>
-														:
-														<a style={parseInt(record.finalscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center"
-														} : parseInt(record.finalscore) < 90 ? {
-															"color": '#FF6800',
-															"text-align": "center"
-														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-															"color": '#747A7F',
-															"text-align": "center"
-														}}>{record.finalscore}</a>
-												}
-											</Tooltip>
-											:
-											<Tooltip placement="bottom" title={<div>
-												<div>{record.user_name}{record.user_login}</div>
-												<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
-												<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
-												<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
-												<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
-											</div>}>
-												{
-													record.finalscore&&record.finalscore==="--"?
-														<a style=
-																 {{
-																	 "color": '#9A9A9A',
-																	 "text-align": "center"
-																 }}>{record.finalscore}</a>
-														:
-														<a style={parseInt(record.finalscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center"
-														} : parseInt(record.finalscore) < 90 ? {
-															"color": '#FF6800',
-															"text-align": "center"
-														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-															"color": '#747A7F',
-															"text-align": "center"
-														}}>{record.finalscore}</a>
-												}
-											</Tooltip>
-
-									}
-               </span>
-							)
-						},
-						{
-							title: '操作',
-							dataIndex: 'operating',
-							key: 'operating',
-							display: 'block',
-							align: 'center',
-							width:'96px',
-							render: (text, record) => (
-								record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
-									<span>
-										<Tooltip placement="bottom" title={<div>
-											<div>直接调整最终成绩的分数</div>
-											<div>其它评分全部作废</div>
-										</div>}>
-                        <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
-										</Tooltip>
-                        <a style={{"display": "block", "text-align": "center"}} className="color-blue"
-													 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
-                </span>
-							)
-						},
-					]
-
+					if(this.state.course_group_info.length < 2){
+				// 		columns = [
+				// 			{
+				// 				title: '序号',
+				// 				dataIndex: 'number',
+				// 				key: 'number',
+				// 				align: 'center',
+				// 				fixed: 'left',
+				// 				width:'100px',
+				// 				className:'font-14',
+				{/*				render: (text, record) => (*/}
+				// 					<span>
+        {/*     <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>*/}
+        {/*</span>*/}
+				{/*				)*/}
+				{/*			},*/}
+				{/*			{*/}
+				{/*				title: '姓名',*/}
+				// 				dataIndex: 'name',
+				// 				key: 'name',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+        //      <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+        // </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '学号',
+				// 				dataIndex: 'stduynumber',
+				// 				key: 'stduynumber',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+        //      <a style={{
+				// 			 "color": '#9A9A9A',
+				// 			 "text-align": "center"
+				// 		 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+        // </span>
+				// 				),
+				// 			},
+				// 			{
+				// 				title: '提交状态',
+				// 				dataIndex: 'submitstate',
+				// 				key: 'submitstate',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+        //      <a style={record.submitstate === "延时提交" ? {
+				// 			 "color": '#DD1717',
+				// 			 "text-align": "center"
+				// 		 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+				// 			 "color": '#747A7F',
+				// 			 "text-align": "center"
+				// 		 }}>{record.submitstate}</a>
+        // </span>
+				// 				)
+				//
+				// 			},
+				// 			{
+				// 				title: '更新时间',
+				// 				dataIndex: 'updatetime',
+				// 				key: 'updatetime',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+				// 						<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+        // </span>
+				// 				),
+				// 			},
+				// 			{
+				// 				title: '完成情况',
+				// 				dataIndex: 'completion',
+				// 				key: 'completion',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+				//
+				// 						<Tooltip placement="bottom" title={<div>
+				// 							<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+				// 						</div>}>
+				// 							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+				// 						</Tooltip>
+				//
+        // </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '最终成绩',
+				// 				dataIndex: 'finalscore',
+				// 				key: 'finalscore',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+				// 					{
+				// 						record.ultimate_score=== true?
+				// 							<Tooltip placement="bottom" title={<div>
+				// 								<div>{record.user_name}{record.user_login}</div>
+				// 								<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+				// 							</div>}>
+				// 								{
+				// 									record.finalscore&&record.finalscore==="--"?
+				// 										<a style=
+				// 												 {{
+				// 													 "color": '#9A9A9A',
+				// 													 "text-align": "center"
+				// 												 }}>{record.finalscore}</a>
+				// 										:
+				// 										<a style={parseInt(record.finalscore) <= 60 ? {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) < 90 ? {
+				// 											"color": '#FF6800',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										}}>{record.finalscore}</a>
+				// 								}
+				// 							</Tooltip>
+				// 							:
+				// 							<Tooltip placement="bottom" title={<div>
+				// 								<div>{record.user_name}{record.user_login}</div>
+				// 								<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+				// 								<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+				// 								<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+				// 								<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+				// 							</div>}>
+				// 								{
+				// 									record.finalscore&&record.finalscore==="--"?
+				// 										<a style=
+				// 												 {{
+				// 													 "color": '#9A9A9A',
+				// 													 "text-align": "center"
+				// 												 }}>{record.finalscore}</a>
+				// 										:
+				// 										<a style={parseInt(record.finalscore) <= 60 ? {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) < 90 ? {
+				// 											"color": '#FF6800',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										}}>{record.finalscore}</a>
+				// 								}
+				// 							</Tooltip>
+				//
+				// 					}
+        //        </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '操作',
+				// 				dataIndex: 'operating',
+				// 				key: 'operating',
+				// 				display: 'block',
+				// 				align: 'center',
+				// 				fixed: 'right',
+				// 				width:'100px',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
+				// 						<span>
+				// 						<Tooltip placement="bottom" title={<div>
+				// 							<div>直接调整最终成绩的分数</div>
+				// 							<div>其它评分全部作废</div>
+				// 						</div>}>
+        //                 <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+				// 									 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
+				// 						</Tooltip>
+        //                 <a style={{"display": "block", "text-align": "center"}} className="color-blue"
+				// 									 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+        //         </span>
+				// 				)
+				// 			},
+				// 		]
+						columns.map((item,key)=>{
+							if(item.title==="分班"){
+								columns.splice(key,1)
+							}
+							if(item.title==="关卡得分"){
+								columns.splice(key,1)
+							}
+							if(item.title==="效率分"){
+								columns.splice(key,1)
+							}
+						})
+					}else {
+				// 		columns = [
+				// 			{
+				// 				title: '序号',
+				// 				dataIndex: 'number',
+				// 				key: 'number',
+				// 				align: 'center',
+				// 				fixed: 'left',
+				// 				width:'100px',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+        //      <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+        // </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '姓名',
+				// 				dataIndex: 'name',
+				// 				key: 'name',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+        //      <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+        // </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '学号',
+				// 				dataIndex: 'stduynumber',
+				// 				key: 'stduynumber',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+        //      <a style={{
+				// 			 "color": '#9A9A9A',
+				// 			 "text-align": "center"
+				{/*		 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>*/}
+        {/*</span>*/}
+				{/*				),*/}
+				// 			},
+				// 			{
+				// 				title: '分班',
+				// 				key: 'classroom',
+				{/*				dataIndex: 'classroom',*/}
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+				// 				{
+				// 					record.classroom&&record.classroom==="--"?
+				// 						<a style={{"color": '#9A9A9A', "text-align": "center"}}></a>
+				// 						:
+				// 						<a style={{"color": '#07111B', "text-align": "center"}}></a>
+				// 				}
+        // </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '提交状态',
+				// 				dataIndex: 'submitstate',
+				{/*				key: 'submitstate',*/}
+				{/*				align: 'center',*/}
+				{/*				className:'font-14',*/}
+				{/*				render: (text, record) => (*/}
+				{/*					<span>*/}
+        {/*     <a style={record.submitstate === "延时提交" ? {*/}
+				// 			 "color": '#DD1717',
+				// 			 "text-align": "center"
+				// 		 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+				// 			 "color": '#747A7F',
+				// 			 "text-align": "center"
+				// 		 }}>{record.submitstate}</a>
+        // </span>
+				// 				)
+				//
+				// 			},
+				// 			{
+				// 				title: '更新时间',
+				// 				dataIndex: 'updatetime',
+				// 				key: 'updatetime',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+				// 						<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+        // </span>
+				// 				),
+				// 			},
+				// 			{
+				// 				title: '完成情况',
+				// 				dataIndex: 'completion',
+				// 				key: 'completion',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+				//
+				// 						<Tooltip  placement="bottom" title={<div>
+				// 							<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+				// 						</div>}>
+				// 							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+				// 						</Tooltip>
+				//
+        // </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '最终成绩',
+				// 				dataIndex: 'finalscore',
+				// 				key: 'finalscore',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+				// 					{
+				// 						record.ultimate_score=== true?
+				// 							<Tooltip placement="bottom" title={<div>
+				// 								<div>{record.user_name}{record.user_login}</div>
+				// 								<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+				// 							</div>}>
+				// 								{
+				// 									record.finalscore&&record.finalscore==="--"?
+				// 										<a style=
+				// 												 {{
+				// 													 "color": '#9A9A9A',
+				// 													 "text-align": "center"
+				// 												 }}>{record.finalscore}</a>
+				// 										:
+				// 										<a style={parseInt(record.finalscore) <= 60 ? {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) < 90 ? {
+				// 											"color": '#FF6800',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										}}>{record.finalscore}</a>
+				// 								}
+				// 							</Tooltip>
+				// 							:
+				// 							<Tooltip placement="bottom" title={<div>
+				// 								<div>{record.user_name}{record.user_login}</div>
+				// 								<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+				// 								<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+				// 								<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+				// 								<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+				// 							</div>}>
+				// 								{
+				// 									record.finalscore&&record.finalscore==="--"?
+				// 										<a style=
+				// 												 {{
+				// 													 "color": '#9A9A9A',
+				// 													 "text-align": "center"
+				// 												 }}>{record.finalscore}</a>
+				// 										:
+				// 										<a style={parseInt(record.finalscore) <= 60 ? {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) < 90 ? {
+				// 											"color": '#FF6800',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										}}>{record.finalscore}</a>
+				// 								}
+				// 							</Tooltip>
+				//
+				// 					}
+        //        </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '操作',
+				// 				dataIndex: 'operating',
+				// 				key: 'operating',
+				// 				display: 'block',
+				// 				align: 'center',
+				// 				fixed: 'right',
+				// 				width:'100px',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
+				// 						<span>
+				// 						<Tooltip placement="bottom" title={<div>
+				// 							<div>直接调整最终成绩的分数</div>
+				// 							<div>其它评分全部作废</div>
+				// 						</div>}>
+        //                 <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+				// 									 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
+				// 						</Tooltip>
+        //                 <a style={{"display": "block", "text-align": "center"}} className="color-blue"
+				// 									 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+        //         </span>
+				// 				)
+				// 			},
+				// 		]
+						columns.map((item,key)=>{
+							if(item.title==="关卡得分"){
+								columns.splice(key,1)
+							}
+							if(item.title==="效率分"){
+								columns.splice(key,1)
+							}
+						})
+					}
 				}
 			}else {
-				if(JSON.stringify(this.state.course_group_info) === "[]" ? "" : this.state.course_group_info === undefined ? "" : this.state.course_group_info === null){
-					columns=[
-						{
-							title: '序号',
-							dataIndex: 'number',
-							key: 'number',
-							align: 'center',
-							width:'96px',
-							render: (text, record) => (
-								<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
-        </span>
-							)
-						},
-						{
-							title: '姓名',
-							dataIndex: 'name',
-							key: 'name',
-							align: 'center',
-							Width:'147px',
-							render: (text, record) => (
-								<span>
-             <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-        </span>
-							)
-						},
-						{
-							title: '学号',
-							dataIndex: 'stduynumber',
-							key: 'stduynumber',
-							align: 'center',
-							width:'200px',
-							render: (text, record) => (
-								<span>
-             <a style={{
-							 "color": '#9A9A9A',
-							 "text-align": "center"
-						 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
-        </span>
-							),
-						},
-						{
-							title: '提交状态',
-							dataIndex: 'submitstate',
-							key: 'submitstate',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-             <a style={record.submitstate === "延时提交" ? {
-							 "color": '#DD1717',
-							 "text-align": "center"
-						 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-							 "color": '#747A7F',
-							 "text-align": "center"
-						 }}>{record.submitstate}</a>
-        </span>
-							)
-
-						},
-						{
-							title: '更新时间',
-							dataIndex: 'updatetime',
-							key: 'updatetime',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-             <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-        </span>
-							),
-						},
-						{
-							title: '完成情况',
-							dataIndex: 'completion',
-							key: 'completion',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-
-										<Tooltip placement="bottom" title={<div>
-											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
-										</div>}>
-											<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
-										</Tooltip>
-
-        </span>
-							)
-						},
-						{
-							title: '关卡得分',
-							dataIndex: 'levelscore',
-							key: 'levelscore',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-       <a style={parseInt(record.levelscore) <= 60 ? {
-				 "color": '#747A7F',
-				 "text-align": "center"
-			 } : parseInt(record.levelscore) < 90 ? {
-				 "color": '#FF6800',
-				 "text-align": "center"
-			 } : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-				 "color": '#747A7F',
-				 "text-align": "center"
-			 }}>{record.levelscore}</a>
-        </span>
-							)
-						},
-						{
-							title: '效率分',
-							dataIndex: 'efficiencyscore',
-							key: 'efficiencyscore',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-									{
-										record.efficiencyscore&& record.efficiencyscore=== "--"?(
-											record.submitstate==="按时提交"?
-												<Tooltip placement="bottom" title={<div>
-													<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
-												</div>}>
-													<a style={{color:"#9A9A9A"}}>
-														--
-													</a>
-												</Tooltip>
-												:
-												record.submitstate==="延时提交"?
-												<Tooltip placement="bottom" title={<div>
-													<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
-												</div>}>
-													<a style={{color:"#9A9A9A"}}>
-														--
-													</a>
-												</Tooltip>
-													:
-														<a style={{color:"#9A9A9A"}}>
-															--
-														</a>
-											)
-											:
-											<a style={parseInt(record.efficiencyscore) <= 60 ? {
-												"color": '#747A7F',
-												"text-align": "center"
-											} : parseInt(record.efficiencyscore) < 90 ? {
-												"color": '#FF6800',
-												"text-align": "center"
-											} : parseInt(record.efficiencyscore) >= 90 ? {
-												"color": '#DD1717',
-												"text-align": "center"
-											} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</a>
-									}
-
-        </span>
-
-							)
-						},
-						{
-							title: '最终成绩',
-							dataIndex: 'finalscore',
-							key: 'finalscore',
-							align: 'center',
-							render: (text, record) => (
-								<span>
-									{
-										record.ultimate_score=== true?
-											<Tooltip placement="bottom" title={<div>
-												<div>{record.user_name}{record.user_login}</div>
-												<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
-											</div>}>
-												{
-													record.finalscore&&record.finalscore==="--"?
-														<a style=
-																 {{
-																	 "color": '#9A9A9A',
-																	 "text-align": "center"
-																 }}>{record.finalscore}</a>
-														:
-														<a style={parseInt(record.finalscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center"
-														} : parseInt(record.finalscore) < 90 ? {
-															"color": '#FF6800',
-															"text-align": "center"
-														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-															"color": '#747A7F',
-															"text-align": "center"
-														}}>{record.finalscore}</a>
-												}
-											</Tooltip>
-											:
-											<Tooltip placement="bottom" title={<div>
-												<div>{record.user_name}{record.user_login}</div>
-												<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
-												<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
-												<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
-												<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
-											</div>}>
-												{
-													record.finalscore&&record.finalscore==="--"?
-														<a style=
-																 {{
-																	 "color": '#9A9A9A',
-																	 "text-align": "center"
-																 }}>{record.finalscore}</a>
-														:
-														<a style={parseInt(record.finalscore) <= 60 ? {
-															"color": '#747A7F',
-															"text-align": "center"
-														} : parseInt(record.finalscore) < 90 ? {
-															"color": '#FF6800',
-															"text-align": "center"
-														} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-															"color": '#747A7F',
-															"text-align": "center"
-														}}>{record.finalscore}</a>
-												}
-											</Tooltip>
-
-									}
-               </span>
-							)
-						},
-						{
-							title: '操作',
-							dataIndex: 'operating',
-							key: 'operating',
-							display: 'block',
-							align: 'center',
-							width:'93px',
-							render: (text, record) => (
-								record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
-									<span>
-										<Tooltip placement="bottom" title={<div>
-											<div>直接调整最终成绩的分数</div>
-											<div>其它评分全部作废</div>
-										</div>}>
-                        <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
-										</Tooltip>
-                       <a style={{"text-align": "center"}} className="color-blue"
-													onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
-        </span>
-							)
-						},
-					]
-				}
+				if(JSON.stringify(this.state.course_group_info) === "[]"|| this.state.course_group_info === undefined || this.state.course_group_info === null){
+				// 	columns=[
+				// 		{
+				// 			title: '序号',
+				// 			dataIndex: 'number',
+				// 			key: 'number',
+				// 			align: 'center',
+				// 			fixed: 'left',
+				// 			width:'100px',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+       //       <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+       //  </span>
+				// 			)
+				// 		},
+				// 		{
+				// 			title: '姓名',
+				// 			dataIndex: 'name',
+				// 			key: 'name',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+       //       <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+       //  </span>
+				// 			)
+				// 		},
+				// 		{
+				// 			title: '学号',
+				// 			dataIndex: 'stduynumber',
+				// 			key: 'stduynumber',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+       //       <a style={{
+				// 			 "color": '#9A9A9A',
+				// 			 "text-align": "center"
+				// 		 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+       //  </span>
+				// 			),
+				// 		},
+				// 		{
+				// 			title: '提交状态',
+				// 			dataIndex: 'submitstate',
+				// 			key: 'submitstate',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+       //       <a style={record.submitstate === "延时提交" ? {
+				// 			 "color": '#DD1717',
+				// 			 "text-align": "center"
+				// 		 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+				// 			 "color": '#747A7F',
+				// 			 "text-align": "center"
+				// 		 }}>{record.submitstate}</a>
+       //  </span>
+				// 			)
+			 //
+				// 		},
+				// 		{
+				// 			title: '更新时间',
+				// 			dataIndex: 'updatetime',
+				// 			key: 'updatetime',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+       //       <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+       //  </span>
+				// 			),
+				// 		},
+				// 		{
+				// 			title: '完成情况',
+				// 			dataIndex: 'completion',
+				// 			key: 'completion',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+			 //
+				// 						<Tooltip placement="bottom" title={<div>
+				// 							<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+				// 						</div>}>
+				// 							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+				// 						</Tooltip>
+			 //
+       //  </span>
+				// 			)
+				// 		},
+				// 		{
+				// 			title: '关卡得分',
+				// 			dataIndex: 'levelscore',
+				// 			key: 'levelscore',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+       // <a style={parseInt(record.levelscore) <= 60 ? {
+				//  "color": '#747A7F',
+				//  "text-align": "center"
+			 // } : parseInt(record.levelscore) < 90 ? {
+				//  "color": '#FF6800',
+				//  "text-align": "center"
+			 // } : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				//  "color": '#747A7F',
+				//  "text-align": "center"
+			 // }}>{record.levelscore}</a>
+       //  </span>
+				// 			)
+				// 		},
+				// 		{
+				// 			title: '效率分',
+				// 			dataIndex: 'efficiencyscore',
+				// 			key: 'efficiencyscore',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+				// 					{
+				// 						record.efficiencyscore&& record.efficiencyscore=== "--"?(
+				// 							record.submitstate==="按时提交"?
+				// 								<Tooltip placement="bottom" title={<div>
+				// 									<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
+				// 								</div>}>
+				// 									<a style={{color:"#9A9A9A"}}>
+				// 										--
+				// 									</a>
+				// 								</Tooltip>
+				// 								:
+				// 								record.submitstate==="延时提交"?
+				// 								<Tooltip placement="bottom" title={<div>
+				// 									<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
+				// 								</div>}>
+				// 									<a style={{color:"#9A9A9A"}}>
+				// 										--
+				// 									</a>
+				// 								</Tooltip>
+				// 									:
+				// 										<a style={{color:"#9A9A9A"}}>
+				// 											--
+				// 										</a>
+				// 							)
+				// 							:
+				// 							<a style={parseInt(record.efficiencyscore) <= 60 ? {
+				// 								"color": '#747A7F',
+				// 								"text-align": "center"
+				// 							} : parseInt(record.efficiencyscore) < 90 ? {
+				// 								"color": '#FF6800',
+				// 								"text-align": "center"
+				// 							} : parseInt(record.efficiencyscore) >= 90 ? {
+				// 								"color": '#DD1717',
+				// 								"text-align": "center"
+				// 							} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</a>
+				// 					}
+			 //
+       //  </span>
+			 //
+				// 			)
+				// 		},
+				// 		{
+				// 			title: '最终成绩',
+				// 			dataIndex: 'finalscore',
+				// 			key: 'finalscore',
+				// 			align: 'center',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				<span>
+				// 					{
+				// 						record.ultimate_score=== true?
+				// 							<Tooltip placement="bottom" title={<div>
+				// 								<div>{record.user_name}{record.user_login}</div>
+				// 								<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+				// 							</div>}>
+				// 								{
+				// 									record.finalscore&&record.finalscore==="--"?
+				// 										<a style=
+				// 												 {{
+				// 													 "color": '#9A9A9A',
+				// 													 "text-align": "center"
+				// 												 }}>{record.finalscore}</a>
+				// 										:
+				// 										<a style={parseInt(record.finalscore) <= 60 ? {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) < 90 ? {
+				// 											"color": '#FF6800',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										}}>{record.finalscore}</a>
+				// 								}
+				// 							</Tooltip>
+				// 							:
+				// 							<Tooltip placement="bottom" title={<div>
+				// 								<div>{record.user_name}{record.user_login}</div>
+				// 								<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+				// 								<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+				// 								<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+				// 								<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+				// 							</div>}>
+				// 								{
+				// 									record.finalscore&&record.finalscore==="--"?
+				// 										<a style=
+				// 												 {{
+				// 													 "color": '#9A9A9A',
+				// 													 "text-align": "center"
+				// 												 }}>{record.finalscore}</a>
+				// 										:
+				// 										<a style={parseInt(record.finalscore) <= 60 ? {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) < 90 ? {
+				// 											"color": '#FF6800',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										}}>{record.finalscore}</a>
+				// 								}
+				// 							</Tooltip>
+			 //
+				// 					}
+       //         </span>
+				// 			)
+				// 		},
+				// 		{
+				// 			title: '操作',
+				// 			dataIndex: 'operating',
+				// 			key: 'operating',
+				// 			display: 'block',
+				// 			align: 'center',
+				// 			fixed: 'right',
+				// 			width:'100px',
+				// 			className:'font-14',
+				// 			render: (text, record) => (
+				// 				record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
+				// 					<span>
+				// 						<Tooltip placement="bottom" title={<div>
+				// 							<div>直接调整最终成绩的分数</div>
+				// 							<div>其它评分全部作废</div>
+				// 						</div>}>
+       //                  <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+				// 									 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
+				// 						</Tooltip>
+       //                 <a style={{"text-align": "center"}} className="color-blue"
+				// 									onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+       //  </span>
+				// 			)
+				// 		},
+				// 	]
+					columns.map((item,key)=>{
+						if(item.title==="分班"){
+							columns.splice(key,1)
+						}
+					})
+				}else {
+					if(this.state.course_group_info.length < 2) {
+				// 		columns=[
+				// 			{
+				// 				title: '序号',
+				// 				dataIndex: 'number',
+				// 				key: 'number',
+				// 				align: 'center',
+				// 				fixed: 'left',
+				// 				width:'100px',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+       //       <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
+       //  </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '姓名',
+				// 				dataIndex: 'name',
+				// 				key: 'name',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+       //       <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
+       //  </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '学号',
+				// 				dataIndex: 'stduynumber',
+				// 				key: 'stduynumber',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+       //       <a style={{
+				// 			 "color": '#9A9A9A',
+				// 			 "text-align": "center"
+				// 		 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
+       //  </span>
+				// 				),
+				// 			},
+				// 			{
+				// 				title: '提交状态',
+				// 				dataIndex: 'submitstate',
+				// 				key: 'submitstate',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+       //       <a style={record.submitstate === "延时提交" ? {
+				// 			 "color": '#DD1717',
+				// 			 "text-align": "center"
+				// 		 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
+				// 			 "color": '#747A7F',
+				// 			 "text-align": "center"
+				// 		 }}>{record.submitstate}</a>
+       //  </span>
+				// 				)
+			 //
+				// 			},
+				// 			{
+				// 				title: '更新时间',
+				// 				dataIndex: 'updatetime',
+				// 				key: 'updatetime',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+       //       <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
+       //  </span>
+				// 				),
+				// 			},
+				// 			{
+				// 				title: '完成情况',
+				// 				dataIndex: 'completion',
+				// 				key: 'completion',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+			 //
+				// 						<Tooltip placement="bottom" title={<div>
+				// 							<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+				// 						</div>}>
+				// 							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
+				// 						</Tooltip>
+			 //
+       //  </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '关卡得分',
+				// 				dataIndex: 'levelscore',
+				// 				key: 'levelscore',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+       // <a style={parseInt(record.levelscore) <= 60 ? {
+				//  "color": '#747A7F',
+				//  "text-align": "center"
+			 // } : parseInt(record.levelscore) < 90 ? {
+				//  "color": '#FF6800',
+				//  "text-align": "center"
+			 // } : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				//  "color": '#747A7F',
+				//  "text-align": "center"
+			 // }}>{record.levelscore}</a>
+       //  </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '效率分',
+				// 				dataIndex: 'efficiencyscore',
+				// 				key: 'efficiencyscore',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+				// 					{
+				// 						record.efficiencyscore&& record.efficiencyscore=== "--"?(
+				// 								record.submitstate==="按时提交"?
+				// 									<Tooltip placement="bottom" title={<div>
+				// 										<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
+				// 									</div>}>
+				// 										<a style={{color:"#9A9A9A"}}>
+				// 											--
+				// 										</a>
+				// 									</Tooltip>
+				// 									:
+				// 									record.submitstate==="延时提交"?
+				// 										<Tooltip placement="bottom" title={<div>
+				// 											<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
+				// 										</div>}>
+				// 											<a style={{color:"#9A9A9A"}}>
+				// 												--
+				// 											</a>
+				// 										</Tooltip>
+				// 										:
+				// 										<a style={{color:"#9A9A9A"}}>
+				// 											--
+				// 										</a>
+				// 							)
+				// 							:
+				// 							<a style={parseInt(record.efficiencyscore) <= 60 ? {
+				// 								"color": '#747A7F',
+				// 								"text-align": "center"
+				// 							} : parseInt(record.efficiencyscore) < 90 ? {
+				// 								"color": '#FF6800',
+				// 								"text-align": "center"
+				// 							} : parseInt(record.efficiencyscore) >= 90 ? {
+				// 								"color": '#DD1717',
+				// 								"text-align": "center"
+				// 							} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</a>
+				// 					}
+			 //
+       //  </span>
+			 //
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '最终成绩',
+				// 				dataIndex: 'finalscore',
+				// 				key: 'finalscore',
+				// 				align: 'center',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					<span>
+				// 					{
+				// 						record.ultimate_score=== true?
+				// 							<Tooltip placement="bottom" title={<div>
+				// 								<div>{record.user_name}{record.user_login}</div>
+				// 								<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
+				// 							</div>}>
+				// 								{
+				// 									record.finalscore&&record.finalscore==="--"?
+				// 										<a style=
+				// 												 {{
+				// 													 "color": '#9A9A9A',
+				// 													 "text-align": "center"
+				// 												 }}>{record.finalscore}</a>
+				// 										:
+				// 										<a style={parseInt(record.finalscore) <= 60 ? {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) < 90 ? {
+				// 											"color": '#FF6800',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										}}>{record.finalscore}</a>
+				// 								}
+				// 							</Tooltip>
+				// 							:
+				// 							<Tooltip placement="bottom" title={<div>
+				// 								<div>{record.user_name}{record.user_login}</div>
+				// 								<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
+				// 								<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
+				// 								<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
+				// 								<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
+				// 							</div>}>
+				// 								{
+				// 									record.finalscore&&record.finalscore==="--"?
+				// 										<a style=
+				// 												 {{
+				// 													 "color": '#9A9A9A',
+				// 													 "text-align": "center"
+				// 												 }}>{record.finalscore}</a>
+				// 										:
+				// 										<a style={parseInt(record.finalscore) <= 60 ? {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) < 90 ? {
+				// 											"color": '#FF6800',
+				// 											"text-align": "center"
+				// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
+				// 											"color": '#747A7F',
+				// 											"text-align": "center"
+				// 										}}>{record.finalscore}</a>
+				// 								}
+				// 							</Tooltip>
+			 //
+				// 					}
+       //         </span>
+				// 				)
+				// 			},
+				// 			{
+				// 				title: '操作',
+				// 				dataIndex: 'operating',
+				// 				key: 'operating',
+				// 				display: 'block',
+				// 				align: 'center',
+				// 				fixed: 'right',
+				// 				width:'100px',
+				// 				className:'font-14',
+				// 				render: (text, record) => (
+				// 					record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
+				// 						<span>
+				// 						<Tooltip placement="bottom" title={<div>
+				// 							<div>直接调整最终成绩的分数</div>
+				// 							<div>其它评分全部作废</div>
+				// 						</div>}>
+       //                  <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+				// 									 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
+				// 						</Tooltip>
+       //                 <a style={{"text-align": "center"}} className="color-blue"
+				// 									onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
+       //  </span>
+				// 				)
+				// 			},
+				// 		]
+						columns.map((item,key)=>{
+							if(item.title==="分班"){
+								columns.splice(key,1)
+							}
+						})
+					}
+					columns=this.state.columnss;
+					}
 			}
 
 		} else {
@@ -1683,7 +2440,7 @@ class Listofworks extends Component {
 							<WordsBtn className="fl">作业详情</WordsBtn>
 						</p>
 					</div>
-					<div className="educontent mb30" style={{width:"1250px"}}>
+					<div className="educontent mb30">
 						<p className=" fl color-black  summaryname">
 							{teacherdata === undefined ? "" : teacherdata.homework_name}
 						</p>
@@ -1699,7 +2456,7 @@ class Listofworks extends Component {
 
 					</div>
 
-					<div className="edu-back-white" style={{width:"1250px"}}>
+					<div className="edu-back-white">
 						<div className="stud-class-set bor-bottom-greyE ">
 							<div className=" clearfix edu-back-white poll_list">
 								<Link className="active"
@@ -1809,9 +2566,9 @@ class Listofworks extends Component {
 										<span className="fl "><a id="graduation_comment_no_limit"
 																						 className={unlimitedtwo === 0 ? "pl10 pr10 mr20 " : "pl10 pr10 mr20 check_on"}
 																						 onClick={() => this.notlimitedst()}>不限</a></span>
-										<CheckboxGroup value={course_groupysls}
+										<CheckboxGroup  value={course_groupysls}
 																	 onChange={(e) => this.funtaskstatustwo(e, course_group_info && course_group_info)}
-																	 style={{paddingTop: '4px'}}>
+																	 style={{paddingTop: '4px',width:'1017px'}}>
 											{course_group_info === undefined ? "" :
 												course_group_info.map((item, key) => {
 													return (

From 73c80c5d3b218022fe2c82d000fb0a68dddfe731 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 29 Jun 2019 00:38:07 +0800
Subject: [PATCH 11/39] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/shixunHomework/Listofworks.js     | 16 +++++++--------
 .../Shixunworkdetails/ShixunWorkModal.js      | 20 ++++++++++++++-----
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 8fc4404fa..46eb61859 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -337,11 +337,11 @@ class Listofworks extends Component {
 									<div>直接调整最终成绩的分数</div>
 							   	<div>其它评分全部作废</div>
 							</div>}>
-                       <span style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</span>
+                       <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+													 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
 								</Tooltip>
-                       <span style={{"text-align": "center"}} className="color-blue"
-													onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
+                       <a style={{"text-align": "center"}} className="color-blue"
+													onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
         </span>
 					)
 				},
@@ -589,11 +589,11 @@ class Listofworks extends Component {
 									<div>直接调整最终成绩的分数</div>
 									<div>其它评分全部作废</div>
 								</div>}>
-                       <span style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-														 onClick={() => this.Viewstudenttraininginformations(record)}>调分</span>
+                       <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
+														 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
 								</Tooltip>
-                       <span style={{"text-align": "center"}} className="color-blue"
-														 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
+                       <a style={{"text-align": "center"}} className="color-blue"
+														 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
         </span>
 					)
 				},
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index eaf1c433e..0885c155e 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -14,23 +14,32 @@ class ShixunWorkModal extends Component{
 		}
 	}
 	componentDidMount() {
-
+		let {group_list}=this.state;
    let url="/homework_commons/"+this.props.match.params.homeworkid+"/group_list.json";
-
 		axios.get(url,{params:{
 				limit:10,
 				page:1,
 			}
 		}).then((response) => {
+			console.log(response);
 			if(response.data.group_list===undefined){
 				this.setState({
 					course_groups:response.data,
 					group_list:undefined
 				})
 			}else{
+				let newgroup_list=group_list;
+				response.data.group_list.map((item,key)=>{
+					newgroup_list.push(item)
+					console.log(item);
+				})
+			   response.data.ungroup_list.map((items,keys)=>{
+					 newgroup_list.push(item)
+					 console.log(item);
+				 })
 				this.setState({
 					course_groups:response.data,
-					group_list:response.data.group_list
+					group_list:newgroup_list,
 				})
 			}
 
@@ -44,6 +53,7 @@ class ShixunWorkModal extends Component{
 	//勾选实训
 	shixunhomeworkedit=(checkedValues)=>{
 		let{group_list}=this.state;
+
     if(checkedValues.length===group_list.length){
     	  this.setState({
 		      onChangetype:true,
@@ -71,10 +81,10 @@ class ShixunWorkModal extends Component{
 					page:newpage,
 				}
 			}).then((response) => {
-				response.data. course_groups.group_list&&response.data.group_list.map((item,key)=>{
+				response.data.group_list&&response.data.group_list.map((item,key)=>{
 					newgroup_list.push(item)
 				})
-				response.data. course_groups.ungroup_list&&response.data.ungroup_list.map((items,keys)=>{
+				response.data.ungroup_list&&response.data.ungroup_list.map((items,keys)=>{
 					newgroup_list.push(items)
 				})
 				this.setState({

From 71f052328b5d1365941efee8e7e38b6d38411a32 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, 29 Jun 2019 00:38:43 +0800
Subject: [PATCH 12/39] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/config/webpack.config.dev.js     |  30 +-
 public/react/src/App.js                       |   2 +-
 .../courses/busyWork/CommonWorkDetailIndex.js |   4 +-
 .../busyWork/common/TabRightComponents.js     | 304 +++++++--------
 .../exercise/Exercisestatisticalresult.js     |  17 +-
 .../Exercisestatisticalresulttabel.js         | 365 +++++++++---------
 .../courses/exercise/Exercisetablesmubu.js    |  20 +-
 .../exercise/Testpapersettinghomepage.js      |   6 +-
 .../tasks/GraduationTasksSubmitnew.js         |   2 +-
 .../graduation/tasks/GraduationTasksedit.js   |  12 +-
 .../graduation/tasks/GraduationTasksnew.js    |  14 +-
 .../tasks/GraduationTaskssetting.js           |   7 +-
 .../tasks/GraduationTaskssettinglist.js       |  32 +-
 .../tasks/GraduationTaskssettingquestions.js  |   7 +-
 .../courses/shixunHomework/Listofworks.js     |  36 +-
 15 files changed, 451 insertions(+), 407 deletions(-)

diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js
index dfd54f38b..ceddbd81b 100644
--- a/public/react/config/webpack.config.dev.js
+++ b/public/react/config/webpack.config.dev.js
@@ -114,21 +114,21 @@ module.exports = {
       // First, run the linter.
       // It's important to do this before Babel processes the JS.
         // 上线然后要注释回来
-      {
-        test: /\.(js|jsx|mjs)$/,
-        enforce: 'pre',
-        use: [
-          {
-            options: {
-              formatter: eslintFormatter,
-              eslintPath: require.resolve('eslint'),
-
-            },
-            loader: require.resolve('eslint-loader'),
-          },
-        ],
-        include: paths.appSrc,
-      },
+      // {
+      //   test: /\.(js|jsx|mjs)$/,
+      //   enforce: 'pre',
+      //   use: [
+      //     {
+      //       options: {
+      //         formatter: eslintFormatter,
+      //         eslintPath: require.resolve('eslint'),
+			//
+      //       },
+      //       loader: require.resolve('eslint-loader'),
+      //     },
+      //   ],
+      //   include: paths.appSrc,
+      // },
       {
         // "oneOf" will traverse all following loaders until one will
         // match the requirements. When no loader matches it will fall
diff --git a/public/react/src/App.js b/public/react/src/App.js
index d4c70e6aa..1a1af02d9 100644
--- a/public/react/src/App.js
+++ b/public/react/src/App.js
@@ -263,7 +263,7 @@ class App extends Component {
 						<Switch>
 							{/*<Route path="/login" component={LoginRegisterPage}/>*/}
 							{/*认证*/}
-							{/*<Route path="/account" component={AccountPage}/>*/}
+							<Route path="/account" component={AccountPage}/>
 
 							{/*403*/}
 							<Route path="/403" component={Shixunauthority}/>
diff --git a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
index b16fd6d32..ac8f91b74 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
@@ -226,8 +226,8 @@ class CommonWorkDetailIndex extends Component{
                         {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
                         导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                         <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                            <li><a href={exportResultUrl} calssName="color-dark">导出成绩</a></li>
-                            <li><a href={exportUrl} calssName="color-dark">导出作品附件</a></li>
+                            <li><a href={exportResultUrl} className="color-dark">导出成绩</a></li>
+                            <li><a href={exportUrl} className="color-dark">导出作品附件</a></li>
                         </ul>
                         </li>:""}
 
diff --git a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
index 92ff54178..ff1e2dcdd 100644
--- a/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
+++ b/public/react/src/modules/courses/busyWork/common/TabRightComponents.js
@@ -1,153 +1,153 @@
-import React,{Component} from "React";
-import { Form, Select, Input, Button,Checkbox,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
-import {Link} from 'react-router-dom';
-import { WordsBtn, MarkdownToHtml } from 'educoder';
-import axios from 'axios';
-import PublishRightnow from '../PublishRightnow'
-import AccessoryModal from "../../coursesPublic/AccessoryModal";
-
-const { Option} = Select;
-const CheckboxGroup = Checkbox.Group;
-const confirm = Modal.confirm;
-let GraduationTasksnewtype=true;
-const $ = window.$;
-const Search = Input.Search;
-const RadioGroup = Radio.Group;
-
-class TabRightComponents extends Component{
-
-  constructor(props){
-    super(props)
-
-    this.publishModal = React.createRef();
-    this.endModal = React.createRef();
-    
-    this.state={
-      accessoryVisible: false
-    }
-  }
-
-  componentDidMount() {
-  }
-
-  onToPublishClick = () => {
-
-  }
-  // 补交附件
-  Cancelvisible=()=>{
-    this.setState({
-      accessoryVisible:false
-    })
-  }
-
-  addAccessory=()=>{
-    this.setState({
-      accessoryVisible:true
-    })
-  }
-  setupdate = () => {
-
-  }
-  render(){
-    const dateFormat = 'YYYY-MM-DD HH:mm';
-    const { accessoryVisible } = this.state
-    let { work_statuses, publish_immediately, work_id
-        , end_immediately
-    } =this.props;
-
-    let courseId=this.props.match.params.coursesId;
-    let category_id=this.props.match.params.category_id;
-    let workId=this.props.match.params.workId;
-
-    const isGroup = this.props.isGroup()
-    const moduleName = !isGroup? "普通作业":"分组作业";
-    const moduleEngName = this.props.getModuleName()
-
-    const childModuleName = this.props.moduleName
-
-    const isAdmin = this.props.isAdmin()
-    const isSuperAdmin = this.props.isSuperAdmin()
-
-    let exportUrl = `/api/homework_commons/${workId}/works_list.zip`
-    const exportResultUrl = `/api/homework_commons/${workId}/works_list.xlsx`
-    
-    return(
-      <React.Fragment>
-        {isAdmin ? 
-        <React.Fragment>
-            <div style={{display: 'inline', float: 'right'}}>
-                <PublishRightnow ref={this.publishModal} showActionButton={false} {...this.props} checkBoxValues={[workId]} 
-                    isPublish={true} doWhenSuccess={this.props.doWhenSuccess} checkBeforePost={this.props.saveWorkSetting}
-                    onToPublishClick={this.onToPublishClick}
-                ></PublishRightnow>
-                <PublishRightnow ref={this.endModal} showActionButton={false} {...this.props} checkBoxValues={[workId]} 
-                    isPublish={false} doWhenSuccess={this.props.doWhenSuccess}></PublishRightnow> 
-            </div>
-            
-            <style>{`
-              .drop_down_menu li a {
-                  padding: 0px;
-                  font-size: 14px;
-                  color: #333;
-              }
-              .drop_down_menu {
-                  width: 121px;
-              }
-              .drop_down_menu li {
-                  overflow: visible;
-                  width: 121px;
-              }
-              .drop_down_menu, .drop_down_normal {
-                  padding-top: 10px;
-                  padding-bottom: 8px;
-              }
-            `}</style>
-            {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
-              导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
-              <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                <li><a href={exportResultUrl} calssName="color-dark">导出成绩</a></li>
-                <li><a href={exportUrl} calssName="color-dark">导出作品附件</a></li>
-              </ul>
-            </li>:""}
-
-            {/* <a className={"fr color-blue font-16"} href={exportUrl}>导出作品附件</a>
-            <a className={"fr color-blue font-16"} href={exportResultUrl}>导出成绩</a> */}
-            {/*<a className={"fr color-blue font-16"}>导出</a>*/}
-            {end_immediately &&  <a className={"fr color-blue font-16"} onClick={() => { this.endModal.current.open() } }>立即截止</a>}
-            {publish_immediately && <a className={"fr color-blue font-16"} onClick={() => { this.publishModal.current.open() } } >立即发布</a>}
-
-            {/*<a className={"fr color-blue font-16"}>项目在线质量检测</a>*/}
-            {isAdmin && <a className={"fr color-blue font-16"} onClick={() => this.props.toEditPage(this.props.match.params, workId)}>编辑作业</a>}
-        </React.Fragment> : 
-        <React.Fragment>
-            {work_statuses && work_statuses.indexOf('提交作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
-                onClick={() => { this.props.toWorkPostPage(this.props.match.params)}}
-            >提交作品</a>}
-            {work_statuses && work_statuses.indexOf('修改作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
-                onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}
-            >修改作品</a>}
-            {work_statuses && work_statuses.indexOf('补交附件') != -1 && 
-            <React.Fragment>
-              <AccessoryModal
-                {...this.props}
-                modalname={"补交附件"}
-                visible={accessoryVisible}
-                Cancelname={"取消"}
-                Savesname={"确认"}
-                Cancel={this.Cancelvisible}
-                setupdate={this.setupdate}
-                reviseAttachmentUrl={`/student_works/${work_id}/revise_attachment.json`}
-              />
-              <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
-                  onClick={this.addAccessory}
-              >补交附件</a>
-            </React.Fragment>
-            }
-        </React.Fragment> }
-      </React.Fragment>
-
-    )
-  }
-}
-
+import React,{Component} from "React";
+import { Form, Select, Input, Button,Checkbox,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip} from "antd";
+import {Link} from 'react-router-dom';
+import { WordsBtn, MarkdownToHtml } from 'educoder';
+import axios from 'axios';
+import PublishRightnow from '../PublishRightnow'
+import AccessoryModal from "../../coursesPublic/AccessoryModal";
+
+const { Option} = Select;
+const CheckboxGroup = Checkbox.Group;
+const confirm = Modal.confirm;
+let GraduationTasksnewtype=true;
+const $ = window.$;
+const Search = Input.Search;
+const RadioGroup = Radio.Group;
+
+class TabRightComponents extends Component{
+
+  constructor(props){
+    super(props)
+
+    this.publishModal = React.createRef();
+    this.endModal = React.createRef();
+    
+    this.state={
+      accessoryVisible: false
+    }
+  }
+
+  componentDidMount() {
+  }
+
+  onToPublishClick = () => {
+
+  }
+  // 补交附件
+  Cancelvisible=()=>{
+    this.setState({
+      accessoryVisible:false
+    })
+  }
+
+  addAccessory=()=>{
+    this.setState({
+      accessoryVisible:true
+    })
+  }
+  setupdate = () => {
+
+  }
+  render(){
+    const dateFormat = 'YYYY-MM-DD HH:mm';
+    const { accessoryVisible } = this.state
+    let { work_statuses, publish_immediately, work_id
+        , end_immediately
+    } =this.props;
+
+    let courseId=this.props.match.params.coursesId;
+    let category_id=this.props.match.params.category_id;
+    let workId=this.props.match.params.workId;
+
+    const isGroup = this.props.isGroup()
+    const moduleName = !isGroup? "普通作业":"分组作业";
+    const moduleEngName = this.props.getModuleName()
+
+    const childModuleName = this.props.moduleName
+
+    const isAdmin = this.props.isAdmin()
+    const isSuperAdmin = this.props.isSuperAdmin()
+
+    let exportUrl = `/api/homework_commons/${workId}/works_list.zip`
+    const exportResultUrl = `/api/homework_commons/${workId}/works_list.xlsx`
+    
+    return(
+      <React.Fragment>
+        {isAdmin ? 
+        <React.Fragment>
+            <div style={{display: 'inline', float: 'right'}}>
+                <PublishRightnow ref={this.publishModal} showActionButton={false} {...this.props} checkBoxValues={[workId]} 
+                    isPublish={true} doWhenSuccess={this.props.doWhenSuccess} checkBeforePost={this.props.saveWorkSetting}
+                    onToPublishClick={this.onToPublishClick}
+                ></PublishRightnow>
+                <PublishRightnow ref={this.endModal} showActionButton={false} {...this.props} checkBoxValues={[workId]} 
+                    isPublish={false} doWhenSuccess={this.props.doWhenSuccess}></PublishRightnow> 
+            </div>
+            
+            <style>{`
+              .drop_down_menu li a {
+                  padding: 0px;
+                  font-size: 14px;
+                  color: #333;
+              }
+              .drop_down_menu {
+                  width: 121px;
+              }
+              .drop_down_menu li {
+                  overflow: visible;
+                  width: 121px;
+              }
+              .drop_down_menu, .drop_down_normal {
+                  padding-top: 10px;
+                  padding-bottom: 8px;
+              }
+            `}</style>
+            {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
+              导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
+              <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
+                <li><a href={exportResultUrl} className="color-dark">导出成绩</a></li>
+                <li><a href={exportUrl} className="color-dark">导出作品附件</a></li>
+              </ul>
+            </li>:""}
+
+            {/* <a className={"fr color-blue font-16"} href={exportUrl}>导出作品附件</a>
+            <a className={"fr color-blue font-16"} href={exportResultUrl}>导出成绩</a> */}
+            {/*<a className={"fr color-blue font-16"}>导出</a>*/}
+            {end_immediately &&  <a className={"fr color-blue font-16"} onClick={() => { this.endModal.current.open() } }>立即截止</a>}
+            {publish_immediately && <a className={"fr color-blue font-16"} onClick={() => { this.publishModal.current.open() } } >立即发布</a>}
+
+            {/*<a className={"fr color-blue font-16"}>项目在线质量检测</a>*/}
+            {isAdmin && <a className={"fr color-blue font-16"} onClick={() => this.props.toEditPage(this.props.match.params, workId)}>编辑作业</a>}
+        </React.Fragment> : 
+        <React.Fragment>
+            {work_statuses && work_statuses.indexOf('提交作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
+                onClick={() => { this.props.toWorkPostPage(this.props.match.params)}}
+            >提交作品</a>}
+            {work_statuses && work_statuses.indexOf('修改作品') != -1 && <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
+                onClick={() => { this.props.toWorkPostPage(this.props.match.params, null, true, work_id)}}
+            >修改作品</a>}
+            {work_statuses && work_statuses.indexOf('补交附件') != -1 && 
+            <React.Fragment>
+              <AccessoryModal
+                {...this.props}
+                modalname={"补交附件"}
+                visible={accessoryVisible}
+                Cancelname={"取消"}
+                Savesname={"确认"}
+                Cancel={this.Cancelvisible}
+                setupdate={this.setupdate}
+                reviseAttachmentUrl={`/student_works/${work_id}/revise_attachment.json`}
+              />
+              <a className={"fr color-blue font-16"} href={"javascript:void(0)"}
+                  onClick={this.addAccessory}
+              >补交附件</a>
+            </React.Fragment>
+            }
+        </React.Fragment> }
+      </React.Fragment>
+
+    )
+  }
+}
+
 export default TabRightComponents;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
index 1e34838d9..1a966a6e7 100644
--- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
+++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js
@@ -1,5 +1,5 @@
 import React, {Component} from "react";
-import {WordsBtn} from 'educoder';
+import {WordsBtn,markdownToHTML} from 'educoder';
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider,InputNumber, Tag,DatePicker,Radio,Tooltip,Pagination} from "antd";
 import {Link,Switch,Route,Redirect} from 'react-router-dom';
 import axios from 'axios';
@@ -104,7 +104,7 @@ class Exercisestatisticalresult extends Component {
 				</style>
 				<div className={"educontent mb20" }>
 
-					{data&&data.course_groups.length===0?"":<div className="stud-class-set bor-bottom-greyE">
+					{data&&data.course_groups.length===0?"":<div className="stud-class-set">
 						<div className="clearfix edu-back-white">
 							<ul className="clearfix" style={{padding:'20px'}}>
 							<li className="clearfix  mt10">
@@ -180,13 +180,16 @@ class Exercisestatisticalresult extends Component {
 					{data&&data.commit_results.map((item,key)=>{
 
 							 return(
-								<div className="stud-class-set bor-greyE mb20" key={key}>
+								<div className="stud-class-set mb20" key={key}>
 									<div className="clearfix edu-back-white poll_list"  style={{padding: '20px'}}>
 										<div className="font-16 shixunreporttitle  fl" >
-										<span className="CACFF">{item.ques_type===0?"单选":item.ques_type===1?"多选":item.ques_type===2?"判断":item.ques_type===3?"填空":item.ques_type===4?"主观":item.ques_type===5?"实训":""}题</span>
-										<span>Q{item.ques_position}：
-											<span className="markdown-body" dangerouslySetInnerHTML={createMarkup(item.ques_title)}></span>
-										</span>
+										<span className="CACFF">{item.ques_position+"."}{item.ques_type===0?"单选":item.ques_type===1?"多选":item.ques_type===2?"判断":item.ques_type===3?"填空":item.ques_type===4?"主观":item.ques_type===5?"实训":""}题</span>
+										<div>
+											{/*Q{item.ques_position}：*/}
+											<div dangerouslySetInnerHTML={{__html: markdownToHTML(item.ques_title).replace(/▁/g,"▁▁▁")}}></div>
+
+											{/*<span className="markdown-body" dangerouslySetInnerHTML={createMarkup(item.ques_title)}></span>*/}
+										</div>
 										 </div>
 								    <div className="fr shixunreporttitles">正确率<span style={{color:'#FF6800'}}> {item.right_percent}%</span></div>
 									</div>
diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js
index b9122abdc..2a04e1978 100644
--- a/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js
+++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresulttabel.js
@@ -1,181 +1,186 @@
-import React, {Component} from "react";
-import {WordsBtn} from 'educoder';
-import {Table} from "antd";
-import {Link,Switch,Route,Redirect} from 'react-router-dom';
-
-class OfficialAcademicTranscript extends Component {
-
-	constructor(props) {
-		super(props);
-		this.state = {
-			loadingstate:true,
-			datas:undefined
-		}
-	}
-
-	componentDidMount() {
-
-	}
-
-	render() {
-
-		let {data}=this.props;
-		let datas=[];
-		// data&&data.exercise_counts.forEach((item,key)=>{	})
-
-			datas.push({
-				commit_percent:data&&data.exercise_counts.commit_percent,
-				min_score:data&&data.exercise_counts.min_score,
-				max_score:data&&data.exercise_counts.max_score,
-				average_score:data&&data.exercise_counts.average_score,
-				fail_counts:data&&data.exercise_counts.fail_counts,
-				pass_counts:data&&data.exercise_counts.pass_counts,
-				good_counts:data&&data.exercise_counts.good_counts,
-				best_counts:data&&data.exercise_counts.best_counts,
-			})
-
-
-
-		let columns=[{
-			title: '提交率',
-			dataIndex: 'commit_percent',
-			key: 'commit_percent',
-			render: (text, record) => (
-				<span style={{color:'#333333'}}>
-					{record.commit_percent===0?0:(record.commit_percent*100).toFixed(2)}<span className={"font-size12"}>%</span>
-        </span>
-			),
-		}, {
-			title: '最低分',
-			dataIndex: 'min_score',
-			key: 'min_score',
-			render: (text, record) => (
-				<span>
-            <span style={{color:'#333333'}}>{record.min_score}<span className={"font-size12"}>分</span></span>
-        </span>
-			),
-		}, {
-			title: '最高分',
-			dataIndex: 'max_score',
-			key: 'max_score',
-			render: (text, record) => (
-				<span style={{color:'#FF6800'}}>
-					{record.max_score}<span className={"font-size12"}>分</span>
-        </span>
-			),
-		}, {
-			title: '平均分',
-			key: 'average_score',
-			dataIndex: 'average_score',
-
-			render: (text, record) => (
-				<span style={{color:'#333333'}}>
-           	{record.average_score}<span className={"font-size12"}>分</span>
-        </span>
-			),
-		}, {
-			title: '不及格(0-60)',
-			key: 'fail_counts',
-			dataIndex: 'fail_counts',
-			render: (text, record) => (
-				<span style={{color:'#333333'}}>
-         	{record.fail_counts}<span className={"font-size12"}>人</span>
-        </span>
-			),
-		}, {
-			title: '及格(60-70)',
-			key: 'pass_counts',
-			dataIndex: 'pass_counts',
-
-			render: (text, record) => (
-				<span style={{color:'#333333'}}>
-					  {record.pass_counts}<span className={"font-size12"}>人</span>
-        </span>
-			),
-		}, {
-			title: '良好(70-90)',
-			key: 'good_counts',
-			dataIndex: 'good_counts',
-
-			render: (text, record) => (
-				<span>
-					 <span style={{color:'#333333'}}>{record.good_counts}<span className={"font-size12"}>人</span></span>
-        </span>
-			),
-		}, {
-			title: '优秀(90-100)',
-			key: 'best_counts',
-			dataIndex: 'best_counts',
-
-			render: (text, record) => (
-				<span>
-					 <span style={{color:'#FF6800'}}>{record.best_counts}<span className={"font-size12"}>人</span></span>
-        </span>
-			),
-		}];
-		// {
-		// 	title: '调分',
-		// 		key: 'adjustmentminute',
-		// 	dataIndex: 'adjustmentminute',
-		//
-		// 	render: (text, record) => (
-		// 	<span>
-		//          <a>6小时 50分钟 6秒</a>
-		//     </span>
-		// ),
-		// },
-
-
-
-		return (
-			<div>
-				{/*{data===undefined?"":""}*/}
-				<style>{`
-				.ant-table-thead > tr > th{
-				    text-align: center;
-					}
-				.tasknamebox{
-			    width: 50px;
-			    height: 24px;
-			    border: 1px solid rgba(221,23,23,1);
-			    border-radius: 12px;
-			    color: rgba(221,23,23,1);
-			    display: inline-block;
-			    line-height: 24px;
-					}
-
-					.tasknameboxs{
-					   color: #666666 !important;
-					   background:rgba(237,237,237,1) !important;
-					}
-
-				  .ant-table-tbody > tr > td{
-            font-size:14px;
-					}
-					.task-hide{
-					    max-width: 345px;
-					    overflow: hidden;
-					    white-space: nowrap;
-					    text-overflow: ellipsis;
-					}
-					.ant-table-tbody > tr{
-					   height:64px;
-					   text-align: center;
-					}
-
-			`}
-				</style>
-				{datas===undefined?"":<Table
-					dataSource={datas}
-					columns={columns}
-					pagination={false}
-					// loading={loadingstate}
-					// onChange={this.TablePagination}
-				/>}
-			</div>
-
-		)
-	}
-}
-
+import React, {Component} from "react";
+import {WordsBtn} from 'educoder';
+import {Table} from "antd";
+import {Link,Switch,Route,Redirect} from 'react-router-dom';
+
+class OfficialAcademicTranscript extends Component {
+
+	constructor(props) {
+		super(props);
+		this.state = {
+			loadingstate:true,
+			datas:undefined
+		}
+	}
+
+	componentDidMount() {
+
+	}
+
+	render() {
+
+		let {data}=this.props;
+		let datas=[];
+		// data&&data.exercise_counts.forEach((item,key)=>{	})
+
+			datas.push({
+				commit_percent:data&&data.exercise_counts.commit_percent,
+				min_score:data&&data.exercise_counts.min_score,
+				max_score:data&&data.exercise_counts.max_score,
+				average_score:data&&data.exercise_counts.average_score,
+				fail_counts:data&&data.exercise_counts.fail_counts,
+				pass_counts:data&&data.exercise_counts.pass_counts,
+				good_counts:data&&data.exercise_counts.good_counts,
+				best_counts:data&&data.exercise_counts.best_counts,
+			})
+
+
+
+		let columns=[{
+			title: '提交率',
+			dataIndex: 'commit_percent',
+			key: 'commit_percent',
+			render: (text, record) => (
+				<span style={{color:'#333333'}}>
+					{record.commit_percent===0?0:(record.commit_percent*100).toFixed(2)}<span className={"font-size12"}>%</span>
+        </span>
+			),
+		}, {
+			title: '最低分',
+			dataIndex: 'min_score',
+			key: 'min_score',
+			render: (text, record) => (
+				<span>
+            <span style={{color:'#333333'}}>{record.min_score}<span className={"font-size12"}>分</span></span>
+        </span>
+			),
+		}, {
+			title: '最高分',
+			dataIndex: 'max_score',
+			key: 'max_score',
+			render: (text, record) => (
+				<span style={{color:'#FF6800'}}>
+					{record.max_score}<span className={"font-size12"}>分</span>
+        </span>
+			),
+		}, {
+			title: '平均分',
+			key: 'average_score',
+			dataIndex: 'average_score',
+
+			render: (text, record) => (
+				<span style={{color:'#333333'}}>
+           	{record.average_score}<span className={"font-size12"}>分</span>
+        </span>
+			),
+		}, {
+			title: '不及格(0-60)',
+			key: 'fail_counts',
+			dataIndex: 'fail_counts',
+			render: (text, record) => (
+				<span style={{color:'#333333'}}>
+         	{record.fail_counts}<span className={"font-size12"}>人</span>
+        </span>
+			),
+		}, {
+			title: '及格(60-70)',
+			key: 'pass_counts',
+			dataIndex: 'pass_counts',
+
+			render: (text, record) => (
+				<span style={{color:'#333333'}}>
+					  {record.pass_counts}<span className={"font-size12"}>人</span>
+        </span>
+			),
+		}, {
+			title: '良好(70-90)',
+			key: 'good_counts',
+			dataIndex: 'good_counts',
+
+			render: (text, record) => (
+				<span>
+					 <span style={{color:'#333333'}}>{record.good_counts}<span className={"font-size12"}>人</span></span>
+        </span>
+			),
+		}, {
+			title: '优秀(90-100)',
+			key: 'best_counts',
+			dataIndex: 'best_counts',
+
+			render: (text, record) => (
+				<span>
+					 <span style={{color:'#FF6800'}}>{record.best_counts}<span className={"font-size12"}>人</span></span>
+        </span>
+			),
+		}];
+		// {
+		// 	title: '调分',
+		// 		key: 'adjustmentminute',
+		// 	dataIndex: 'adjustmentminute',
+		//
+		// 	render: (text, record) => (
+		// 	<span>
+		//          <a>6小时 50分钟 6秒</a>
+		//     </span>
+		// ),
+		// },
+
+
+
+		return (
+			<div>
+				{/*{data===undefined?"":""}*/}
+				<style>{`
+				.ant-table-thead > tr > th{
+				    text-align: center;
+					}
+				.tasknamebox{
+			    width: 50px;
+			    height: 24px;
+			    border: 1px solid rgba(221,23,23,1);
+			    border-radius: 12px;
+			    color: rgba(221,23,23,1);
+			    display: inline-block;
+			    line-height: 24px;
+					}
+
+					.tasknameboxs{
+					   color: #666666 !important;
+					   background:rgba(237,237,237,1) !important;
+					}
+
+				  .ant-table-tbody > tr > td{
+            font-size:14px;
+					}
+					.task-hide{
+					    max-width: 345px;
+					    overflow: hidden;
+					    white-space: nowrap;
+					    text-overflow: ellipsis;
+					}
+					.ant-table-tbody > tr{
+					   height:64px;
+					   text-align: center;
+					}
+
+					.exerctabel .ant-table-tbody > tr >td{
+					  border:1px solid transparent;
+					}
+
+			`}
+				</style>
+				{datas===undefined?"":<Table
+					className={"exerctabel"}
+					dataSource={datas}
+					columns={columns}
+					pagination={false}
+					// loading={loadingstate}
+					// onChange={this.TablePagination}
+				/>}
+			</div>
+
+		)
+	}
+}
+
 export default OfficialAcademicTranscript;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js
index d3c73baba..b2cd1a1a3 100644
--- a/public/react/src/modules/courses/exercise/Exercisetablesmubu.js
+++ b/public/react/src/modules/courses/exercise/Exercisetablesmubu.js
@@ -66,12 +66,16 @@ class Exercisetablesmubus extends Component {
 				width:'300px',
 				render: (text, record) => (
 				 <span style={{color:'#FF6800'}}>
-					{record.max_score===undefined?"":<Progress
-						strokeColor={{
-							'0%': '#29BD8B',
-							'100%': '#29BD8B',
-						}}
-						percent={record.max_score*100} showInfo={false}  />}
+					{record.max_score===undefined?"":<span>
+						<div style={{
+							float: 'left',
+							width: '220px'
+						}}><Progress
+							strokeColor={{
+								'0%': '#29BD8B',
+								'100%': '#29BD8B',
+							}}
+							percent={record.max_score*100} showInfo={false}/></div><div className={"fr"}>{record.max_score*100}%</div></span>}
         </span>
 			 ),
 		 }];
@@ -125,10 +129,14 @@ class Exercisetablesmubus extends Component {
           }
           .ant-table-tbody > tr > td:nth-child(1){
           		text-align: left;
+          }
+          .Exermubu .ant-table-tbody > tr:nth-last-child(1) > td{
+					  border:1px solid transparent;
           }
 			`}
 				</style>
 				{datas===undefined?"":<Table
+					className={"Exermubu"}
 					dataSource={datas}
 					columns={columns}
 					pagination={false}
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 818c882e7..3726d8a38 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -258,9 +258,9 @@ class Testpapersettinghomepage extends Component{
                                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
                                         <li><a
                                           onClick={()=>this.experiment(`/api/exercises/${this.props.match.params.Id}/exercise_lists.xlsx`)}
-                                          calssName="color-dark">学生成绩</a></li>
-                                        <li><a href={`/api/exercises/${this.props.match.params.Id}/export_exercise`} calssName="color-dark">空白试卷</a></li>
-                                        <li><a calssName="color-dark"
+																					className="color-dark">学生成绩</a></li>
+                                        <li><a href={`/api/exercises/${this.props.match.params.Id}/export_exercise`} className="color-dark">空白试卷</a></li>
+                                        <li><a className="color-dark"
                                           onClick={()=>this.experiment(`/api/zip/export_exercises?exercise_id=${this.props.match.params.Id}${this.state.groupyslsval}`)}
                                         >学生答题试卷</a></li>
                                     </ul>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index 74bf9d868..a49d38212 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -215,7 +215,7 @@ class GraduationTasksSubmitnew extends Component{
 
     let {search} = this.state;
 
-    this.searchList(search,1,10)
+    this.searchList(search,1,20)
 
   }
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 64539adbc..3c9202921 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -240,12 +240,12 @@ class GraduationTasksedit extends Component{
   handleSubmit=(e)=>{
 
     let {fileList}=this.state;
-    if(fileList.length===0){
-      this.setState({
-        shixunsreplace:true,
-      })
-      return
-    }
+    // if(fileList.length===0){
+    //   this.setState({
+    //     shixunsreplace:true,
+    //   })
+    //   return
+    // }
 
      this.Commoninterface(fileList);
   }
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
index 74ba21b62..e6185188a 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksnew.js
@@ -214,13 +214,13 @@ class GraduationTasksnew extends Component {
 	// 提交按钮
 	handleSubmit = (e) => {
 		let {fileList} = this.state;
-		if(fileList.length===0){
-			this.setState({
-				shixunsreplace:true,
-			})
-
-			return
-		}
+		// if(fileList.length===0){
+		// 	this.setState({
+		// 		shixunsreplace:true,
+		// 	})
+		//
+		// 	return
+		// }
 
 		this.Commoninterface(fileList);
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index c2ec26282..b5c34e975 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -1056,13 +1056,16 @@ class GraduationTaskssettingapp extends Component{
 																padding-top: 10px;
 																padding-bottom: 8px;
 														 }
+														 	 .drop_down_menu li .color-dark{
+																	color: #666 !important;
+															}
 													`}
                   </style>
                   {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} calssName="color-dark">导出成绩</a></li>
-                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} calssName="color-dark">导出作品附件</a></li>
+                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">导出成绩</a></li>
+                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">导出作品附件</a></li>
                     </ul>
                   </li>:""}
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 735279a38..1433319b3 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -701,7 +701,7 @@ class GraduationTaskssettinglist extends Component{
 			render: (text, record) => (
 				<span>
              <a style={{color:'#989898'}}>
-	             {record.turnovertime===""?"--":moment(record.turnovertime).format('YYYY-MM-DD HH:mm:ss')}
+	             {record.turnovertime===""?"--":moment(record.turnovertime).format('YYYY-MM-DD HH:mm')}
              </a>
         </span>
 			),
@@ -741,11 +741,11 @@ class GraduationTaskssettinglist extends Component{
 			className:'edu-txt-center',
 			render: (text, record) => (
 				<span>
-			 <Tooltip placement="bottom" title={record.finalscore.work_score==="--"?"未评阅":	<pre>
+			 <Tooltip placement="right" title={record.finalscore.work_score==="--"?"未评阅":	<pre>
 								{record.finalscore.final_score.username}({record.finalscore.final_score.login})<br/>
 							  {record.finalscore.ultimate_score===true?"":"教师评分："+record.finalscore.teacher_comment_score+"分"}<br/>
-				        {record.finalscore.cross_comment_score===undefined?"":"交叉评分："+record.finalscore.cross_comment_score+"分"+<br/>}
-				        {record.finalscore.late_penalty===undefined?"":"迟交扣分："+record.finalscore.late_penalty+"分"+<br/>}
+				        {record.finalscore.cross_comment_score===undefined||record.finalscore.cross_comment_score==="未批阅"?"交叉评分：--":"交叉评分："+record.finalscore.cross_comment_score+"分"}<br/>
+				        {record.finalscore.late_penalty===undefined?"":"迟交扣分："+record.finalscore.late_penalty+"分"}<br/>
 							  最终成绩：{record.finalscore.work_score}分<br/>
 							</pre>}>
 						<a style={{color:parseInt(record.finalscore.work_score)>90?'#DD1717':parseInt(record.finalscore.work_score)>60&&parseInt(record.finalscore.work_score)<90?"#FF6800":'#747A7F'}}>{record.finalscore.work_score==="--"?"--":record.finalscore.work_score}</a>
@@ -1010,13 +1010,16 @@ class GraduationTaskssettinglist extends Component{
 																padding-top: 10px;
 																padding-bottom: 8px;
 														 }
+														 .drop_down_menu li .color-dark{
+																	color: #666 !important;
+															}
 													`}
 											</style>
 											{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
 												导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 												<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} calssName="color-dark">导出成绩</a></li>
-													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} calssName="color-dark">导出作品附件</a></li>
+													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">导出成绩</a></li>
+													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">导出作品附件</a></li>
 												</ul>
 											</li>:""}
 
@@ -1141,17 +1144,28 @@ class GraduationTaskssettinglist extends Component{
 											</ul>
 
 											<div id="graduation_work_list" style={{padding:'0px 40px 10px 40px'}}>
-
+												<style>
+													{
+														`
+														.edu-menu-lists li:hover {
+																	background: #f0f0f0  !important;
+															}
+															.edu-menu-lists li:hover a{
+																			color: #666 !important;
+																	}
+														`
+													}
+												</style>
 												<div className="clearfix">
 													{this.props.isAdmin()===true?<span className="fl color-grey-6 font-12">
 														<span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>
 														个检索结果（{taskslistdata&&taskslistdata.work_count} 学生） </span>:""}
 													{this.props.isAdmin()===true?<div className="fr color-grey-6 edu-menu-panel">
 														<p>
-															<a data-remote="true">
+															<a data-remote="true" class="color-grey-6 font-12">
 															{order==="updated_at"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
 															<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
-														<ul className="edu-menu-list">
+														<ul className="edu-menu-list edu-menu-lists" style={{width: '87px'}}>
 															<li onClick={(e)=>this.funorder("updated_at")}><a data-remote="true">更新时间</a>
 															</li>
 															<li onClick={(e)=>this.funorder("work_score" )}><a  data-remote="true">最终成绩</a>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
index f1a06808c..68934e521 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
@@ -303,13 +303,16 @@ class GraduationTasksquestions extends Component{
 																padding-top: 10px;
 																padding-bottom: 8px;
 														 }
+														 	 .drop_down_menu li .color-dark{
+																	color: #666 !important;
+															}
 													`}
                   </style>
                   {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} calssName="color-dark">导出成绩</a></li>
-                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} calssName="color-dark">导出作品附件</a></li>
+                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">导出成绩</a></li>
+                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">导出作品附件</a></li>
                     </ul>
                   </li>:""}
 
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 04a878dc0..687351934 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -60,6 +60,7 @@ class Listofworks extends Component {
 		this.state = {
 			props: props,
 			data: [],
+			b_order: "desc",
 			page: 1,
 			limit: 20,
 			loadingstate: true,
@@ -385,8 +386,8 @@ class Listofworks extends Component {
 		// course_group:分班情况 [232, 231]， []:不限（空数组）
 		var data = {
 			search: "",
-			order: "desc",
-			b_order: "asc",
+			order: "update_time",
+			b_order: "desc",
 			work_status: "",
 			course_group: "",
 			page:1,
@@ -427,19 +428,26 @@ class Listofworks extends Component {
 		//order 排序时间
 		//debug=t 是老师的意思
 		// console.log(ordervlue)7009
+		let{b_order,order}=this.state;
 		var homeworkid = this.props.match.params.homeworkid;
 		let urll = `/homework_commons/${homeworkid}/works_list.json?`;
-		var order = "asc";
-		if (ordervlue === "updated_at") {
-			order = "desc";
+		var b_orders
+			// = "asc";
+		// if (ordervlue === "updated_at") {
+		// 	b_orders = "desc";
+		// }
+		if(b_order==="asc"){
+			b_orders = "desc";
+		}else{
+			b_orders = "asc";
 		}
 		var checkedValuesines = checkedValuesine;
 		var checkedValuesineinfos = checkedValuesineinfo;
 		var searchtexts = searchtext
 		var data = {
 			search: searchtexts,
-			order: ordervlue,
-			b_order: order,
+			order: order,
+			b_order: b_orders,
 			work_status: checkedValuesines,
 			course_group: checkedValuesineinfos,
 			page: page,
@@ -1274,14 +1282,14 @@ class Listofworks extends Component {
 	}
 	//排序
 	funorder = (e) => {
-		if (e === "updated_at") {
+		if (e === "update_time") {
 			// 时间
 			// 时间排序是从小到大
 			this.setState({
-				order: "updated_at",
+				order: "update_time",
 				loadingstate: true,
 			})
-			this.Startsorting("updated_at", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+			this.Startsorting("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
 		}
 
 		if (e === "work_score") {
@@ -1738,8 +1746,8 @@ class Listofworks extends Component {
 								{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr8 mt20" style={{"padding":"0 20px"}}>
 									导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 									<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-										<li><a href={`/api/student_works/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/export_shixun_work_report.pdf`} calssName="color-dark">实训报告</a></li>
-										<li><a href={`/api/homework_commons/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/works_list.xlsx`} calssName="color-dark">学生成绩</a></li>
+										<li><a href={`/api/student_works/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/export_shixun_work_report.pdf`} className="color-dark">实训报告</a></li>
+										<li><a href={`/api/homework_commons/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}/works_list.xlsx`} className="color-dark">学生成绩</a></li>
 									</ul>
 								</li>:""}
 								{this.props.isAdmin() ?
@@ -1840,10 +1848,10 @@ class Listofworks extends Component {
 									<ul>
 										<li className="edu-position edu-position-hidebox">
 											<a className="font-12 color-grey-6">
-												{order === "updated_at" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
+												{order === "update_time”" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
 											<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
 											<ul className="edu-position-hide undis mt10">
-												<li> <a  onClick={(e) => this.funorder("updated_at")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>
+												<li> <a  onClick={(e) => this.funorder("update_time”")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>
 												<li> <a  onClick={(e) => this.funorder("work_score")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
 												<li> <a  onClick={(e) => this.funorder("student_id")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
 											</ul>

From d7b586fe9ef654b84da28645875e5b100f472803 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, 29 Jun 2019 00:48:01 +0800
Subject: [PATCH 13/39] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworks.js
---
 .../courses/shixunHomework/Listofworks.js        | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 25f122cec..581906575 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -63,7 +63,8 @@ class Listofworks extends Component {
 			page: 1,
 			limit: 20,
 			loadingstate: true,
-			order: "updated_at",
+			order: "update_time",
+			b_order:"desc",
 			search: null,
 			task_status: [],
 			course_group_info: [],
@@ -678,10 +679,11 @@ class Listofworks extends Component {
 		//order 排序时间
 		//debug=t 是老师的意思
 		// console.log(ordervlue)7009
+
 		var homeworkid = this.props.match.params.homeworkid;
 		let urll = `/homework_commons/${homeworkid}/works_list.json?`;
 		var order = "asc";
-		if (ordervlue === "updated_at") {
+		if (ordervlue === "update_time") {
 			order = "desc";
 		}
 		var checkedValuesines = checkedValuesine;
@@ -2031,14 +2033,14 @@ class Listofworks extends Component {
 	}
 	//排序
 	funorder = (e) => {
-		if (e === "updated_at") {
+		if (e === "update_time") {
 			// 时间
 			// 时间排序是从小到大
 			this.setState({
-				order: "updated_at",
+				order: "update_time",
 				loadingstate: true,
 			})
-			this.Startsorting("updated_at", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+			this.Startsorting("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
 		}
 
 		if (e === "work_score") {
@@ -2597,10 +2599,10 @@ class Listofworks extends Component {
 									<ul>
 										<li className="edu-position edu-position-hidebox">
 											<a className="font-12 color-grey-6">
-												{order === "updated_at" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
+												{order === "update_time" ? "时间" : order === "work_score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
 											<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
 											<ul className="edu-position-hide undis mt10">
-												<li> <a  onClick={(e) => this.funorder("updated_at")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>
+												<li> <a  onClick={(e) => this.funorder("update_time")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>更新时间</a></li>
 												<li> <a  onClick={(e) => this.funorder("work_score")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>最终成绩</a></li>
 												<li> <a  onClick={(e) => this.funorder("student_id")} data-remote="true" className="color-grey-6 font-12" style={{"text-align": "center "}}>学生学号</a></li>
 											</ul>

From 7b764d9a19ac37a936121adf5c489e677005747d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 29 Jun 2019 01:09:08 +0800
Subject: [PATCH 14/39] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Shixunworkdetails/ShixunWorkModal.js      | 56 ++++++++++++-------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index 0885c155e..a1dd68ad0 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -28,15 +28,13 @@ class ShixunWorkModal extends Component{
 					group_list:undefined
 				})
 			}else{
-				let newgroup_list=group_list;
+				const newgroup_list=[];
 				response.data.group_list.map((item,key)=>{
 					newgroup_list.push(item)
-					console.log(item);
 				})
-			   response.data.ungroup_list.map((items,keys)=>{
-					 newgroup_list.push(item)
-					 console.log(item);
-				 })
+				if( response.data.ungroup_list!== undefined ||  response.data.ungroup_list !== null){
+					newgroup_list.push(response.data.ungroup_list)
+				}
 				this.setState({
 					course_groups:response.data,
 					group_list:newgroup_list,
@@ -81,17 +79,33 @@ class ShixunWorkModal extends Component{
 					page:newpage,
 				}
 			}).then((response) => {
-				response.data.group_list&&response.data.group_list.map((item,key)=>{
-					newgroup_list.push(item)
-				})
-				response.data.ungroup_list&&response.data.ungroup_list.map((items,keys)=>{
-					newgroup_list.push(items)
-				})
-				this.setState({
-					course_groups:response.data,
-					group_list:newgroup_list,
-					page:newpage
-				})
+				if(response!==null || response!==undefined){
+					if(response.data.group_list.length>0){
+						console.log("84");
+						response.data.group_list.map((item,key)=>{
+							newgroup_list.push(item);
+							this.setState({
+								course_groups:response.data,
+								group_list:newgroup_list,
+								page:newpage
+							})
+						})
+					}
+
+					if(response.data.ungroup_list===undefined ||  response.data.ungroup_list === null) {
+
+					}else {
+						console.log("95");
+						console.log(response.data.ungroup_list);
+						newgroup_list.push(response.data.ungroup_list);
+						this.setState({
+							course_groups:response.data,
+							group_list:newgroup_list,
+							page:newpage
+						})
+					}
+
+				}
 			}).catch((error) => {
 				console.log(error)
 			});
@@ -257,17 +271,17 @@ class ShixunWorkModal extends Component{
 												    <Checkbox
 													    className="fl task-hide edu-txt-left"
 													    name="shixun_homework[]"
-													    value={item.id}
+													    value={item=== undefined?"":item.id}
 												    >
 													    <label style={{"textAlign": "left", "color": "#05101A"}}
-													           className="task-hide color-grey-name" title="frerere">{item.name}</label>
+													           className="task-hide color-grey-name" title="frerere">{item===undefined?"":item.name}</label>
 												    </Checkbox>
 											    </li>
 											    <li className="fl" style={{width: '150px'}}>
-												    {item.works_count}
+												    {item===undefined?"":item.works_count}
 											    </li>
 											    <li className="fl" style={{width: '160px'}}>
-												    {item.last_review_time}
+												    {item===undefined?"":item.last_review_time}
 											    </li>
 										    </div>
 												)

From c4fd0316d4e94ac8f1c6b71c0783c7cac7a0b688 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, 29 Jun 2019 09:13:11 +0800
Subject: [PATCH 15/39] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworks.js
---
 .../coursesPublic/modal/CheckCodeModal.js     | 471 +++++++++---------
 1 file changed, 236 insertions(+), 235 deletions(-)

diff --git a/public/react/src/modules/courses/coursesPublic/modal/CheckCodeModal.js b/public/react/src/modules/courses/coursesPublic/modal/CheckCodeModal.js
index cfc6d1245..e2aa2ab00 100644
--- a/public/react/src/modules/courses/coursesPublic/modal/CheckCodeModal.js
+++ b/public/react/src/modules/courses/coursesPublic/modal/CheckCodeModal.js
@@ -1,235 +1,236 @@
-import React, { Component } from "react";
-import { Modal, Checkbox, Input, Spin, Select, Divider  } from "antd";
-import axios from 'axios'
-import ModalWrapper from "../../common/ModalWrapper"
-import InfiniteScroll from 'react-infinite-scroller';
-import { ConditionToolTip } from 'educoder'
-const Option = Select.Option;
-const pageCount = 15;
-
-// 代码查重弹框
-class CheckCodeModal extends Component{
-  constructor(props){
-    super(props);
-    this.state={
-      checkBoxValues: [],
-      candidates: [],
-      hasMore: true,
-      loading: false,
-      page: 1
-    }
-  }
-  fetchMemberList = (arg_page) => {
-    const courseId = this.props.match.params.coursesId    
-    const page = arg_page || this.state.page;
-    const { name, school_name } = this.state
-    let url = `/courses/${courseId}/search_teacher_candidate.json`
-    this.setState({ loading: true })
-    axios.post(url, {
-      page: page,
-      limit: pageCount,
-      school_name: school_name || '',
-      name: name || ''
-    })
-    .then((response) => {
-      if (!response.data.candidates || response.data.candidates.length == 0) {
-        this.setState({
-          page,
-          loading: false,
-          hasMore: false,
-        })
-      } else {
-        this.setState({
-          candidates: page == 1 ? response.data.candidates : this.state.candidates.concat(response.data.candidates),
-          page,
-          loading: false,
-          hasMore: response.data.candidates.length == pageCount
-        })
-      }
-
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
-  componentDidMount() {
-    
-    
-  }
-  fetchOptions = () => {
-    // add_teacher_popup
-    const courseId = this.props.match.params.coursesId    
-    
-    let url = `/courses/${courseId}/add_teacher_popup.json`
-    
-    axios.get(url, {
-    })
-    .then((response) => {
-      if (response.data.graduation_groups) {
-        this.setState({
-          graduation_groups: response.data.graduation_groups
-        })
-      } 
-      if (response.data.course_groups) {
-        this.setState({
-          course_groups: response.data.course_groups
-        })
-      }
-
-    })
-    .catch(function (error) {
-      console.log(error);
-    });
-  }
-  setVisible = (visible) => {
-    if (visible) {
-      this.fetchMemberList()
-      this.fetchOptions()
-    }
-    this.refs.modalWrapper.setVisible(visible)
-    if (visible == false) {
-      this.setState({
-        checkBoxValues: []
-      })
-    }
-  }
-
-  onSendOk = () => {
-    const courseId = this.props.match.params.coursesId   
-    const url = `/courses/${courseId}/add_teacher.json`
-    const params = { 
-      "user_list": this.state.checkBoxValues.map (item => { return { 'user_id': item }}) ,
-      "graduation_group_id": "2",
-      "course_group_id": "820",
-      // "role": ROLE_TEACHER_NUM
-    }
-    const { graduationGroup, courseGroup } = this.state
-    if (graduationGroup) {
-      params.graduation_group_id = graduationGroup
-    }
-    if (courseGroup) {
-      params.course_group_id = courseGroup
-    }
-    axios.post(url, params)
-    .then((response) => {
-      if (response.data.status == 0) {
-        this.setVisible(false)
-        this.props.showNotification('添加成功')
-      }
-    })
-    .catch(function (error) {
-      console.log(error);
-    }); 
-  }
-
-  onOk = () => {
-    this.onSendOk()
-  }
-
-  onCheckBoxChange = (checkBoxValues) => {
-    this.setState({
-      checkBoxValues: checkBoxValues
-    })
-  }
-
-  handleInfiniteOnLoad = () => {
-    this.fetchMemberList(this.state.page + 1)
-  }
-
-  onSearch = () => {
-    this.fetchMemberList(1)
-  }
-  handleGradationGroupChange = (value) => {
-    this.setState({
-      graduationGroup: value
-    })
-  }
-  handleCourseGroupChange = (value) => {
-    this.setState({
-      courseGroup: value
-    })
-  }
-  render(){
-    const { candidates, checkBoxValues, loading, hasMore, name, school_name
-        , graduationGroup, graduation_groups, courseGroup, course_groups } = this.state
-    const { moduleName } = this.props
-    return(
-      <ModalWrapper
-        ref="modalWrapper"
-        width="700px"
-        title={`代码查重`}
-        {...this.props }
-        onOk={this.onOk}
-        className="checkCodeModal"
-      >
-        <style>
-        {`
-        .demo-loading-container {
-          position: absolute;
-          bottom: 93px;
-          width: 82%;
-          text-align: center;
-        }
-        .df {
-          display: flex;
-          align-items: baseline;
-          margin: 12px 0;
-        }
-        .firstLabel {
-          flex: 0 0 60px;
-        }
-        .df span.label {
-          margin-right: 8px;
-          text-align: right;
-          margin-left: 12px;
-        }
-        .df .ant-input-affix-wrapper {
-          width: 32%;
-        }
-
-        .checkCodeModal label.task-hide {
-          width: 100%;
-        }
-        `}
-        </style>
-        
-        <p className="clearfix mb2" style={{ margin: '0px 15px 6px' }}>
-          <Checkbox className="fl" style={{ visibility: 'hidden' }}  ></Checkbox>
-          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'分班名称'}</label></span>
-          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'有效作品数'}</label></span>
-          <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'上次查重时间'}</label></span>
-          
-        </p>
-        <div>
-          {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
-          <div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
-              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
-
-                { candidates && candidates.map( candidate => {
-                  return (
-                    <p className="clearfix mb7" key={candidate.id}>
-                      <Checkbox className="fl" value={candidate.id} ></Checkbox>
-                      <span className="fl with25">
-                        <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
-                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.name}</label>
-                        </ConditionToolTip>
-                      </span>
-                      <span className="fl with25">
-                        <ConditionToolTip title={candidate.nickname} condition={candidate.nickname && candidate.nickname.length > 12 }>
-                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.nickname}</label>
-                        </ConditionToolTip>
-                      </span>
-                      <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
-                      
-                    </p>
-                  )
-                }) }
-              </Checkbox.Group>
-              
-          </div>
-        </div>
-      </ModalWrapper>
-    )
-  }
-}
-export default CheckCodeModal;
+import React, { Component } from "react";
+import { Modal, Checkbox, Input, Spin, Select, Divider  } from "antd";
+import axios from 'axios'
+import ModalWrapper from "../../common/ModalWrapper"
+import InfiniteScroll from 'react-infinite-scroller';
+import { ConditionToolTip } from 'educoder'
+const Option = Select.Option;
+const pageCount = 15;
+
+// 代码查重弹框
+class CheckCodeModal extends Component{
+  constructor(props){
+    super(props);
+    this.state={
+      checkBoxValues: [],
+      candidates: [],
+      hasMore: true,
+      loading: false,
+      page: 1
+    }
+  }
+  fetchMemberList = (arg_page) => {
+    const courseId = this.props.match.params.coursesId    
+    const page = arg_page || this.state.page;
+    const { name, school_name } = this.state
+    let url = `/courses/${courseId}/search_teacher_candidate.json`
+    this.setState({ loading: true })
+    axios.post(url, {
+      page: page,
+      limit: pageCount,
+      school_name: school_name || '',
+      name: name || ''
+    })
+    .then((response) => {
+      if (!response.data.candidates || response.data.candidates.length == 0) {
+        this.setState({
+          page,
+          loading: false,
+          hasMore: false,
+        })
+      } else {
+        this.setState({
+          candidates: page == 1 ? response.data.candidates : this.state.candidates.concat(response.data.candidates),
+          page,
+          loading: false,
+          hasMore: response.data.candidates.length == pageCount
+        })
+      }
+
+    })
+    .catch(function (error) {
+      console.log(error);
+    }); 
+  }
+  componentDidMount() {
+    
+    
+  }
+  fetchOptions = () => {
+    // add_teacher_popup
+    const courseId = this.props.match.params.coursesId    
+    
+    let url = `/courses/${courseId}/add_teacher_popup.json`
+    
+    axios.get(url, {
+    })
+    .then((response) => {
+      if (response.data.graduation_groups) {
+        this.setState({
+          graduation_groups: response.data.graduation_groups
+        })
+      } 
+      if (response.data.course_groups) {
+        this.setState({
+          course_groups: response.data.course_groups
+        })
+      }
+
+    })
+    .catch(function (error) {
+      console.log(error);
+    });
+  }
+  setVisible = (visible) => {
+    if (visible) {
+      this.fetchMemberList()
+      this.fetchOptions()
+    }
+    this.refs.modalWrapper.setVisible(visible)
+    if (visible == false) {
+      this.setState({
+        checkBoxValues: []
+      })
+    }
+  }
+
+  onSendOk = () => {
+    const courseId = this.props.match.params.coursesId   
+    const url = `/courses/${courseId}/add_teacher.json`
+    const params = { 
+      "user_list": this.state.checkBoxValues.map (item => { return { 'user_id': item }}) ,
+      "graduation_group_id": "2",
+      "course_group_id": "820",
+      // "role": ROLE_TEACHER_NUM
+    }
+    const { graduationGroup, courseGroup } = this.state
+    if (graduationGroup) {
+      params.graduation_group_id = graduationGroup
+    }
+    if (courseGroup) {
+      params.course_group_id = courseGroup
+    }
+    axios.post(url, params)
+    .then((response) => {
+      if (response.data.status == 0) {
+        this.setVisible(false)
+        this.props.showNotification('添加成功')
+      }
+    })
+    .catch(function (error) {
+      console.log(error);
+    }); 
+  }
+
+  onOk = () => {
+    this.onSendOk()
+  }
+
+  onCheckBoxChange = (checkBoxValues) => {
+    this.setState({
+      checkBoxValues: checkBoxValues
+    })
+  }
+
+  handleInfiniteOnLoad = () => {
+    this.fetchMemberList(this.state.page + 1)
+  }
+
+  onSearch = () => {
+    this.fetchMemberList(1)
+  }
+  handleGradationGroupChange = (value) => {
+    this.setState({
+      graduationGroup: value
+    })
+  }
+  handleCourseGroupChange = (value) => {
+    this.setState({
+      courseGroup: value
+    })
+  }
+  render(){
+    const { candidates, checkBoxValues, loading, hasMore, name, school_name
+        , graduationGroup, graduation_groups, courseGroup, course_groups } = this.state
+    const { moduleName } = this.props
+    return(
+      <ModalWrapper
+        ref="modalWrapper"
+        width="700px"
+        title={`代码查重`}
+        {...this.props }
+        onOk={this.onOk}
+        className="checkCodeModal"
+      >
+        <style>
+        {`
+        .demo-loading-container {
+          position: absolute;
+          bottom: 93px;
+          width: 82%;
+          text-align: center;
+        }
+        .df {
+          display: flex;
+          align-items: baseline;
+          margin: 12px 0;
+        }
+        .firstLabel {
+          flex: 0 0 60px;
+        }
+        .df span.label {
+          margin-right: 8px;
+          text-align: right;
+          margin-left: 12px;
+        }
+        .df .ant-input-affix-wrapper {
+          width: 32%;
+        }
+
+        .checkCodeModal label.task-hide {
+          width: 100%;
+        }
+        `}
+        </style>
+        
+        <p className="clearfix mb2" style={{ margin: '0px 15px 6px' }}>
+          <Checkbox className="fl" style={{ visibility: 'hidden' }}  ></Checkbox>
+          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'分班名称'}</label></span>
+          <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'有效作品数'}</label></span>
+          <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'上次查重时间'}</label></span>
+          
+        </p>
+        <div>
+          {/* https://github.com/CassetteRocks/react-infinite-scroller/issues/70 */}
+          <div className="edu-back-skyblue padding10-15" style={{"height":"300px", overflowY: "scroll", overflowAnchor: 'none' }}>
+              <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
+
+                { candidates && candidates.map( candidate => {
+                	console.log(candidates)
+                  return (
+                    <p className="clearfix mb7" key={candidate.id}>
+                      <Checkbox className="fl" value={candidate.id} ></Checkbox>
+                      <span className="fl with25">
+                        <ConditionToolTip title={candidate.name} condition={candidate.name && candidate.name.length > 12 }>
+                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.name}</label>
+                        </ConditionToolTip>
+                      </span>
+                      <span className="fl with25">
+                        <ConditionToolTip title={candidate.nickname} condition={candidate.nickname && candidate.nickname.length > 12 }>
+                          <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.nickname}</label>
+                        </ConditionToolTip>
+                      </span>
+                      <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
+                      
+                    </p>
+                  )
+                }) }
+              </Checkbox.Group>
+              
+          </div>
+        </div>
+      </ModalWrapper>
+    )
+  }
+}
+export default CheckCodeModal;

From 3947693473479b4b7918be3fbcf148edb8cd2969 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, 29 Jun 2019 09:20:58 +0800
Subject: [PATCH 16/39] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworks.js
---
 .../src/modules/courses/coursesPublic/modal/CheckCodeModal.js    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/react/src/modules/courses/coursesPublic/modal/CheckCodeModal.js b/public/react/src/modules/courses/coursesPublic/modal/CheckCodeModal.js
index e2aa2ab00..d38c0a515 100644
--- a/public/react/src/modules/courses/coursesPublic/modal/CheckCodeModal.js
+++ b/public/react/src/modules/courses/coursesPublic/modal/CheckCodeModal.js
@@ -206,7 +206,6 @@ class CheckCodeModal extends Component{
               <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
 
                 { candidates && candidates.map( candidate => {
-                	console.log(candidates)
                   return (
                     <p className="clearfix mb7" key={candidate.id}>
                       <Checkbox className="fl" value={candidate.id} ></Checkbox>

From b2c9c8f5f734b61605883e97abbe36aa1043cc3e 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, 29 Jun 2019 09:21:51 +0800
Subject: [PATCH 17/39] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworks.js
---
 .../shixunHomework/Shixunworkdetails/ShixunWorkModal.js   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index a1dd68ad0..55f44d971 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -154,10 +154,10 @@ class ShixunWorkModal extends Component{
 			this.props.showNotification(`请先选择分班`);
 			return
 		}
-		if(group_ids&&group_ids.length < 2){
-			this.props.showNotification(`有效作品数少于2个，无法查重`);
-			return
-		}
+		// if(group_ids&&group_ids.length < 2){
+		// 	this.props.showNotification(`有效作品数少于2个，无法查重`);
+		// 	return
+		// }
 
 		let url="/homework_commons/"+this.props.match.params.homeworkid+"/homework_code_repeat.json";
 		axios.post(url, {

From 19a1a13dfd098264815efc5f9fdb676e754a6fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 29 Jun 2019 09:22:25 +0800
Subject: [PATCH 18/39] =?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/shixunHomework/Listofworks.js  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 581906575..2fcc21cca 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1933,14 +1933,14 @@ class Listofworks extends Component {
 				loadingstate: true,
 
 			})
-			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, this.state.limit);
 		} else if (checkedValues.length === data.length) {
 			this.setState({
 				unlimited: 0,
 				course_groupyslstwo: [],
 				loadingstate: true,
 			})
-			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, this.state.limit);
 		} else {
 			// console.log(checkedValues);
 			this.setState({
@@ -1948,7 +1948,7 @@ class Listofworks extends Component {
 				unlimited: 1,
 				loadingstate: true
 			})
-			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
+			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, this.state.limit);
 
 
 		}
@@ -1965,9 +1965,9 @@ class Listofworks extends Component {
 				course_groupysls: undefined,
 				checkedValuesineinfo:[],
 				loadingstate: true,
-
+				page: 1,
 			})
-			this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, this.state.page, this.state.limit);
+			this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
 		} else if (checkedValues.length === data.length) {
 			this.setState({
 				unlimitedtwo: 1,
@@ -1975,7 +1975,7 @@ class Listofworks extends Component {
 				checkedValuesineinfo:[],
 				loadingstate: true,
 			})
-			this.Startsorting(this.state.order, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, this.state.page, this.state.limit);
+			this.Startsorting(this.state.order, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, 1, this.state.limit);
 		} else {
 			this.setState({
 				checkedValuesineinfo: checkedValues,
@@ -1983,7 +1983,7 @@ class Listofworks extends Component {
 				unlimitedtwo: 0,
 				loadingstate: true,
 			})
-			this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, this.state.page, this.state.limit);
+			this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
 
 
 		}

From 67e49b2c2df81105fec077dcfe28c6f6e0e82b06 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 09:31:16 +0800
Subject: [PATCH 19/39] page 1

---
 public/react/src/modules/courses/busyWork/CommonWorkList.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 251e39fcb..8484100f4 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -450,17 +450,17 @@ class CommonWorkList extends Component{
   
   }
   teacherCommentOptionChange = (values, isAllChecked) => {
-    this.setState({arg_teacher_comment: isAllChecked ? [] : values}, () => {
+    this.setState({arg_teacher_comment: isAllChecked ? [] : values, page: 1}, () => {
       this.fetchList()
     })
   }
   statusOptionChange = (values, isAllChecked) => {
-    this.setState({arg_work_status: isAllChecked ? [] : values}, () => {
+    this.setState({arg_work_status: isAllChecked ? [] : values, page: 1}, () => {
       this.fetchList()
     })
   }
   courseGroupOptionChange = (values, isAllChecked) => {
-    this.setState({arg_course_group: isAllChecked ? [] : values}, () => {
+    this.setState({arg_course_group: isAllChecked ? [] : values, page: 1}, () => {
       this.fetchList()
     })
   }

From cc1bc813330bce8a65a0eb8099af272414c40709 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 09:35:55 +0800
Subject: [PATCH 20/39] 980px

---
 public/react/src/modules/courses/busyWork/CommonWorkList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 8484100f4..4d5676c5a 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -648,7 +648,7 @@ class CommonWorkList extends Component{
 
               <CheckAllGroup options={options_teacher_comment} label={'你的评阅：'} onChange={this.teacherCommentOptionChange}></CheckAllGroup>
               <CheckAllGroup options={options_status} label={'作品状态：'} onChange={this.statusOptionChange}></CheckAllGroup>
-              {options_course_group.length > 1 && <CheckAllGroup options={options_course_group} label={'分班情况：'} onChange={this.courseGroupOptionChange} checkboxGroupStyle={{width: '86%'}}></CheckAllGroup>}
+              {options_course_group.length > 1 && <CheckAllGroup options={options_course_group} label={'分班情况：'} onChange={this.courseGroupOptionChange} checkboxGroupStyle={{width: '980px'}}></CheckAllGroup>}
 
 
               {/*   value={search} */}

From e5e2e2d4261b6720190a333de62d45a8d6b2a05b 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, 29 Jun 2019 09:37:24 +0800
Subject: [PATCH 21/39] Merge remote-tracking branch 'origin/master'

# Conflicts:
#	public/react/src/modules/courses/shixunHomework/Listofworks.js
---
 .../Shixunworkdetails/ShixunWorkModal.js      | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index 55f44d971..572bc5715 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -21,7 +21,6 @@ class ShixunWorkModal extends Component{
 				page:1,
 			}
 		}).then((response) => {
-			console.log(response);
 			if(response.data.group_list===undefined){
 				this.setState({
 					course_groups:response.data,
@@ -50,19 +49,35 @@ class ShixunWorkModal extends Component{
 
 	//勾选实训
 	shixunhomeworkedit=(checkedValues)=>{
+    let types=false
 		let{group_list}=this.state;
+		group_list.map((item,key)=>{
+			checkedValues.map((list,li)=>{
+				if(item.id===list){
+					if(item.works_count<2){
+						this.props.showNotification(`有效作品数少于2个，无法查重`)
+						types=true
+						return
+					}
+				}
+			})
+
+		})
+
+		if(types===false){
+			if(checkedValues.length===group_list.length){
+				this.setState({
+					onChangetype:true,
+					group_ids:checkedValues
+				})
+			}else{
+				this.setState({
+					group_ids:checkedValues,
+					onChangetype:false
+				})
+			}
+		}
 
-    if(checkedValues.length===group_list.length){
-    	  this.setState({
-		      onChangetype:true,
-		      group_ids:checkedValues
-	      })
-    }else{
-	    this.setState({
-		    group_ids:checkedValues,
-		    onChangetype:false
-	    })
-    }
 	}
 
 	contentViewScroll=(e)=>{

From df193a6c5e230a89859356f0c482d61c06fdc5e0 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 09:43:52 +0800
Subject: [PATCH 22/39] normal

---
 .../src/modules/courses/busyWork/CommonWorkList.js     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 4d5676c5a..46d06e300 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -31,7 +31,7 @@ function renderScore(score, content) {
   } else if (score >= 60) {
     color = '#FF6800'
   }
-  return <a href="javascript:;"  style={{ color, minWidth: '30px', display: 'inline-block', textAlign: 'center' }}>
+  return <a href="javascript:;"  style={{ color, cursor: 'default', minWidth: '30px', display: 'inline-block', textAlign: 'center' }}>
       {score == null || score == undefined || score == '--' ? '--': (content || score)}
     </a>
 }
@@ -105,7 +105,7 @@ function buildColumns(that, student_works) {
           <a href="javascript:;"  
             title={record.student_id}
             style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '100px', display: 'block', overflow: 'hidden'
-                , margin: '0 auto'}}
+                , margin: '0 auto', cursor: 'default'}}
           >{record.student_id}</a>
       </span>
       ),
@@ -121,7 +121,7 @@ function buildColumns(that, student_works) {
 
       render: (text, record) => (
         <span>
-          <a href="javascript:;"  style={{color:'#9A9A9A'}}>{record.group_name}</a>
+          <a href="javascript:;"  style={{color:'#9A9A9A', cursor: 'default'}}>{record.group_name}</a>
         </span>
       ),
     } )
@@ -177,7 +177,7 @@ function buildColumns(that, student_works) {
       }
       return (
       <span>
-        <a href="javascript:;"  style={{color: color}}>
+        <a href="javascript:;"  style={{color: color, cursor: 'default'}}>
           {status === 0 ? "未提交" : status === 1 ? "按时提交" : status === 2 ? "延时提交" : ""}
         </a>
       </span>
@@ -190,7 +190,7 @@ function buildColumns(that, student_works) {
 
     render: (update_time, record) => (
       <span>
-        <a href="javascript:;"  style={{color:'#989898'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a>
+        <a href="javascript:;"  style={{color:'#989898', cursor: 'default'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a>
     </span>
     ),
   }]) 

From f8817e12538fff0868080d0a285c0b60451ed5c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 29 Jun 2019 09:47:41 +0800
Subject: [PATCH 23/39] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../exercise/Studentshavecompletedthelist.js  |    2 +-
 .../courses/shixunHomework/Listofworks.js     | 1144 +----------------
 2 files changed, 40 insertions(+), 1106 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
index 391edb90a..33362df65 100644
--- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
+++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
@@ -829,7 +829,7 @@ class Studentshavecompletedthelist extends Component {
 					width: '76px',
 					render: (text, record) => (
 						<span>
-							 {rrecord.number === "--" ?
+							 {record.number === "--" ?
 								 <a style={{"color": '#999999', "text-align": "center"}}>--</a>
 								 :
 								 <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index 2fcc21cca..f2eaa7696 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -661,7 +661,7 @@ class Listofworks extends Component {
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
 				})
-				this.seacthdata();
+				this.seacthdata(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,1);
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -718,7 +718,7 @@ class Listofworks extends Component {
 					code_review: result.data.code_review,
 					challenges_count:result.data.challenges_count,
 				})
-				this.seacthdata();
+				this.seacthdata(result.data,result.data.student_works,result.data.work_efficiency,result.data.course_group_info,page);
 			}
 
 			// }
@@ -748,227 +748,44 @@ class Listofworks extends Component {
 
 
 	// 设置数据
-	seacthdata = () => {
+	seacthdata = (teacherdata,student_works,work_efficiency,course_group_info) => {
 		let {page, limit} = this.state;
 		let datalist = [];
 		let columns = this.state.columns;
-		if (this.state.teacherdata !== undefined) {
-			for (var i = 0; i < this.state.teacherdata.student_works.length; i++) {
-				var timedata = moment(this.state.teacherdata.student_works[i].update_time).format('YYYY-MM-DD HH:mm');
+		if (teacherdata !== undefined) {
+			for (var i = 0; i < student_works.length; i++) {
+				var timedata = moment(student_works[i].update_time).format('YYYY-MM-DD HH:mm');
 				datalist.push({
-					myid: this.state.teacherdata.student_works[i].id,
+					myid: student_works[i].id,
 					number: (parseInt(page) - 1) * parseInt(limit) + (i + 1),
-					name: this.state.teacherdata.student_works[i].user_name,
-					stduynumber: this.state.teacherdata.student_works[i].student_id,
-					classroom: this.state.teacherdata.student_works[i].group_name,
-					submitstate: this.state.teacherdata.student_works[i].work_status === 0 ? "未提交" : this.state.teacherdata.student_works[i].work_status === 1 ? "按时提交" : this.state.teacherdata.student_works[i].work_status === 2 ? "延时提交" : "未提交",
+					name: student_works[i].user_name,
+					stduynumber: student_works[i].student_id,
+					classroom: student_works[i].group_name,
+					submitstate:student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时提交" :student_works[i].work_status === 2 ? "延时提交" : "未提交",
 					// updatetime:this.state.teacherdata.student_works[i].update_time,
 					// updatetime:"",
 					updatetime: timedata === "Invalid date" ? "--" : timedata,
-					completion:  this.state.teacherdata.student_works[i].complete_count === null ? "0" :this.state.teacherdata.student_works[i].complete_count === undefined ? "0": this.state.teacherdata.student_works[i].complete_count,
-					levelscore: this.state.teacherdata.student_works[i].final_score,
-					efficiencyscore: this.state.teacherdata.student_works[i].eff_score,
-					finalscore: this.state.teacherdata.student_works[i].work_score,
+					completion: student_works[i].complete_count === null ? "0" :student_works[i].complete_count === undefined ? "0": student_works[i].complete_count,
+					levelscore: student_works[i].final_score,
+					efficiencyscore: student_works[i].eff_score,
+					finalscore: student_works[i].work_score,
 					operating: "查看",
-					late_penalty: this.state.teacherdata.student_works[i].late_penalty=== null?"0":this.state.teacherdata.student_works[i].late_penalty === undefined?"0":this.state.teacherdata.student_works[i].late_penalty,
-					ultimate_score:this.state.teacherdata.student_works[i].ultimate_score,
-					user_name: this.state.teacherdata.student_works[i].user_name,
-					user_login: this.state.teacherdata.student_works[i].user_login,
+					late_penalty: student_works[i].late_penalty=== null?"0":student_works[i].late_penalty === undefined?"0":student_works[i].late_penalty,
+					ultimate_score:student_works[i].ultimate_score,
+					user_name: student_works[i].user_name,
+					user_login: student_works[i].user_login,
 				})
 
 			}
 
 			var teacherlist = {  //分页
-				total: this.state.teacherdata.student_works.length, //数据总数量
+				total: student_works.length, //数据总数量
 				pageSize: 20,  //一页显示几条
-				current: this.state.page,
+				current: page,
 			}
-			if (this.state.work_efficiency === false) {
-				if(JSON.stringify(this.state.course_group_info) === "[]"|| this.state.course_group_info === undefined||this.state.course_group_info === null){
+			if (work_efficiency === false) {
+				if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined||course_group_info === null){
 					//这里没有分班 没有 关卡得分 没有效率分
-					{/*	columns = [*/}
-					{/*		{*/}
-					{/*			title: '序号',*/}
-					{/*			dataIndex: 'number',*/}
-					// 			key: 'number',
-					// 			align: 'center',
-					// 			fixed: 'left',
-					// 			width:'100px',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//      <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
-					// </span>
-					// 			)
-					// 		},
-					// 		{
-					// 			title: '姓名',
-					// 			dataIndex: 'name',
-					// 			key: 'name',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//      <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-					// </span>
-					// 			)
-					// 		},
-					// 		{
-					// 			title: '学号',
-					// 			dataIndex: 'stduynumber',
-					// 			key: 'stduynumber',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//      <a style={{
-					// 			 "color": '#9A9A9A',
-					// 			 "text-align": "center"
-					// 		 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
-					// </span>
-					// 			),
-					// 		},
-					// 		{
-					// 			title: '提交状态',
-					// 			dataIndex: 'submitstate',
-					// 			key: 'submitstate',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//      <a style={record.submitstate === "延时提交" ? {
-					// 			 "color": '#DD1717',
-					// 			 "text-align": "center"
-					// 		 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-					// 			 "color": '#747A7F',
-					// 			 "text-align": "center"
-					// 		 }}>{record.submitstate}</a>
-					// </span>
-					// 			)
-					//
-					// 		},
-					// 		{
-					// 			title: '更新时间',
-					// 			dataIndex: 'updatetime',
-					// 			key: 'updatetime',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					// 						<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-					// </span>
-					// 			),
-					// 		},
-					// 		{
-					// 			title: '完成情况',
-					// 			dataIndex: 'completion',
-					// 			key: 'completion',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//
-					// 						<Tooltip placement="bottom" title={<div>
-					// 							<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
-					// 						</div>}>
-					// 							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
-					// 						</Tooltip>
-					//
-					// </span>
-					// 			)
-					// 		},
-					// 		{
-					// 			title: '最终成绩',
-					// 			dataIndex: 'finalscore',
-					// 			key: 'finalscore',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					// 					{
-					// 						record.ultimate_score=== true?
-					// 							<Tooltip placement="bottom" title={<div>
-					// 								<div>{record.user_name}{record.user_login}</div>
-					// 								<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
-					// 							</div>}>
-					// 								{
-					// 									record.finalscore&&record.finalscore==="--"?
-					// 										<a style=
-					// 												 {{
-					// 													 "color": '#9A9A9A',
-					// 													 "text-align": "center"
-					// 												 }}>{record.finalscore}</a>
-					// 										:
-					// 										<a style={parseInt(record.finalscore) <= 60 ? {
-					// 											"color": '#747A7F',
-					// 											"text-align": "center"
-					// 										} : parseInt(record.finalscore) < 90 ? {
-					// 											"color": '#FF6800',
-					// 											"text-align": "center"
-					// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-					// 											"color": '#747A7F',
-					// 											"text-align": "center"
-					// 										}}>{record.finalscore}</a>
-					// 								}
-					// 							</Tooltip>
-					// 							:
-					// 							<Tooltip placement="bottom" title={<div>
-					// 								<div>{record.user_name}{record.user_login}</div>
-					// 								<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
-					// 								<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
-					// 								<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
-					// 								<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
-					// 							</div>}>
-					// 								{
-					// 									record.finalscore&&record.finalscore==="--"?
-					// 										<a style=
-					// 												 {{
-					// 													 "color": '#9A9A9A',
-					// 													 "text-align": "center"
-					// 												 }}>{record.finalscore}</a>
-					// 										:
-					// 										<a style={parseInt(record.finalscore) <= 60 ? {
-					// 											"color": '#747A7F',
-					// 											"text-align": "center"
-					// 										} : parseInt(record.finalscore) < 90 ? {
-					// 											"color": '#FF6800',
-					// 											"text-align": "center"
-					// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-					// 											"color": '#747A7F',
-					// 											"text-align": "center"
-					// 										}}>{record.finalscore}</a>
-					// 								}
-					// 							</Tooltip>
-					//
-					// 					}
-					//        </span>
-					// 			)
-					// 		},
-					// 		{
-					// 			title: '操作',
-					// 			dataIndex: 'operating',
-					// 			key: 'operating',
-					// 			display: 'block',
-					// 			align: 'center',
-					// 			fixed: 'right',
-					// 			width:'100px',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
-					// 					<span>
-					// 						<Tooltip placement="bottom" title={<div>
-					// 							<div>直接调整最终成绩的分数</div>
-					// 							<div>其它评分全部作废</div>
-					// 						</div>}>
-					//                 <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-					// 									 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
-					// 						</Tooltip>
-					//                 <a style={{"display": "block", "text-align": "center"}} className="color-blue"
-					// 									 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
-					//         </span>
-					// 			)
-					// 		},
-					// 	]
 					columns.map((item,key)=>{
 						if(item.title==="分班"){
 							columns.splice(key,1)
@@ -981,190 +798,8 @@ class Listofworks extends Component {
 						}
 					})
 				}else{
-					if(this.state.course_group_info.length < 2){
-						// 		columns = [
-						// 			{
-						// 				title: '序号',
-						// 				dataIndex: 'number',
-						// 				key: 'number',
-						// 				align: 'center',
-						// 				fixed: 'left',
-						// 				width:'100px',
-						// 				className:'font-14',
-						{/*				render: (text, record) => (*/}
-						// 					<span>
-						{/*     <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>*/}
-						{/*</span>*/}
-						{/*				)*/}
-						{/*			},*/}
-						{/*			{*/}
-						{/*				title: '姓名',*/}
-						// 				dataIndex: 'name',
-						// 				key: 'name',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//      <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-						// </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '学号',
-						// 				dataIndex: 'stduynumber',
-						// 				key: 'stduynumber',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//      <a style={{
-						// 			 "color": '#9A9A9A',
-						// 			 "text-align": "center"
-						// 		 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
-						// </span>
-						// 				),
-						// 			},
-						// 			{
-						// 				title: '提交状态',
-						// 				dataIndex: 'submitstate',
-						// 				key: 'submitstate',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//      <a style={record.submitstate === "延时提交" ? {
-						// 			 "color": '#DD1717',
-						// 			 "text-align": "center"
-						// 		 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-						// 			 "color": '#747A7F',
-						// 			 "text-align": "center"
-						// 		 }}>{record.submitstate}</a>
-						// </span>
-						// 				)
-						//
-						// 			},
-						// 			{
-						// 				title: '更新时间',
-						// 				dataIndex: 'updatetime',
-						// 				key: 'updatetime',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						// 						<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-						// </span>
-						// 				),
-						// 			},
-						// 			{
-						// 				title: '完成情况',
-						// 				dataIndex: 'completion',
-						// 				key: 'completion',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//
-						// 						<Tooltip placement="bottom" title={<div>
-						// 							<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
-						// 						</div>}>
-						// 							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
-						// 						</Tooltip>
-						//
-						// </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '最终成绩',
-						// 				dataIndex: 'finalscore',
-						// 				key: 'finalscore',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						// 					{
-						// 						record.ultimate_score=== true?
-						// 							<Tooltip placement="bottom" title={<div>
-						// 								<div>{record.user_name}{record.user_login}</div>
-						// 								<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
-						// 							</div>}>
-						// 								{
-						// 									record.finalscore&&record.finalscore==="--"?
-						// 										<a style=
-						// 												 {{
-						// 													 "color": '#9A9A9A',
-						// 													 "text-align": "center"
-						// 												 }}>{record.finalscore}</a>
-						// 										:
-						// 										<a style={parseInt(record.finalscore) <= 60 ? {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) < 90 ? {
-						// 											"color": '#FF6800',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										}}>{record.finalscore}</a>
-						// 								}
-						// 							</Tooltip>
-						// 							:
-						// 							<Tooltip placement="bottom" title={<div>
-						// 								<div>{record.user_name}{record.user_login}</div>
-						// 								<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
-						// 								<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
-						// 								<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
-						// 								<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
-						// 							</div>}>
-						// 								{
-						// 									record.finalscore&&record.finalscore==="--"?
-						// 										<a style=
-						// 												 {{
-						// 													 "color": '#9A9A9A',
-						// 													 "text-align": "center"
-						// 												 }}>{record.finalscore}</a>
-						// 										:
-						// 										<a style={parseInt(record.finalscore) <= 60 ? {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) < 90 ? {
-						// 											"color": '#FF6800',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										}}>{record.finalscore}</a>
-						// 								}
-						// 							</Tooltip>
-						//
-						// 					}
-						//        </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '操作',
-						// 				dataIndex: 'operating',
-						// 				key: 'operating',
-						// 				display: 'block',
-						// 				align: 'center',
-						// 				fixed: 'right',
-						// 				width:'100px',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
-						// 						<span>
-						// 						<Tooltip placement="bottom" title={<div>
-						// 							<div>直接调整最终成绩的分数</div>
-						// 							<div>其它评分全部作废</div>
-						// 						</div>}>
-						//                 <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-						// 									 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
-						// 						</Tooltip>
-						//                 <a style={{"display": "block", "text-align": "center"}} className="color-blue"
-						// 									 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
-						//         </span>
-						// 				)
-						// 			},
-						// 		]
+					if(course_group_info.length < 2){
+
 						columns.map((item,key)=>{
 							if(item.title==="分班"){
 								columns.splice(key,1)
@@ -1177,206 +812,7 @@ class Listofworks extends Component {
 							}
 						})
 					}else {
-						// 		columns = [
-						// 			{
-						// 				title: '序号',
-						// 				dataIndex: 'number',
-						// 				key: 'number',
-						// 				align: 'center',
-						// 				fixed: 'left',
-						// 				width:'100px',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//      <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
-						// </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '姓名',
-						// 				dataIndex: 'name',
-						// 				key: 'name',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//      <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-						// </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '学号',
-						// 				dataIndex: 'stduynumber',
-						// 				key: 'stduynumber',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//      <a style={{
-						// 			 "color": '#9A9A9A',
-						// 			 "text-align": "center"
-						{/*		 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>*/}
-						{/*</span>*/}
-						{/*				),*/}
-						// 			},
-						// 			{
-						// 				title: '分班',
-						// 				key: 'classroom',
-						{/*				dataIndex: 'classroom',*/}
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						// 				{
-						// 					record.classroom&&record.classroom==="--"?
-						// 						<a style={{"color": '#9A9A9A', "text-align": "center"}}></a>
-						// 						:
-						// 						<a style={{"color": '#07111B', "text-align": "center"}}></a>
-						// 				}
-						// </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '提交状态',
-						// 				dataIndex: 'submitstate',
-						{/*				key: 'submitstate',*/}
-						{/*				align: 'center',*/}
-						{/*				className:'font-14',*/}
-						{/*				render: (text, record) => (*/}
-						{/*					<span>*/}
-						{/*     <a style={record.submitstate === "延时提交" ? {*/}
-						// 			 "color": '#DD1717',
-						// 			 "text-align": "center"
-						// 		 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-						// 			 "color": '#747A7F',
-						// 			 "text-align": "center"
-						// 		 }}>{record.submitstate}</a>
-						// </span>
-						// 				)
-						//
-						// 			},
-						// 			{
-						// 				title: '更新时间',
-						// 				dataIndex: 'updatetime',
-						// 				key: 'updatetime',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						// 						<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-						// </span>
-						// 				),
-						// 			},
-						// 			{
-						// 				title: '完成情况',
-						// 				dataIndex: 'completion',
-						// 				key: 'completion',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//
-						// 						<Tooltip  placement="bottom" title={<div>
-						// 							<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
-						// 						</div>}>
-						// 							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
-						// 						</Tooltip>
-						//
-						// </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '最终成绩',
-						// 				dataIndex: 'finalscore',
-						// 				key: 'finalscore',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						// 					{
-						// 						record.ultimate_score=== true?
-						// 							<Tooltip placement="bottom" title={<div>
-						// 								<div>{record.user_name}{record.user_login}</div>
-						// 								<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
-						// 							</div>}>
-						// 								{
-						// 									record.finalscore&&record.finalscore==="--"?
-						// 										<a style=
-						// 												 {{
-						// 													 "color": '#9A9A9A',
-						// 													 "text-align": "center"
-						// 												 }}>{record.finalscore}</a>
-						// 										:
-						// 										<a style={parseInt(record.finalscore) <= 60 ? {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) < 90 ? {
-						// 											"color": '#FF6800',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										}}>{record.finalscore}</a>
-						// 								}
-						// 							</Tooltip>
-						// 							:
-						// 							<Tooltip placement="bottom" title={<div>
-						// 								<div>{record.user_name}{record.user_login}</div>
-						// 								<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
-						// 								<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
-						// 								<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
-						// 								<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
-						// 							</div>}>
-						// 								{
-						// 									record.finalscore&&record.finalscore==="--"?
-						// 										<a style=
-						// 												 {{
-						// 													 "color": '#9A9A9A',
-						// 													 "text-align": "center"
-						// 												 }}>{record.finalscore}</a>
-						// 										:
-						// 										<a style={parseInt(record.finalscore) <= 60 ? {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) < 90 ? {
-						// 											"color": '#FF6800',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										}}>{record.finalscore}</a>
-						// 								}
-						// 							</Tooltip>
-						//
-						// 					}
-						//        </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '操作',
-						// 				dataIndex: 'operating',
-						// 				key: 'operating',
-						// 				display: 'block',
-						// 				align: 'center',
-						// 				fixed: 'right',
-						// 				width:'100px',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					record.submitstate === "未提交" ? <span style={{color:'#9A9A9A'}}>--</span>:
-						// 						<span>
-						// 						<Tooltip placement="bottom" title={<div>
-						// 							<div>直接调整最终成绩的分数</div>
-						// 							<div>其它评分全部作废</div>
-						// 						</div>}>
-						//                 <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-						// 									 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
-						// 						</Tooltip>
-						//                 <a style={{"display": "block", "text-align": "center"}} className="color-blue"
-						// 									 onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
-						//         </span>
-						// 				)
-						// 			},
-						// 		]
+
 						columns.map((item,key)=>{
 							if(item.title==="关卡得分"){
 								columns.splice(key,1)
@@ -1388,520 +824,16 @@ class Listofworks extends Component {
 					}
 				}
 			}else {
-				if(JSON.stringify(this.state.course_group_info) === "[]"|| this.state.course_group_info === undefined || this.state.course_group_info === null){
-					// 	columns=[
-					// 		{
-					// 			title: '序号',
-					// 			dataIndex: 'number',
-					// 			key: 'number',
-					// 			align: 'center',
-					// 			fixed: 'left',
-					// 			width:'100px',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//       <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
-					//  </span>
-					// 			)
-					// 		},
-					// 		{
-					// 			title: '姓名',
-					// 			dataIndex: 'name',
-					// 			key: 'name',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//       <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-					//  </span>
-					// 			)
-					// 		},
-					// 		{
-					// 			title: '学号',
-					// 			dataIndex: 'stduynumber',
-					// 			key: 'stduynumber',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//       <a style={{
-					// 			 "color": '#9A9A9A',
-					// 			 "text-align": "center"
-					// 		 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
-					//  </span>
-					// 			),
-					// 		},
-					// 		{
-					// 			title: '提交状态',
-					// 			dataIndex: 'submitstate',
-					// 			key: 'submitstate',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//       <a style={record.submitstate === "延时提交" ? {
-					// 			 "color": '#DD1717',
-					// 			 "text-align": "center"
-					// 		 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-					// 			 "color": '#747A7F',
-					// 			 "text-align": "center"
-					// 		 }}>{record.submitstate}</a>
-					//  </span>
-					// 			)
-					//
-					// 		},
-					// 		{
-					// 			title: '更新时间',
-					// 			dataIndex: 'updatetime',
-					// 			key: 'updatetime',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//       <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-					//  </span>
-					// 			),
-					// 		},
-					// 		{
-					// 			title: '完成情况',
-					// 			dataIndex: 'completion',
-					// 			key: 'completion',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					//
-					// 						<Tooltip placement="bottom" title={<div>
-					// 							<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
-					// 						</div>}>
-					// 							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
-					// 						</Tooltip>
-					//
-					//  </span>
-					// 			)
-					// 		},
-					// 		{
-					// 			title: '关卡得分',
-					// 			dataIndex: 'levelscore',
-					// 			key: 'levelscore',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					// <a style={parseInt(record.levelscore) <= 60 ? {
-					//  "color": '#747A7F',
-					//  "text-align": "center"
-					// } : parseInt(record.levelscore) < 90 ? {
-					//  "color": '#FF6800',
-					//  "text-align": "center"
-					// } : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-					//  "color": '#747A7F',
-					//  "text-align": "center"
-					// }}>{record.levelscore}</a>
-					//  </span>
-					// 			)
-					// 		},
-					// 		{
-					// 			title: '效率分',
-					// 			dataIndex: 'efficiencyscore',
-					// 			key: 'efficiencyscore',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					// 					{
-					// 						record.efficiencyscore&& record.efficiencyscore=== "--"?(
-					// 							record.submitstate==="按时提交"?
-					// 								<Tooltip placement="bottom" title={<div>
-					// 									<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
-					// 								</div>}>
-					// 									<a style={{color:"#9A9A9A"}}>
-					// 										--
-					// 									</a>
-					// 								</Tooltip>
-					// 								:
-					// 								record.submitstate==="延时提交"?
-					// 								<Tooltip placement="bottom" title={<div>
-					// 									<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
-					// 								</div>}>
-					// 									<a style={{color:"#9A9A9A"}}>
-					// 										--
-					// 									</a>
-					// 								</Tooltip>
-					// 									:
-					// 										<a style={{color:"#9A9A9A"}}>
-					// 											--
-					// 										</a>
-					// 							)
-					// 							:
-					// 							<a style={parseInt(record.efficiencyscore) <= 60 ? {
-					// 								"color": '#747A7F',
-					// 								"text-align": "center"
-					// 							} : parseInt(record.efficiencyscore) < 90 ? {
-					// 								"color": '#FF6800',
-					// 								"text-align": "center"
-					// 							} : parseInt(record.efficiencyscore) >= 90 ? {
-					// 								"color": '#DD1717',
-					// 								"text-align": "center"
-					// 							} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</a>
-					// 					}
-					//
-					//  </span>
-					//
-					// 			)
-					// 		},
-					// 		{
-					// 			title: '最终成绩',
-					// 			dataIndex: 'finalscore',
-					// 			key: 'finalscore',
-					// 			align: 'center',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				<span>
-					// 					{
-					// 						record.ultimate_score=== true?
-					// 							<Tooltip placement="bottom" title={<div>
-					// 								<div>{record.user_name}{record.user_login}</div>
-					// 								<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
-					// 							</div>}>
-					// 								{
-					// 									record.finalscore&&record.finalscore==="--"?
-					// 										<a style=
-					// 												 {{
-					// 													 "color": '#9A9A9A',
-					// 													 "text-align": "center"
-					// 												 }}>{record.finalscore}</a>
-					// 										:
-					// 										<a style={parseInt(record.finalscore) <= 60 ? {
-					// 											"color": '#747A7F',
-					// 											"text-align": "center"
-					// 										} : parseInt(record.finalscore) < 90 ? {
-					// 											"color": '#FF6800',
-					// 											"text-align": "center"
-					// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-					// 											"color": '#747A7F',
-					// 											"text-align": "center"
-					// 										}}>{record.finalscore}</a>
-					// 								}
-					// 							</Tooltip>
-					// 							:
-					// 							<Tooltip placement="bottom" title={<div>
-					// 								<div>{record.user_name}{record.user_login}</div>
-					// 								<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
-					// 								<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
-					// 								<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
-					// 								<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
-					// 							</div>}>
-					// 								{
-					// 									record.finalscore&&record.finalscore==="--"?
-					// 										<a style=
-					// 												 {{
-					// 													 "color": '#9A9A9A',
-					// 													 "text-align": "center"
-					// 												 }}>{record.finalscore}</a>
-					// 										:
-					// 										<a style={parseInt(record.finalscore) <= 60 ? {
-					// 											"color": '#747A7F',
-					// 											"text-align": "center"
-					// 										} : parseInt(record.finalscore) < 90 ? {
-					// 											"color": '#FF6800',
-					// 											"text-align": "center"
-					// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-					// 											"color": '#747A7F',
-					// 											"text-align": "center"
-					// 										}}>{record.finalscore}</a>
-					// 								}
-					// 							</Tooltip>
-					//
-					// 					}
-					//         </span>
-					// 			)
-					// 		},
-					// 		{
-					// 			title: '操作',
-					// 			dataIndex: 'operating',
-					// 			key: 'operating',
-					// 			display: 'block',
-					// 			align: 'center',
-					// 			fixed: 'right',
-					// 			width:'100px',
-					// 			className:'font-14',
-					// 			render: (text, record) => (
-					// 				record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
-					// 					<span>
-					// 						<Tooltip placement="bottom" title={<div>
-					// 							<div>直接调整最终成绩的分数</div>
-					// 							<div>其它评分全部作废</div>
-					// 						</div>}>
-					//                  <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-					// 									 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
-					// 						</Tooltip>
-					//                 <a style={{"text-align": "center"}} className="color-blue"
-					// 									onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
-					//  </span>
-					// 			)
-					// 		},
-					// 	]
+				if(JSON.stringify(course_group_info) === "[]"|| course_group_info === undefined || course_group_info === null){
+
 					columns.map((item,key)=>{
 						if(item.title==="分班"){
 							columns.splice(key,1)
 						}
 					})
 				}else {
-					if(this.state.course_group_info.length < 2) {
-						// 		columns=[
-						// 			{
-						// 				title: '序号',
-						// 				dataIndex: 'number',
-						// 				key: 'number',
-						// 				align: 'center',
-						// 				fixed: 'left',
-						// 				width:'100px',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//       <a style={{"color": '#07111B', "text-align": "center"}}>{record.number}</a>
-						//  </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '姓名',
-						// 				dataIndex: 'name',
-						// 				key: 'name',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//       <a style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
-						//  </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '学号',
-						// 				dataIndex: 'stduynumber',
-						// 				key: 'stduynumber',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//       <a style={{
-						// 			 "color": '#9A9A9A',
-						// 			 "text-align": "center"
-						// 		 }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</a>
-						//  </span>
-						// 				),
-						// 			},
-						// 			{
-						// 				title: '提交状态',
-						// 				dataIndex: 'submitstate',
-						// 				key: 'submitstate',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//       <a style={record.submitstate === "延时提交" ? {
-						// 			 "color": '#DD1717',
-						// 			 "text-align": "center"
-						// 		 } : record.submitstate === "按时提交" ? {"color": '#29BD8B', "text-align": "center"} : {
-						// 			 "color": '#747A7F',
-						// 			 "text-align": "center"
-						// 		 }}>{record.submitstate}</a>
-						//  </span>
-						// 				)
-						//
-						// 			},
-						// 			{
-						// 				title: '更新时间',
-						// 				dataIndex: 'updatetime',
-						// 				key: 'updatetime',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//       <a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.updatetime}</a>
-						//  </span>
-						// 				),
-						// 			},
-						// 			{
-						// 				title: '完成情况',
-						// 				dataIndex: 'completion',
-						// 				key: 'completion',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						//
-						// 						<Tooltip placement="bottom" title={<div>
-						// 							<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
-						// 						</div>}>
-						// 							<a style={{"color": '#07111B', "text-align": "center"}}>{record.completion+"/"+this.state.challenges_count}</a>
-						// 						</Tooltip>
-						//
-						//  </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '关卡得分',
-						// 				dataIndex: 'levelscore',
-						// 				key: 'levelscore',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						// <a style={parseInt(record.levelscore) <= 60 ? {
-						//  "color": '#747A7F',
-						//  "text-align": "center"
-						// } : parseInt(record.levelscore) < 90 ? {
-						//  "color": '#FF6800',
-						//  "text-align": "center"
-						// } : parseInt(record.levelscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-						//  "color": '#747A7F',
-						//  "text-align": "center"
-						// }}>{record.levelscore}</a>
-						//  </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '效率分',
-						// 				dataIndex: 'efficiencyscore',
-						// 				key: 'efficiencyscore',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						// 					{
-						// 						record.efficiencyscore&& record.efficiencyscore=== "--"?(
-						// 								record.submitstate==="按时提交"?
-						// 									<Tooltip placement="bottom" title={<div>
-						// 										<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
-						// 									</div>}>
-						// 										<a style={{color:"#9A9A9A"}}>
-						// 											--
-						// 										</a>
-						// 									</Tooltip>
-						// 									:
-						// 									record.submitstate==="延时提交"?
-						// 										<Tooltip placement="bottom" title={<div>
-						// 											<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
-						// 										</div>}>
-						// 											<a style={{color:"#9A9A9A"}}>
-						// 												--
-						// 											</a>
-						// 										</Tooltip>
-						// 										:
-						// 										<a style={{color:"#9A9A9A"}}>
-						// 											--
-						// 										</a>
-						// 							)
-						// 							:
-						// 							<a style={parseInt(record.efficiencyscore) <= 60 ? {
-						// 								"color": '#747A7F',
-						// 								"text-align": "center"
-						// 							} : parseInt(record.efficiencyscore) < 90 ? {
-						// 								"color": '#FF6800',
-						// 								"text-align": "center"
-						// 							} : parseInt(record.efficiencyscore) >= 90 ? {
-						// 								"color": '#DD1717',
-						// 								"text-align": "center"
-						// 							} : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}</a>
-						// 					}
-						//
-						//  </span>
-						//
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '最终成绩',
-						// 				dataIndex: 'finalscore',
-						// 				key: 'finalscore',
-						// 				align: 'center',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					<span>
-						// 					{
-						// 						record.ultimate_score=== true?
-						// 							<Tooltip placement="bottom" title={<div>
-						// 								<div>{record.user_name}{record.user_login}</div>
-						// 								<div>{record.finalscore === "--"?<span>最终调整成绩：0分</span> :<span>最终调整成绩：{record.finalscore}分</span>}</div>
-						// 							</div>}>
-						// 								{
-						// 									record.finalscore&&record.finalscore==="--"?
-						// 										<a style=
-						// 												 {{
-						// 													 "color": '#9A9A9A',
-						// 													 "text-align": "center"
-						// 												 }}>{record.finalscore}</a>
-						// 										:
-						// 										<a style={parseInt(record.finalscore) <= 60 ? {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) < 90 ? {
-						// 											"color": '#FF6800',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										}}>{record.finalscore}</a>
-						// 								}
-						// 							</Tooltip>
-						// 							:
-						// 							<Tooltip placement="bottom" title={<div>
-						// 								<div>{record.user_name}{record.user_login}</div>
-						// 								<div>{record.levelscore === "--"?<span>关卡得分：0分</span> :<span>关卡得分：{record.levelscore}分</span>}</div>
-						// 								<div>{record.efficiencyscore === "--"?<span>效率评分：0分</span> :<span>效率评分：{record.efficiencyscore}分</span>}</div>
-						// 								<div>{record.late_penalty === "--"?<span>迟交扣分：0分</span> :<span>迟交扣分：{record.late_penalty}分</span>}</div>
-						// 								<div>{record.finalscore === "--"?<span>最终成绩：0分</span> :<span>最终成绩：{record.finalscore}分</span>}</div>
-						// 							</div>}>
-						// 								{
-						// 									record.finalscore&&record.finalscore==="--"?
-						// 										<a style=
-						// 												 {{
-						// 													 "color": '#9A9A9A',
-						// 													 "text-align": "center"
-						// 												 }}>{record.finalscore}</a>
-						// 										:
-						// 										<a style={parseInt(record.finalscore) <= 60 ? {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) < 90 ? {
-						// 											"color": '#FF6800',
-						// 											"text-align": "center"
-						// 										} : parseInt(record.finalscore) >= 90 ? {"color": '#DD1717', "text-align": "center"} : {
-						// 											"color": '#747A7F',
-						// 											"text-align": "center"
-						// 										}}>{record.finalscore}</a>
-						// 								}
-						// 							</Tooltip>
-						//
-						// 					}
-						//         </span>
-						// 				)
-						// 			},
-						// 			{
-						// 				title: '操作',
-						// 				dataIndex: 'operating',
-						// 				key: 'operating',
-						// 				display: 'block',
-						// 				align: 'center',
-						// 				fixed: 'right',
-						// 				width:'100px',
-						// 				className:'font-14',
-						// 				render: (text, record) => (
-						// 					record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
-						// 						<span>
-						// 						<Tooltip placement="bottom" title={<div>
-						// 							<div>直接调整最终成绩的分数</div>
-						// 							<div>其它评分全部作废</div>
-						// 						</div>}>
-						//                  <a style={this.props.isNotMember() === true ? this.state.mystyles : this.state.mystyle}
-						// 									 onClick={() => this.Viewstudenttraininginformations(record)}>调分</a>
-						// 						</Tooltip>
-						//                 <a style={{"text-align": "center"}} className="color-blue"
-						// 									onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</a>
-						//  </span>
-						// 				)
-						// 			},
-						// 		]
+					if(course_group_info.length < 2) {
+
 						columns.map((item,key)=>{
 							if(item.title==="分班"){
 								columns.splice(key,1)
@@ -1931,26 +863,26 @@ class Listofworks extends Component {
 				unlimited: 0,
 				course_groupyslstwo: [],
 				loadingstate: true,
-
+				page:1,
 			})
-			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, this.state.limit);
+			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		} else if (checkedValues.length === data.length) {
 			this.setState({
 				unlimited: 0,
 				course_groupyslstwo: [],
 				loadingstate: true,
+				page:1,
 			})
-			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, this.state.limit);
+			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		} else {
 			// console.log(checkedValues);
 			this.setState({
 				course_groupyslstwo: checkedValues,
 				unlimited: 1,
-				loadingstate: true
+				loadingstate: true,
+				page:1,
 			})
-			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, this.state.limit);
-
-
+			this.Startsorting(this.state.order, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
 		}
 
 	}
@@ -1974,6 +906,7 @@ class Listofworks extends Component {
 				course_groupysls: undefined,
 				checkedValuesineinfo:[],
 				loadingstate: true,
+				page: 1,
 			})
 			this.Startsorting(this.state.order, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, 1, this.state.limit);
 		} else {
@@ -1982,6 +915,7 @@ class Listofworks extends Component {
 				course_groupysls: checkedValues,
 				unlimitedtwo: 0,
 				loadingstate: true,
+				page: 1,
 			})
 			this.Startsorting(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
 

From 6d05c363fc1f3a98aa8d6c2a61533bf25ee3bf0d 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, 29 Jun 2019 09:54:40 +0800
Subject: [PATCH 24/39] =?UTF-8?q?=E6=9D=83=E9=99=90=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/tpm/TPMIndexHOC.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index fff1ce231..279a0a71d 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -216,7 +216,7 @@ export function TPMIndexHOC(WrappedComponent) {
       // 非课堂成员
       isNotMember = () => {
         // return this.state.coursedata&&this.state.coursedata.course_identity >= 0 &&
-        return this.state.coursedata&&this.state.coursedata.course_identity === 6
+        return this.state.coursedata&&this.state.coursedata.course_identity >6
       }
 
       // setTrialapplication = ()=>{

From 17c4e3e33c9bae425374a02bf80061dc33063056 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 10:13:58 +0800
Subject: [PATCH 25/39] isNotMember

---
 public/react/src/modules/tpm/TPMIndexHOC.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/tpm/TPMIndexHOC.js b/public/react/src/modules/tpm/TPMIndexHOC.js
index fff1ce231..5501ef499 100644
--- a/public/react/src/modules/tpm/TPMIndexHOC.js
+++ b/public/react/src/modules/tpm/TPMIndexHOC.js
@@ -216,7 +216,7 @@ export function TPMIndexHOC(WrappedComponent) {
       // 非课堂成员
       isNotMember = () => {
         // return this.state.coursedata&&this.state.coursedata.course_identity >= 0 &&
-        return this.state.coursedata&&this.state.coursedata.course_identity === 6
+        return this.state.coursedata&&this.state.coursedata.course_identity >= 6
       }
 
       // setTrialapplication = ()=>{

From ce5dfa17ce30ad57dbd579ad9a89e7469289599f Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 10:29:38 +0800
Subject: [PATCH 26/39] no_mr

---
 public/react/src/modules/courses/boards/TopicDetail.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index 0c25910f5..e333c17ee 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -526,8 +526,11 @@ class TopicDetail extends Component {
       const courseId=this.props.match.params.coursesId;
       const boardId = this.props.match.params.boardId
 	    return (
-        <div className="edu-back-white edu-class-container edu-position course-message" id="forum_index_list"> {/* fl with100 */}
+        <div className="edu-back-white edu-class-container edu-position course-message topicDetail" id="forum_index_list"> {/* fl with100 */}
           <style>{`
+            .topicDetail #forum_list .return_btn.no_mr {
+              margin-right: 1px;
+            }
             .independent {
               background: rgb(250, 250, 250);
               padding-bottom: 20px;

From 93fcb44a957dac0daac3abebf15aec1f2c62843e 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, 29 Jun 2019 10:46:31 +0800
Subject: [PATCH 27/39] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tasks/GraduationTasksSubmitedit.js        |  95 ++++++++++------
 .../tasks/GraduationTasksSubmitnew.js         | 101 +++++++++++-------
 .../Shixunworkdetails/ShixunWorkModal.js      |  19 ++--
 3 files changed, 136 insertions(+), 79 deletions(-)

diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index 76ff783d3..63865c577 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -35,6 +35,7 @@ class GraduationTasksSubmitedit extends Component{
       attachments:undefined,
       spinnings:false,
       shixunsreplace:false,
+			limit:20
     }
   }
 
@@ -59,7 +60,7 @@ class GraduationTasksSubmitedit extends Component{
         if(result.data.task_type===1){
 
         }else{
-          this.searchList("",1,10,result.data.task_id)
+          this.searchList("",1,20,result.data.task_id)
         }
 
         this.props.form.setFieldsValue({
@@ -222,15 +223,15 @@ class GraduationTasksSubmitedit extends Component{
 
     let {search,workslist} = this.state;
 
-    this.searchList(search,1,10,workslist.task_id)
+    this.searchList(search,1,20,workslist.task_id)
 
   }
 
-  searchList=(search,page,limit,id)=>{
+  searchList=(search,page,limit,id,types)=>{
+  	let {memberslist}=this.state;
+		let newmemberslist=memberslist
     this.setState({
-      search:search,
-      page:page,
-      limit:10
+
     })
     let newid=id
    if(newid===undefined){
@@ -245,9 +246,28 @@ class GraduationTasksSubmitedit extends Component{
     }).then((result)=>{
 
       if(result.status===200){
-        this.setState({
-          memberslist:result.data
-        })
+				if(types===1){
+					if(result.data.members.length>0) {
+						result.data.members.map((item, key) => {
+							newmemberslist.push(item)
+						})
+					}
+					this.setState({
+						memberslist:newmemberslist,
+						search:search,
+						page:page,
+						limit:limit
+					})
+
+				}else{
+					this.setState({
+						memberslist:result.data.members,
+						search:search,
+						page:page,
+						limit:limit
+					})
+				}
+
       }
 
     }).catch((error)=>{
@@ -265,7 +285,7 @@ class GraduationTasksSubmitedit extends Component{
 
       let newpage=page+2
 
-      this.searchList(search,newpage,limit,workslist.task_id)
+      this.searchList(search,newpage,limit,workslist.task_id,1)
 
     }
 
@@ -274,7 +294,7 @@ class GraduationTasksSubmitedit extends Component{
 
   funtaskstatus=(checkedValues)=>{
     let{memberslist,selectobjct}=this.state;
-    let newlist =memberslist.members;
+    let newlist =memberslist;
     let newcheckedValues=checkedValues;
     let selects=[];
 
@@ -666,8 +686,8 @@ class GraduationTasksSubmitedit extends Component{
                     text-overflow:ellipsis;
                     white-space:nowrap
                 }
-                .width87{
-                    width: 87px;
+                .width100{
+                    width: 100px;
     								height: 24px;
                 }
                 img.edu-nodata-img {
@@ -675,22 +695,25 @@ class GraduationTasksSubmitedit extends Component{
 										margin: 50px 90px 20px;
 										display: block;
 								}
+									.autos{
+										 overflow: auto;
+								}
               `}</style>
                   </Form.Item>
                   <div className={"ml20 mt10"} style={{width:"100%"}}>
 
 
-                    <div className={"members fl"}
+                    <div className={"members fl autos"}
 												 style={{paddingLeft: '9px'}}
                          onScroll={this.contentViewScroll}>
 
                       <CheckboxGroup value={task_status} onChange={this.funtaskstatus} style={{ paddingTop: '4px'}}>
-												{memberslist===undefined?"":memberslist.members.length===0? 	<div className="square-list clearfix">
+												{memberslist===undefined?"":memberslist.length===0? 	<div className="square-list clearfix">
 													<div className="edu-tab-con-box clearfix edu-txt-center">
 														<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
 														<p className="edu-nodata-p mb20">未找到包含{search}的学生</p>
 													</div>
-												</div>:memberslist&&memberslist.members.map((item,key)=>{
+												</div>:memberslist&&memberslist.map((item,key)=>{
                           return(
                             <div key={key} style={{
                               width: '375px',
@@ -703,9 +726,9 @@ class GraduationTasksSubmitedit extends Component{
 																					})
 																				}
 																				disabled={item.commit_status===true?true:false}  className="fl "></Checkbox>
-                              <div className={"fl ml5 fonthidden width87"} style={{width: '70px'}} title={item.user_name}>{item.user_name}</div>
-                              <div className={"fl ml5 fonthidden width87 color-grey-9"}  style={{width: '70px'}}>{item.group_name}</div>
-                              <div className={"fl ml5 color-grey-9 fonthidden width87"}  style={{width: '70px'}}>{item.student_id}</div>
+                              <div className={"fl ml5 fonthidden width100"} style={{width: '70px'}} title={item.user_name}>{item.user_name}</div>
+                              <div className={"fl ml5 fonthidden width100 color-grey-9"}  style={{width: '70px'}}>{item.group_name}</div>
+                              <div className={"fl ml5 color-grey-9 fonthidden width100"}  style={{width: '70px'}}>{item.student_id}</div>
                               <div className={"fl ml20"}>{item.commit_status===false?<span className={"color-orange"}>已提交</span> :""}</div>
                             </div>
                           )
@@ -719,22 +742,30 @@ class GraduationTasksSubmitedit extends Component{
                       <i className={"iconfont icon-youjiang fl ml20 mr20"}></i>
                     </div>
 
-                    <div className={"members fl"}>
+                    <div className={"members fl autos"}>
 
                       {selectmemberslist&&selectmemberslist.map((item,key)=>{
-                        return(
-                          <div key={key} style={{
-                            width: '375px',
-                            height: '30px',
-                            display:item.user_name===undefined?"none":""
-                          }}>
-														<div className={"fl ml5 fonthidden width87"} style={{width: '50px'}} title={item.user_name}>{item.user_name}</div>
-                            <div className={"fl ml5 fonthidden width87 color-grey-9"}>{item.group_name}</div>
-                            <div className={"fl ml5 color-grey-9 fonthidden width87"}>{item.student_id}</div>
-                            {key>0?<div className={"fr ml20"}><i className={"iconfont icon-shanchudiao fl  color-grey-9"} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
-                          </div>
-                        )
+												if(item.group_name!=undefined) {
+													return (
+														<div key={key} style={{
+															width: '375px',
+															height: '30px',
+															display: item.user_name === undefined ? "none" : ""
+														}}>
+															<div className={"fl ml5 fonthidden width100"} style={{width: '50px'}}
+																	 title={item.user_name}>{item.user_name}</div>
+															<div className={"fl ml5 fonthidden width100 color-grey-9"}>{item.group_name}</div>
+															<div className={"fl ml5 color-grey-9 fonthidden width100"}>{item.student_id}</div>
+															{key > 0 ?
+																<div className={"fr ml20"}><i className={"iconfont icon-shanchudiao fl  color-grey-9"}
+																															style={{marginTop: '-4px'}}
+																															onClick={() => this.delecttask_status(item.user_id)}></i>
+																</div> : ""}
+														</div>
+													)
+												}
                       })}
+
                     </div>
 
 
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index a49d38212..87044ee61 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -32,7 +32,8 @@ class GraduationTasksSubmitnew extends Component{
          selectobjct:undefined,
          Loadtype:false,
          spinnings:false,
-         shixunsreplace:false
+         shixunsreplace:false,
+				 limit:20
        }
     }
 
@@ -58,7 +59,7 @@ class GraduationTasksSubmitnew extends Component{
             if(result.data.task_type===1){
 
             }else{
-              this.searchList("",1,10)
+              this.searchList("",1,20)
             }
             this.setState({
               workslist:result.data,
@@ -219,25 +220,42 @@ class GraduationTasksSubmitnew extends Component{
 
   }
 
-  searchList=(search,page,limit)=>{
-      this.setState({
-        search:search,
-        page:page,
-        limit:10
-      })
+  searchList=(search,page,limit,types)=>{
     let id=this.props.match.params.task_Id;
+    let {memberslist}=this.state;
+    let newmemberslist=memberslist
     let url="/graduation_tasks/"+id+"/graduation_works/search_member_list.json";
+
     axios.post(url,{
       search:search,
       page:page,
-      limit:limit
+      limit:15
     }).then((result)=>{
 
       if(result.status===200){
         if(result.data.status!=403){
-          this.setState({
-            memberslist:result.data
-          })
+					if(types===1){
+						if(result.data.members.length>0){
+							result.data.members.map((item,key)=>{
+								newmemberslist.push(item)
+							})
+						}
+						this.setState({
+							memberslist:newmemberslist,
+							search:search,
+							page:page,
+							limit:limit
+						})
+
+					}else{
+						this.setState({
+							memberslist:result.data.members,
+							search:search,
+							page:page,
+							limit:limit
+						})
+					}
+
         }
       }
 
@@ -256,7 +274,7 @@ class GraduationTasksSubmitnew extends Component{
 
        let newpage=page+2
 
-      this.searchList(search,newpage,limit)
+      this.searchList(search,newpage,limit,1)
 
     }
 
@@ -265,7 +283,7 @@ class GraduationTasksSubmitnew extends Component{
 
   funtaskstatus=(checkedValues)=>{
    let{memberslist,selectobjct}=this.state;
-   let newlist =memberslist.members;
+   let newlist =memberslist;
    let newcheckedValues=checkedValues;
    let selects=[];
     selects.push(selectobjct)
@@ -318,7 +336,7 @@ class GraduationTasksSubmitnew extends Component{
 
         let {search} = this.state;
 
-        this.searchList(search,1,10)
+        this.searchList(search,1,20)
       }
   }
   onSearchKeywordKeyUps= (e)=>{
@@ -648,8 +666,8 @@ render(){
                     text-overflow:ellipsis;
                     white-space:nowrap
                 }
-                .width87{
-                    width: 87px;
+                .width100{
+                    width: 100px;
     								height: 24px;
                 }
                 img.edu-nodata-img {
@@ -657,21 +675,25 @@ render(){
 										margin: 50px 90px 20px;
 										display: block;
 								}
+								.autos{
+										 overflow: auto;
+								}
               `}</style>
 
           <div className={"ml20"} style={{width:"100%"}}>
 
-            <div className={"members fl"}
+            <div className={"members fl autos"}
 								 style={{paddingLeft: '9px'}}
                  onScroll={this.contentViewScroll}>
               <CheckboxGroup value={task_status} onChange={this.funtaskstatus} style={{ paddingTop: '4px'}}>
-                {memberslist===undefined?"":memberslist.members.length===0?
+                {memberslist===undefined?"":memberslist.length===0?
 									<div className="square-list clearfix">
 										<div className="edu-tab-con-box clearfix edu-txt-center">
 											<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-											<p className="edu-nodata-p mb20">未找到包含{search}的学生</p>
+											{/*<p className="edu-nodata-p mb20">未找到包含{search}的学生</p>*/}
+											<p className="edu-nodata-p mb20">未找到该学生</p>
 										</div>
-									</div>:memberslist&&memberslist.members.map((item,key)=>{
+									</div>:memberslist&&memberslist.map((item,key)=>{
 
                   return(
                     <div key={key} style={{
@@ -684,9 +706,9 @@ render(){
 												})
                       }
 										   disabled={item.commit_status===true?true:false}  className="fl "></Checkbox>
-											<div className={"fl ml5 fonthidden width87"} title={item.user_name} >{item.user_name}</div>
-                      <div className={"fl ml5 fonthidden width87 color-grey-9"} title={item.group_name}>{item.group_name}</div>
-                      <div className={"fl ml5 color-grey-9 fonthidden width87"} title={item.student_id}>{item.student_id}</div>
+											<div className={"fl ml5 fonthidden width100"} title={item.user_name} >{item.user_name}</div>
+                      <div className={"fl ml5 fonthidden width100 color-grey-9"} title={item.group_name}>{item.group_name}</div>
+                      <div className={"fl ml5 color-grey-9 fonthidden width100"} title={item.student_id}>{item.student_id}</div>
                       <div className={"fl ml20"}>{item.commit_status===true?<span className={"color-orange"}>已提交</span> :""}</div>
                     </div>
                   )
@@ -704,22 +726,25 @@ render(){
                     white-space:nowrap
                 }
               `}</style>
-            <div className={"members fl"}>
+            <div className={"members fl autos"}>
 
               {selectmemberslist&&selectmemberslist.map((item,key)=>{
-                return(
-                  <div key={key} style={{
-                    width: '375px',
-                    height: '30px',
-                    display:item.user_name===undefined?"none":""
-                  }}>
-                    <div className={"fl ml5 fonthidden width87"} title={item.user_name}>{item.user_name}</div>
-                    <div className={"fl ml5 fonthidden width87 color-grey-9"}>{item.group_name}</div>
-                    <div className={"fl ml5 color-grey-9 fonthidden width87"}>{item.student_id}</div>
-                    {key>0?<div className={"fr ml20"}><i className={"iconfont icon-shanchudiao fl  color-grey-9 "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
-
-                  </div>
-                )
+								if(item.group_name!=undefined){
+									return(
+										<div key={key} style={{
+											width: '375px',
+											height: '30px',
+											display:item.user_name===undefined?"none":""
+										}}>
+											<div className={"fl ml5 fonthidden width100"} title={item.user_name}>{item.user_name}</div>
+											<div className={"fl ml5 fonthidden width100 color-grey-9"}>{item.group_name}</div>
+											<div className={"fl ml5 color-grey-9 fonthidden width100"}>{item.student_id}</div>
+											{key>0?<div className={"fr ml20"}><i className={"iconfont icon-shanchudiao fl  color-grey-9 "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
+
+										</div>
+									)
+								}
+
               })}
             </div>
 
diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
index 572bc5715..8b7bbb544 100644
--- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
+++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js
@@ -52,16 +52,17 @@ class ShixunWorkModal extends Component{
     let types=false
 		let{group_list}=this.state;
 		group_list.map((item,key)=>{
-			checkedValues.map((list,li)=>{
-				if(item.id===list){
-					if(item.works_count<2){
-						this.props.showNotification(`有效作品数少于2个，无法查重`)
-						types=true
-						return
+			if(item!=undefined){
+				checkedValues.map((list,li)=>{
+					if(item.id===list){
+						if(item.works_count<2){
+							this.props.showNotification(`有效作品数少于2个，无法查重`)
+							types=true
+							return
+						}
 					}
-				}
-			})
-
+				})
+			}
 		})
 
 		if(types===false){

From dc0051145ac18ba650069a39391c2667f3419ba3 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, 29 Jun 2019 11:01:59 +0800
Subject: [PATCH 28/39] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/Resource/index.js            | 2 +-
 .../src/modules/courses/exercise/ExerciseReviewAndAnswer.js   | 2 +-
 public/react/src/modules/courses/poll/Poll.js                 | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/Resource/index.js b/public/react/src/modules/courses/Resource/index.js
index c4b5d10b0..e2d6d1618 100644
--- a/public/react/src/modules/courses/Resource/index.js
+++ b/public/react/src/modules/courses/Resource/index.js
@@ -668,7 +668,7 @@ class Fileslists extends Component{
                   <div style={{"display":"inline-block", "marginTop": "22px"}}>
                     <span>共 {total_count} 个资源</span>
                     <span style={{"marginLeft":"16px"}}>已发布：{public_count}个</span>
-                    {this.props.isAdmin()||this.props.isStudent()?<span style={{"marginLeft":"16px"}}>未发布：{private_count}个</span>:""}
+                    <span style={{"marginLeft":"16px"}}>未发布：{private_count}个</span>
                   </div>
                 }
                 onPressEnter={this.onPressEnter}
diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
index b9da3f2eb..31c293659 100644
--- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
+++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js
@@ -561,7 +561,7 @@ class ExerciseReviewAndAnswer extends Component{
           </p>
           {
             exercise && exercise.exercise_description &&
-            <p className="color-grey-3 edu-back-white padding15 edu-txt-center mt30">{exercise.exercise_description}</p>
+            <p className="color-grey-3 edu-back-white padding15 mt30">{exercise.exercise_description}</p>
           }
           <p className="padding20-30 clearfix">
             {
diff --git a/public/react/src/modules/courses/poll/Poll.js b/public/react/src/modules/courses/poll/Poll.js
index a41f65ccd..0170cac00 100644
--- a/public/react/src/modules/courses/poll/Poll.js
+++ b/public/react/src/modules/courses/poll/Poll.js
@@ -523,9 +523,7 @@ class Poll extends Component{
             <p className="fl font-16" style={{"marginTop":"27px"}}>
               <span className="mr20">共{polls_counts && polls_counts.polls_total_counts}个问卷</span>
               <span className="mr20">已发布：{polls_counts && polls_counts.polls_published_counts}个</span>
-              {
-                isAdmin && <span>未发布：{polls_counts && polls_counts.polls_unpublish_counts}个</span>
-              }              
+              <span>未发布：{polls_counts && polls_counts.polls_unpublish_counts}个</span>
             </p>
             <div className="fr mt16 mb16 searchView">
               <Search

From 4387c9083da04c465e2bed3bf786c9d33ceb3bfc Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 11:09:45 +0800
Subject: [PATCH 29/39] css

---
 public/react/src/modules/comment/Comment.css  |  1 +
 .../src/modules/courses/boards/TopicDetail.js |  8 +++-
 .../modules/courses/common/CommentsHelper.js  |  4 +-
 .../courses/common/comments/CommonReply.js    |  2 +-
 .../tasks/GraduationTaskssettingReply.js      |  2 +-
 .../graduation/topics/GraduateTopicReply.js   |  2 +-
 .../src/modules/forums/MemoDetailMDEditor.js  |  6 +--
 public/react/src/scripts/concat.js            | 48 +++++++++++++++++++
 8 files changed, 63 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/comment/Comment.css b/public/react/src/modules/comment/Comment.css
index 2f85846b6..f21a9c8cf 100644
--- a/public/react/src/modules/comment/Comment.css
+++ b/public/react/src/modules/comment/Comment.css
@@ -238,6 +238,7 @@
     width: 100%;
     word-wrap: break-word;
     margin-bottom: 4px;
+    margin-top: 4px;
 }
 .childComment .break_word_comments{
     line-height: 22px;
diff --git a/public/react/src/modules/courses/boards/TopicDetail.js b/public/react/src/modules/courses/boards/TopicDetail.js
index e333c17ee..325bbde0d 100644
--- a/public/react/src/modules/courses/boards/TopicDetail.js
+++ b/public/react/src/modules/courses/boards/TopicDetail.js
@@ -416,7 +416,7 @@ class TopicDetail extends Component {
           
           const user = this._getUser();
           this.setState({
-            comments: addNewComment(comments, _id, content, user)
+            comments: addNewComment(comments, _id, content, user, this)
           })
           const newMemo2 = Object.assign({}, this.state.memo);
           newMemo2.total_replies_count = newMemo2.total_replies_count + 1;
@@ -531,6 +531,10 @@ class TopicDetail extends Component {
             .topicDetail #forum_list .return_btn.no_mr {
               margin-right: 1px;
             }
+            /* 有内容时，编辑器下方的边框*/
+            .topicDetail .borderBottom.commentInputs {
+              border-bottom: 1px solid rgb(238, 238, 238);
+            }
             .independent {
               background: rgb(250, 250, 250);
               padding-bottom: 20px;
@@ -661,7 +665,7 @@ class TopicDetail extends Component {
                     </div>
                     
                       <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么" 
-                          height={160} showError={true} buttonText={'发表'}></MemoDetailMDEditor>
+                          height={160} showError={true} buttonText={'发表'} className={comments && comments.length && 'borderBottom'}></MemoDetailMDEditor>
 
                   {/*  onClick={ this.createNewComment } 
                         enableReplyTo={true}
diff --git a/public/react/src/modules/courses/common/CommentsHelper.js b/public/react/src/modules/courses/common/CommentsHelper.js
index b4254445d..e513263bc 100644
--- a/public/react/src/modules/courses/common/CommentsHelper.js
+++ b/public/react/src/modules/courses/common/CommentsHelper.js
@@ -64,13 +64,13 @@ export function handleContentBeforeCreateNew(argContent) {
   return content
 }
 
-export function addNewComment(comments, _id, content, user, isSuperAdmin) {
+export function addNewComment(comments, _id, content, user, isSuperAdmin, parentComponent) {
   if (!comments) {
     comments = [];
   }
   comments.unshift( {
     "can_delete": true,
-    "admin": user.admin,
+    "admin": parentComponent ? parentComponent.props.isAdmin() : user.admin ,
     isSuperAdmin: isSuperAdmin,
     "content": content,
 
diff --git a/public/react/src/modules/courses/common/comments/CommonReply.js b/public/react/src/modules/courses/common/comments/CommonReply.js
index 739e62c97..dae21949c 100644
--- a/public/react/src/modules/courses/common/comments/CommonReply.js
+++ b/public/react/src/modules/courses/common/comments/CommonReply.js
@@ -76,7 +76,7 @@ class CommonReply extends Component{
         const isSuperAdmin = this.props.isSuperAdmin()
         
         this.setState({
-          comments: addNewComment(this.state.comments, _id, content, user, isSuperAdmin),
+          comments: addNewComment(this.state.comments, _id, content, user, isSuperAdmin, this),
           total_count: this.state.total_count + 1
         })
         this.refs.editor.showEditor();
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingReply.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingReply.js
index 664c4a629..4281d0ec6 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingReply.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingReply.js
@@ -73,7 +73,7 @@ class GraduationTaskssettingReply extends Component{
         
         const user = this._getUser();
         this.setState({
-          comments: addNewComment(this.state.comments, _id, content, user),
+          comments: addNewComment(this.state.comments, _id, content, user, this.props.isSuperAdmin(), this),
           total_count: this.state.total_count + 1
         })
         this.refs.editor.showEditor();
diff --git a/public/react/src/modules/courses/graduation/topics/GraduateTopicReply.js b/public/react/src/modules/courses/graduation/topics/GraduateTopicReply.js
index 114efa213..4e318a0c1 100644
--- a/public/react/src/modules/courses/graduation/topics/GraduateTopicReply.js
+++ b/public/react/src/modules/courses/graduation/topics/GraduateTopicReply.js
@@ -67,7 +67,7 @@ class GraduateTopicReply extends Component{
         
         const user = this._getUser();
         this.setState({
-          comments: addNewComment(this.state.comments, _id, content, user),
+          comments: addNewComment(this.state.comments, _id, content, user, this.props.isSuperAdmin(), this),
           total_count: this.state.total_count + 1
         })
         this.refs.editor.showEditor();
diff --git a/public/react/src/modules/forums/MemoDetailMDEditor.js b/public/react/src/modules/forums/MemoDetailMDEditor.js
index 6fd650cea..68445b0d7 100644
--- a/public/react/src/modules/forums/MemoDetailMDEditor.js
+++ b/public/react/src/modules/forums/MemoDetailMDEditor.js
@@ -117,7 +117,7 @@ class MemoDetailMDEditor extends Component {
 		this.initMDEditor()
 	}
 	render() {
-		const { match, history, memo, placeholder } = this.props
+		const { match, history, memo, placeholder, className } = this.props
 		const { isInited, errorMsg } = this.state
 		if (!memo) {
 			return <div></div>
@@ -154,7 +154,7 @@ class MemoDetailMDEditor extends Component {
 						}
 					`}</style>
 					<div style={{ display: isInited ? 'none' : '', borderBottom: `${this.props.commentsLength == 0 ? 'none' : '1px solid #EEEEEE'}`}} 
-								className="mockInputWrapper commentInput" >
+								className={`mockInputWrapper commentInput ${className}`} >
 						<input onClick={this.onMockInputClick} placeholder={placeholder || '我要回复'}></input>
 						<a href="javascript:void(0)" 
 								onClick={this.onMockInputClick}	className="commentsbtn task-btn task-btn-blue">
@@ -172,7 +172,7 @@ class MemoDetailMDEditor extends Component {
 							`
 						} */}
 					</style>
-					<div nhname={`new_message_${memo.id}`} className="commentInput  commentInputs"
+					<div nhname={`new_message_${memo.id}`} className={`commentInput  commentInputs ${className}`}
 							style={{ padding: '30px',boxSizing:"border-box", display: isInited ? '' : 'none', paddingBottom: '40px' }} >
 						<div id="memo_comment_editorMd" className="editorMD" style={{ marginBottom: '0px'
 								, border: errorMsg ? '1px solid red' : '1px solid #ddd'}}>
diff --git a/public/react/src/scripts/concat.js b/public/react/src/scripts/concat.js
index 3a40eef91..67e8d4836 100644
--- a/public/react/src/scripts/concat.js
+++ b/public/react/src/scripts/concat.js
@@ -97,3 +97,51 @@ return;
 
 // var uglified = uglify.minify(['file1.js', 'file2.js', 'file3.js']);
 
+
+
+/**
+	优化
+	underscore被单独加载了，去掉'D:\\Code\\trustieplus\\public\\react\\public\\js\\editormd\\underscore.min.js',
+    marked  
+		raphaeljs  sequence diagrams 1.0.4
+
+
+	统计 js_min_all加载的js：
+	https://github.com/paulmillr/es6-shim
+	jQuery v1.8.3 jquery.com 
+	Underscore.js 1.8.2
+	marked v0.3.3
+	？？？
+	Raphaël 2.1.3 - JavaScript Vector Library   
+	flowchart, v1.3.4
+	editormd.js 
+	CodeMirror
+	cm   active-line.js
+	cm   mode javascript
+	cm   merge.js
+	CodeMirror addon hint 
+	cm   showHint
+	cm   anyword-hint 
+	CodeMirror python
+	CodeMirror c-like(java)
+	CodeMirror matchbrackets
+
+
+
+	？？？——>
+	// Copyright (C) 2006 Google Inc.
+	//
+	// Licensed under the Apache License, Version 2.0 (the "License");
+	// you may not use this file except in compliance with the License.
+	// You may obtain a copy of the License at
+	//
+	//      http://www.apache.org/licenses/LICENSE-2.0
+	//
+	// Unless required by applicable law or agreed to in writing, software
+	// distributed under the License is distributed on an "AS IS" BASIS,
+	// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+	// See the License for the specific language governing permissions and
+	// limitations under the License.
+
+
+ */
\ No newline at end of file

From 53379b34877b56348b65521f86e6fb1a30650f47 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 13:44:55 +0800
Subject: [PATCH 30/39] css

---
 .../src/modules/comment/CommentItemMDEditor.js  | 17 ++++++++++-------
 public/react/src/modules/comment/Comments.js    |  1 +
 .../courses/common/comments/CCommentItem.js     |  2 +-
 .../modules/courses/common/courseMessage.css    |  4 +++-
 .../graduation/tasks/Graduationtaskitem.js      |  2 +-
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/comment/CommentItemMDEditor.js b/public/react/src/modules/comment/CommentItemMDEditor.js
index 3c89d0800..98afa4228 100644
--- a/public/react/src/modules/comment/CommentItemMDEditor.js
+++ b/public/react/src/modules/comment/CommentItemMDEditor.js
@@ -96,7 +96,7 @@ class CommentItemMDEditor extends Component {
 	}
 
   	render() {
-  		const { match, history, item, user } = this.props
+  		const { match, history, item, user, buttonText } = this.props
   		if (!item) {
   			return <div></div>
   		}
@@ -111,7 +111,7 @@ class CommentItemMDEditor extends Component {
 	              	</a>
               	</div>
 		    	<div id={`reply_message_${item.id}`} className="reply_to_message commentItemMDEditor"
-		    		style={{ paddingTop: '0px', paddingBottom: '20px', marginTop: '36px' }} 
+		    		style={{ paddingTop: '0px', paddingBottom: '0px', marginTop: '36px' }} 
 		        >
 	                <div id={`reply_message_editorMd_${item.id}`} className="editorMD" style={{ marginBottom: '0px'}}>
 	                    <textarea style={{'display': 'none'}}>
@@ -119,11 +119,14 @@ class CommentItemMDEditor extends Component {
 	              	</div>
 	              	<div className="editor__resize" href="javascript:void(0);" style={{display: ''}}>调整高度</div>
 
-		          	<a id={`commitBtn_${item.id}`} href="javascript:void(0)" 
-		          			onClick={this.onCommit} style={{ marginRight: '44px' }}
-		                    className="commentsbtn task-btn task-btn-blue  fr " style={{display: ''}}>
-		                发送
-		          	</a>
+					<div class="clearfix">
+						<a id={`commitBtn_${item.id}`} href="javascript:void(0)" 
+								onClick={this.onCommit} style={{ marginRight: '44px' }}
+								className="commentsbtn task-btn task-btn-blue  fr " style={{display: ''}}>
+							{ buttonText || '发送'}
+						</a>
+					</div>
+		          	
 		        </div>
 	        </div>
       	);
diff --git a/public/react/src/modules/comment/Comments.js b/public/react/src/modules/comment/Comments.js
index 711ece6fa..ec7d6a5a8 100644
--- a/public/react/src/modules/comment/Comments.js
+++ b/public/react/src/modules/comment/Comments.js
@@ -408,6 +408,7 @@ class Comments extends Component {
 		                          	currentReplyComment={currentReplyComment}
 		                          	item={item}
 		                          	user={user}
+									buttonText={this.props.buttonText}
 		                          >
 		                          </CommentItemMDEditor>
 		                      }
diff --git a/public/react/src/modules/courses/common/comments/CCommentItem.js b/public/react/src/modules/courses/common/comments/CCommentItem.js
index 183ef6ea5..d9b1b7927 100644
--- a/public/react/src/modules/courses/common/comments/CCommentItem.js
+++ b/public/react/src/modules/courses/common/comments/CCommentItem.js
@@ -175,7 +175,7 @@ class CCommentItem extends Component{
 								
 			// src={getImageUrl(`images/${item.image_url}`)} 
 			return (
-				<div className="comment_item_cont df clearfix" key={item.id}>
+				<div className="comment_item_cont appraise df clearfix" key={item.id}>
 					<div className="J_Comment_Face fl">
 						{item.is_appeal_info == true ? 
 							<a href={`javascript:void(0)`} target="_blank">
diff --git a/public/react/src/modules/courses/common/courseMessage.css b/public/react/src/modules/courses/common/courseMessage.css
index fede51ded..3aa9c57df 100644
--- a/public/react/src/modules/courses/common/courseMessage.css
+++ b/public/react/src/modules/courses/common/courseMessage.css
@@ -38,8 +38,10 @@
   margin-top: 8px;
 }
 .course-message .comment_item_cont:last-child {
-  /* 作品评阅需要 */
   border-bottom: none;
+}
+.course-message .appraise.comment_item_cont:last-child {
+  /* 作品评阅需要 */
   padding-bottom: 0px;
 }
 
diff --git a/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js b/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js
index 973f1b9ba..aff66494b 100644
--- a/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js
+++ b/public/react/src/modules/courses/graduation/tasks/Graduationtaskitem.js
@@ -17,7 +17,7 @@ class Graduationtaskitem extends Component{
 		let { item }=this.props;
 		const _content = item.content && this.parseCommentContent(item.content)
 		return(
-			<div className="comment_item_cont df clearfix" key={item.id}>
+			<div className="comment_item_cont appraise df clearfix" key={item.id}>
 				<div className="J_Comment_Face fl">
 					<a href={`${_origin}/users/${item.user_login}`} target="_blank">
 						<img alt="用户头像" height="50" src={getImageUrl(`images/${item.image_url}`)} width="50"/>

From c3ee5dde1595d5141ff41166b002c1ffd83db382 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 14:01:20 +0800
Subject: [PATCH 31/39] =?UTF-8?q?=E9=A2=98=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/exercise/new/JudgeEditor.js  | 4 ++--
 public/react/src/modules/courses/exercise/new/MainEditor.js   | 2 +-
 public/react/src/modules/courses/exercise/new/NullEditor.js   | 4 ++--
 public/react/src/modules/courses/exercise/new/SingleEditor.js | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/new/JudgeEditor.js b/public/react/src/modules/courses/exercise/new/JudgeEditor.js
index a5571aab4..f43312f5e 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeEditor.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeEditor.js
@@ -55,7 +55,7 @@ class SingleEditor extends Component{
     // TODO check
     const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
     if(!question_title) {
-      this.props.showNotification('请先输入题目题干'); return;
+      this.props.showNotification('题目不能为空'); return;
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
@@ -69,7 +69,7 @@ class SingleEditor extends Component{
       this.props.showNotification('请先点击本题的正确选项'); return;
     }
     if(!question_title) {
-      this.props.showNotification('请先输入题目题干'); return;
+      this.props.showNotification('题目不能为空'); return;
     }
 
     /**
diff --git a/public/react/src/modules/courses/exercise/new/MainEditor.js b/public/react/src/modules/courses/exercise/new/MainEditor.js
index e3574a3d5..52d3e24bc 100644
--- a/public/react/src/modules/courses/exercise/new/MainEditor.js
+++ b/public/react/src/modules/courses/exercise/new/MainEditor.js
@@ -45,7 +45,7 @@ class MainEditor extends Component{
     // TODO check
     const answerArray = standard_answers
     if(!question_title) {
-      this.props.showNotification('请先输入题目题干'); return;
+      this.props.showNotification('题目不能为空'); return;
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
diff --git a/public/react/src/modules/courses/exercise/new/NullEditor.js b/public/react/src/modules/courses/exercise/new/NullEditor.js
index d996a524d..e5a00794e 100644
--- a/public/react/src/modules/courses/exercise/new/NullEditor.js
+++ b/public/react/src/modules/courses/exercise/new/NullEditor.js
@@ -69,7 +69,7 @@ class NullEditor extends Component{
     // const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
     let answerArray = []
     if(!question_title) {
-      this.props.showNotification('请先输入题目题干'); return;
+      this.props.showNotification('题目不能为空'); return;
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
@@ -97,7 +97,7 @@ class NullEditor extends Component{
       return;
     }
     if(!question_title) {
-      this.props.showNotification('请先输入题目题干'); return;
+      this.props.showNotification('题目不能为空'); return;
     }
 
     /**
diff --git a/public/react/src/modules/courses/exercise/new/SingleEditor.js b/public/react/src/modules/courses/exercise/new/SingleEditor.js
index 8cbcdec06..ee8d3c204 100644
--- a/public/react/src/modules/courses/exercise/new/SingleEditor.js
+++ b/public/react/src/modules/courses/exercise/new/SingleEditor.js
@@ -87,7 +87,7 @@ class SingleEditor extends Component{
     // TODO check
     const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
     if(!question_title) {
-      this.props.showNotification('请先输入题目题干'); return;
+      this.props.showNotification('题目不能为空'); return;
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
@@ -101,7 +101,7 @@ class SingleEditor extends Component{
       this.props.showNotification('请先点击选择本选择题的正确选项'); return;
     }
     if(!question_title) {
-      this.props.showNotification('请先输入题目题干'); return;
+      this.props.showNotification('题目不能为空'); return;
     }
 
     for(let i = 0; i < question_choices.length; i++) {

From 7b84e5a91cb7ed7ba1ad6454cf52b6223b8b0cf1 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 15:14:49 +0800
Subject: [PATCH 32/39] =?UTF-8?q?=E7=BA=A2=E6=A1=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/common/components/markdown/DMDEditor.js | 17 ++++++++++++++---
 .../modules/courses/exercise/new/JudgeEditor.js |  5 +++++
 .../modules/courses/exercise/new/MainEditor.js  |  5 ++++-
 .../courses/exercise/new/NullChildEditor.js     |  5 +++++
 .../modules/courses/exercise/new/NullEditor.js  | 10 +++++++++-
 .../courses/exercise/new/NullMDEditor.js        |  5 ++++-
 .../courses/exercise/new/SingleEditor.js        | 10 ++++++++++
 .../modules/tpm/challengesnew/TPMMDEditor.js    | 17 +++++++++++++----
 8 files changed, 64 insertions(+), 10 deletions(-)

diff --git a/public/react/src/common/components/markdown/DMDEditor.js b/public/react/src/common/components/markdown/DMDEditor.js
index ef86b49e7..b9435176f 100644
--- a/public/react/src/common/components/markdown/DMDEditor.js
+++ b/public/react/src/common/components/markdown/DMDEditor.js
@@ -39,18 +39,29 @@ class DMDEditor extends Component{
   onChange = (val) => {
     //   this.setState({ value: val })
     this.props.onChange(val)
+    if (this.state.showError == true) {
+      this.setState({showError: false})
+    }
+  }
+  showError = () => {
+    this.mdRef.current.showError()
+    this.setState({showError: true})
   }
   render(){
-    const { mdMode } = this.state;
+    const { mdMode, showError } = this.state;
     const { initValue } = this.props;
-    
+    let _style = {}
+    if (showError) {
+        _style.border = '1px solid red'
+    }
+    _style = Object.assign(_style, {display: mdMode == true ? 'none' : '', color: initValue? '': '#999', alignItems: 'center',  wordBreak: 'break-all'})
     return(
       <React.Fragment>
         <style>{`
             
         `}</style>
         <div id="content_editorMd_show" className="new_li content_editorMd_show" 
-                style={{display: mdMode == true ? 'none' : '', color: initValue? '': '#999', alignItems: 'center',  wordBreak: 'break-all'}}
+                style={_style}
                 dangerouslySetInnerHTML={{__html: initValue ? markdownToHTML(initValue):this.props.placeholder}}
                 onClick={this.toMDMode}
         >
diff --git a/public/react/src/modules/courses/exercise/new/JudgeEditor.js b/public/react/src/modules/courses/exercise/new/JudgeEditor.js
index f43312f5e..280faa2e3 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeEditor.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeEditor.js
@@ -55,7 +55,9 @@ class SingleEditor extends Component{
     // TODO check
     const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
     if(!question_title) {
+      this.refs['titleEditor'].showError()
       this.props.showNotification('题目不能为空'); return;
+
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
@@ -69,7 +71,9 @@ class SingleEditor extends Component{
       this.props.showNotification('请先点击本题的正确选项'); return;
     }
     if(!question_title) {
+      this.refs['titleEditor'].showError()
       this.props.showNotification('题目不能为空'); return;
+
     }
 
     /**
@@ -185,6 +189,7 @@ class SingleEditor extends Component{
 
             <TPMMDEditor mdID={`question_${question_id}`} placeholder="请您输入题目" height={155} watch={false}
               initValue={question_title} onChange={(val) => this.setState({ question_title: val})}
+              ref="titleEditor"
             ></TPMMDEditor>
             
             <div>
diff --git a/public/react/src/modules/courses/exercise/new/MainEditor.js b/public/react/src/modules/courses/exercise/new/MainEditor.js
index 52d3e24bc..9f6e643df 100644
--- a/public/react/src/modules/courses/exercise/new/MainEditor.js
+++ b/public/react/src/modules/courses/exercise/new/MainEditor.js
@@ -45,7 +45,10 @@ class MainEditor extends Component{
     // TODO check
     const answerArray = standard_answers
     if(!question_title) {
+      this.refs['titleEditor'].showError()
       this.props.showNotification('题目不能为空'); return;
+
+
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
@@ -151,7 +154,7 @@ class MainEditor extends Component{
 
             <TPMMDEditor mdID={`question_${question_id}`} placeholder="请您输入题目" height={155} watch={false}
               initValue={question_title} onChange={(val) => this.setState({ question_title: val})}
-              noStorage={true}
+              noStorage={true} ref="titleEditor"
             ></TPMMDEditor>
             
             <div>
diff --git a/public/react/src/modules/courses/exercise/new/NullChildEditor.js b/public/react/src/modules/courses/exercise/new/NullChildEditor.js
index 434211f1d..9e50e2ad3 100644
--- a/public/react/src/modules/courses/exercise/new/NullChildEditor.js
+++ b/public/react/src/modules/courses/exercise/new/NullChildEditor.js
@@ -35,6 +35,10 @@ class NullChildEditor extends Component{
   //   this.mdReactObject = that;
   // }
 
+  showError = (itemIndex) => {
+    this.refs[`nullChildDMDEditor${itemIndex}`].showError()
+  }
+
   render() {
     let { question_title, question_score, question_type, question_choices, standard_answers } = this.state;
     let { question_id, index, onAnswerChange, addChildAnswer, toMDMode, exerciseIsPublish, 
@@ -49,6 +53,7 @@ class NullChildEditor extends Component{
                     return <div className="df flex1" >
                     <div className="flex1" style={{ flex: '0 0 1000px'}}>
                       <DMDEditor
+                          ref={`nullChildDMDEditor${itemIndex}`}
                           className={'nullChildEditor'}
                           placeholder={`请输入参考答案${itemIndex == 0 ?'':'(可选)'}`}
                           toMDMode={toMDMode} noStorage={true}
diff --git a/public/react/src/modules/courses/exercise/new/NullEditor.js b/public/react/src/modules/courses/exercise/new/NullEditor.js
index e5a00794e..dddadcf0a 100644
--- a/public/react/src/modules/courses/exercise/new/NullEditor.js
+++ b/public/react/src/modules/courses/exercise/new/NullEditor.js
@@ -69,7 +69,9 @@ class NullEditor extends Component{
     // const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
     let answerArray = []
     if(!question_title) {
+      this.refs['titleEditor'].showError()
       this.props.showNotification('题目不能为空'); return;
+
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
@@ -88,6 +90,7 @@ class NullEditor extends Component{
       answers.forEach((item, itemIndex) => {
         answerArray[index].answer_text.push(item)
         if(!item) {
+          this.refs[`nullChildEditor${index}`].showError(itemIndex)
           this.props.showNotification(`请先输入第${index+1}个填空的第${itemIndex+1}参考答案。`); 
           isEmpty = true;
         }
@@ -97,7 +100,9 @@ class NullEditor extends Component{
       return;
     }
     if(!question_title) {
+      this.refs['titleEditor'].showError()
       this.props.showNotification('题目不能为空'); return;
+
     }
 
     /**
@@ -294,13 +299,16 @@ class NullEditor extends Component{
             <NullMDEditor {...this.props} mdID={`question_${question_id}`} placeholder="请您输入题目" height={155} watch={false}
               initValue={question_title} onChange={(val) => this.setState({ question_title: val})}
               onPlaceholderChange={this.onPlaceholderChange} showNullButton={exerciseIsPublish ? false : true}
+              ref="titleEditor"
             ></NullMDEditor>
             
             <div className="clearfix">
               {
                 standard_answers.map((answers, index) => {
 
-                  return <NullChildEditor {...this.props}
+                  return <NullChildEditor 
+                    ref={`nullChildEditor${index}`}
+                    {...this.props}
                     toMDMode={this.toMDMode}
                     answers={answers}
                     index={index}
diff --git a/public/react/src/modules/courses/exercise/new/NullMDEditor.js b/public/react/src/modules/courses/exercise/new/NullMDEditor.js
index 1bdec3677..d7d93bddb 100644
--- a/public/react/src/modules/courses/exercise/new/NullMDEditor.js
+++ b/public/react/src/modules/courses/exercise/new/NullMDEditor.js
@@ -84,7 +84,9 @@ export default class NullMDEditor extends Component {
         
     }
 
-
+    showError = () => {
+      this.refs['nullMDEditor'].showError()
+    }
     render() {
 
         let {
@@ -94,6 +96,7 @@ export default class NullMDEditor extends Component {
         return (
             <TPMMDEditor {...this.props}
                 onCMBeforeChange={this.onCMBeforeChange}
+                ref='nullMDEditor'
             >    
             </TPMMDEditor>
         )
diff --git a/public/react/src/modules/courses/exercise/new/SingleEditor.js b/public/react/src/modules/courses/exercise/new/SingleEditor.js
index ee8d3c204..a9e8aa3f5 100644
--- a/public/react/src/modules/courses/exercise/new/SingleEditor.js
+++ b/public/react/src/modules/courses/exercise/new/SingleEditor.js
@@ -87,7 +87,10 @@ class SingleEditor extends Component{
     // TODO check
     const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
     if(!question_title) {
+      this.refs['titleEditor'].showError()
       this.props.showNotification('题目不能为空'); return;
+
+
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
@@ -101,11 +104,15 @@ class SingleEditor extends Component{
       this.props.showNotification('请先点击选择本选择题的正确选项'); return;
     }
     if(!question_title) {
+      this.refs['titleEditor'].showError()
       this.props.showNotification('题目不能为空'); return;
+
+
     }
 
     for(let i = 0; i < question_choices.length; i++) {
       if (!question_choices[i]) {
+        this.refs[`optionEditor${i}`].showError()
         this.props.showNotification(`请先输入 ${tagArray[i]} 选项的内容`); return;
       }
     }
@@ -237,6 +244,8 @@ class SingleEditor extends Component{
 
             <TPMMDEditor mdID={qNumber} placeholder="请您输入题目" height={155} watch={false} className="mb20"
               initValue={question_title} onChange={(val) => this.setState({ question_title: val})}
+              ref="titleEditor"
+
             ></TPMMDEditor>
             
             {question_choices.map( (item, index) => {
@@ -254,6 +263,7 @@ class SingleEditor extends Component{
                 {/* </Tooltip> */}
                 <div style={{ flex: '0 0 1038px'}}>
                 <DMDEditor 
+                  ref={`optionEditor${index}`}
                   toMDMode={this.toMDMode} toShowMode={this.toShowMode}
                   height={166} className={'optionMdEditor'} watch={false} noStorage={true}
                   mdID={qNumber + index} placeholder="" onChange={(value) => this.onOptionContentChange(value, index)}
diff --git a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
index 223065864..46f3a4128 100644
--- a/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
+++ b/public/react/src/modules/tpm/challengesnew/TPMMDEditor.js
@@ -239,7 +239,9 @@ export default class TPMMDEditor extends Component {
             }
             __editorName.cm.on("change", (_cm, changeObj) => {
                 that.contentChanged = true;
-
+                if (that.state.showError) {
+                    that.setState({showError: false})
+                }
                 that.onEditorChange()
             })
             that.props.onCMBlur && __editorName.cm.on('blur', () => {
@@ -256,6 +258,9 @@ export default class TPMMDEditor extends Component {
         }, this);
         
     }
+    showError = () => {
+        this.setState({showError: true})
+    }
     onEditorChange = () => {
         if (!this.answers_editormd) return;
         const val = this.answers_editormd.getValue();
@@ -297,14 +302,18 @@ export default class TPMMDEditor extends Component {
     render() {
 
         let {
-            choice_url,
+            showError
         } = this.state;
         let { mdID, className, noStorage } = this.props;
+        let _style = {}
+        if (showError) {
+            _style.border = '1px solid red'
+        }
         return (
             <React.Fragment>
-                <div className={`df ${className}`}>
+                <div className={`df ${className}`} >
                 {/* padding10-20  */}
-                    <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`}>
+                    <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`} style={{..._style}}>
                         <textarea style={{display: 'none'}}  id="evaluate_script_show" name="content"></textarea>
                         <div className="CodeMirror cm-s-defualt">
                         </div>

From 14a638c34ecd7648aa2b2b7a943ddc8d6be6fac9 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 15:23:39 +0800
Subject: [PATCH 33/39] =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/exercise/new/JudgeEditor.js   | 10 +++++-----
 .../src/modules/courses/exercise/new/MainEditor.js    |  6 +++---
 .../src/modules/courses/exercise/new/NullEditor.js    | 11 ++++++-----
 .../src/modules/courses/exercise/new/ShixunEditor.js  |  2 +-
 .../src/modules/courses/exercise/new/SingleEditor.js  |  4 ++--
 5 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/public/react/src/modules/courses/exercise/new/JudgeEditor.js b/public/react/src/modules/courses/exercise/new/JudgeEditor.js
index 280faa2e3..586d77ed0 100644
--- a/public/react/src/modules/courses/exercise/new/JudgeEditor.js
+++ b/public/react/src/modules/courses/exercise/new/JudgeEditor.js
@@ -56,23 +56,23 @@ class SingleEditor extends Component{
     const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
     if(!question_title) {
       this.refs['titleEditor'].showError()
-      this.props.showNotification('题目不能为空'); return;
+      this.props.showNotification('题目：不能为空'); return;
 
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
-      this.props.showNotification('分值不能为空'); return;
+      this.props.showNotification('分值：不能为空'); return;
     } else {
       if (intScore == 0) {
-        this.props.showNotification('分值必须大于0'); return;
+        this.props.showNotification('分值：必须大于0'); return;
       }
     }
     if(!answerArray || answerArray.length == 0) {
-      this.props.showNotification('请先点击本题的正确选项'); return;
+      this.props.showNotification('必须设置标准答案'); return;
     }
     if(!question_title) {
       this.refs['titleEditor'].showError()
-      this.props.showNotification('题目不能为空'); return;
+      this.props.showNotification('题目：不能为空'); return;
 
     }
 
diff --git a/public/react/src/modules/courses/exercise/new/MainEditor.js b/public/react/src/modules/courses/exercise/new/MainEditor.js
index 9f6e643df..e9dd3b105 100644
--- a/public/react/src/modules/courses/exercise/new/MainEditor.js
+++ b/public/react/src/modules/courses/exercise/new/MainEditor.js
@@ -46,16 +46,16 @@ class MainEditor extends Component{
     const answerArray = standard_answers
     if(!question_title) {
       this.refs['titleEditor'].showError()
-      this.props.showNotification('题目不能为空'); return;
+      this.props.showNotification('题目：不能为空'); return;
 
 
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
-      this.props.showNotification('分值不能为空'); return;
+      this.props.showNotification('分值：不能为空'); return;
     } else {
       if (intScore == 0) {
-        this.props.showNotification('分值必须大于0'); return;
+        this.props.showNotification('分值：必须大于0'); return;
       }
     }
     // if(!answerArray || answerArray.length == 0 || !answerArray[0]) {
diff --git a/public/react/src/modules/courses/exercise/new/NullEditor.js b/public/react/src/modules/courses/exercise/new/NullEditor.js
index dddadcf0a..299daf904 100644
--- a/public/react/src/modules/courses/exercise/new/NullEditor.js
+++ b/public/react/src/modules/courses/exercise/new/NullEditor.js
@@ -70,15 +70,15 @@ class NullEditor extends Component{
     let answerArray = []
     if(!question_title) {
       this.refs['titleEditor'].showError()
-      this.props.showNotification('题目不能为空'); return;
+      this.props.showNotification('题目：不能为空'); return;
 
     }
     const intScore = parseFloat(question_score)
     if(!question_score || intScore == NaN) {
-      this.props.showNotification('分值不能为空'); return;
+      this.props.showNotification('分值：不能为空'); return;
     } else {
       if (intScore == 0) {
-        this.props.showNotification('分值必须大于0'); return;
+        this.props.showNotification('分值：必须大于0'); return;
       }
     }
     let isEmpty = false;
@@ -91,7 +91,8 @@ class NullEditor extends Component{
         answerArray[index].answer_text.push(item)
         if(!item) {
           this.refs[`nullChildEditor${index}`].showError(itemIndex)
-          this.props.showNotification(`请先输入第${index+1}个填空的第${itemIndex+1}参考答案。`); 
+          // this.props.showNotification(`请先输入第${index+1}个填空的第${itemIndex+1}参考答案。`); 
+          this.props.showNotification(`答案：不能为空`); 
           isEmpty = true;
         }
       })
@@ -101,7 +102,7 @@ class NullEditor extends Component{
     }
     if(!question_title) {
       this.refs['titleEditor'].showError()
-      this.props.showNotification('题目不能为空'); return;
+      this.props.showNotification('题目：不能为空'); return;
 
     }
 
diff --git a/public/react/src/modules/courses/exercise/new/ShixunEditor.js b/public/react/src/modules/courses/exercise/new/ShixunEditor.js
index 581467257..e4835ee10 100644
--- a/public/react/src/modules/courses/exercise/new/ShixunEditor.js
+++ b/public/react/src/modules/courses/exercise/new/ShixunEditor.js
@@ -98,7 +98,7 @@ class ShixunEditor extends Component{
     // }
     for(let _i = 0; _i < question_scores.length; _i++) {
         if (!question_scores[_i] || question_scores[_i] == '0') {
-            this.props.showNotification(`第${_i+1}题的分值必须大于0`); return;
+            this.props.showNotification(`第${_i+1}题的分值：必须大于0`); return;
         }
     }
     
diff --git a/public/react/src/modules/courses/exercise/new/SingleEditor.js b/public/react/src/modules/courses/exercise/new/SingleEditor.js
index a9e8aa3f5..8e68a593c 100644
--- a/public/react/src/modules/courses/exercise/new/SingleEditor.js
+++ b/public/react/src/modules/courses/exercise/new/SingleEditor.js
@@ -88,7 +88,7 @@ class SingleEditor extends Component{
     const answerArray = standard_answers.map((item, index) => { return item == true ? index+1 : -1 }).filter(item => item != -1);
     if(!question_title) {
       this.refs['titleEditor'].showError()
-      this.props.showNotification('题目不能为空'); return;
+      this.props.showNotification('题目：不能为空'); return;
 
 
     }
@@ -105,7 +105,7 @@ class SingleEditor extends Component{
     }
     if(!question_title) {
       this.refs['titleEditor'].showError()
-      this.props.showNotification('题目不能为空'); return;
+      this.props.showNotification('题目：不能为空'); return;
 
 
     }

From 9cda4635ddcce5685e2fc89128b70b2c11f09599 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, 29 Jun 2019 16:08:48 +0800
Subject: [PATCH 34/39] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../react/src/modules/comment/CommentsHOC.js  | 1236 +++++++++--------
 .../courses/coursesPublic/Addcourses.js       |   23 +-
 .../exercise/Testpapersettinghomepage.js      |    2 +
 .../graduation/tasks/GraduationTasksedit.js   |    7 +-
 .../tasks/GraduationTaskssetting.js           |    6 +-
 .../tasks/GraduationTaskssettinglist.js       |   83 +-
 .../shixunHomework/ShixunStudentWork.js       |   90 +-
 public/react/src/modules/tpm/SiderBar.js      |    2 +-
 8 files changed, 754 insertions(+), 695 deletions(-)

diff --git a/public/react/src/modules/comment/CommentsHOC.js b/public/react/src/modules/comment/CommentsHOC.js
index 4cdd852b4..cc5be1654 100644
--- a/public/react/src/modules/comment/CommentsHOC.js
+++ b/public/react/src/modules/comment/CommentsHOC.js
@@ -1,613 +1,625 @@
-import React from 'react'
-import ReactDOM from 'react-dom'
-import axios from 'axios'
-import update from 'immutability-helper'
-
-import ImageLayer from '../page/layers/ImageLayer'
-
-const $ = window.$
-/* 需要的props:  
-	shixun
-		id
-	myshixun 
-		id
-	challenge
-		id
-	user
-		"image_url": user.image_url,
-		"username": user.username,
-	showSnackbar
-
-	*/
-/*
-	这里提供props给WrappedComponent，用于封装特定的state和功能（评论列表）
-	不要直接使用this.xxx调用WrappedComponent内的方法，尽量避免互相依赖，封装好后供不同场景使用（tpi、tpm）
-*/
-export function commentHOC(WrappedComponent) {
-	// 这里如果extends WrappedComponent 会出现 WrappedComponent mount twice的问题
-  return class II extends React.Component {
-  	constructor(props) {
-		super(props)
-		
-		// ------------------------------------
-		this.createNewComment = this.createNewComment.bind(this)
-		this.fetchCommentIfNotFetched = this.fetchCommentIfNotFetched.bind(this)
-		this.replyComment = this.replyComment.bind(this)
-		this.deleteComment = this.deleteComment.bind(this)
-		this.commentPraise = this.commentPraise.bind(this)
-		this.hiddenComment = this.hiddenComment.bind(this)
-		this.rewardCode = this.rewardCode.bind(this)
-		this.showNewReply = this.showNewReply.bind(this)
-		this.newMessage = this.newMessage.bind(this)
-		// ------------------------------------
-
-		this.onPaginationChange = this.onPaginationChange.bind(this)
-
-		this.state = {
-			// 评论
-			comments: [],
-			comment_count_without_reply: 0,
-			// 默认pageSize为10
-			currentPage: 1,
-			loadingComments: true,
-
-			// 图片最大化
-			showImage: false,
-		  	imageSrc: '',
-		}
-	}
-
-	// ----------------------------------------------------------------------------------------------评论 Start
-
-	// ----------------------------------------------------------------------------------------------评论 Start
-	onPaginationChange(page) {
-		this.fetchComment(page)
-		this.setState({
-	        currentPage: page,
-	    });
-	}
-	/*
-	email: "1843820944@qq.com"
-	grade: 2138
-	image_url: "avatar/User/36497"
-	login: "p24891375"
-	name: "杨俊男"
-	user_url: "/users/p24891375"
-*/ 
-	handleComments(comments, responseData) {
-		comments.forEach(element => {
-			if (element.children) {
-				this.handleComments(element.children, responseData)
-			}
-			element.admin = responseData.all
-			element.manager = element.manage
-
-			element.username = element.author.name
-			element.user_login = element.author.login
-			element.image_url = element.author.image_url
-			element.user_id = element.author.user_id
-			
-		});
-	}
-	responseDataParse(response) {
-		const comments = response.data.comments
-		this.handleComments(comments, response.data)
-	}
-	fetchComment(page = 1) {
-		const { challenge, shixun, match } = this.props;
-		// const url = `/api/v1/shixuns/${shixun.id}/shixun_discusses?page=${page-1}&container_type=Shixun`
-		const url = 
-			`/discusses.json?page=${page-1}&container_identifier=${shixun && shixun.identifier ?
-				shixun.identifier : match.params.shixunId}&container_type=Shixun`
-		
-		this.setState({
-			loadingComments: true,
-		});
-
-		// test
-		// if (true) {
-		if (false) {
-	    	var data = {"children_list":[{"id":1165,"content":"\u7535\u8111\u6ca1\u6709pi\u554a","time":"4\u5929\u524d","position":2,"user_id":31542,"reward":null,"image_url":"avatars/User/b","username":"\u8d75\u94f6\u7fd4","user_login":"p81572036","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":null},{"id":1142,"content":"\u6700\u540e\u4e00\u9898\u4e09\u5929\u6253\u9c7c\uff0c\u4e24\u5929\u6652\u7f51\uff0c\u4e0d\u5e94\u8be5\u662f1.01*1.01*1.01*0.99*0.99\uff0c\u800c\u4e0d\u662f\u52a0\u5417\uff1f","time":"4\u5929\u524d","position":1,"user_id":33714,"reward":null,"image_url":"avatars/User/b","username":"\u843d\u5c18","user_login":"p52769048","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":[{"content":"\u672c\u5173\u5e76\u6ca1\u6709\u5199\u5230\u201c<span style=\"color:#333333;font-family:&quot;background-color:#FFFFFF;\">1.01*1.01*1.01*0.99*0.99</span>\u201d\uff0c\u4e0d\u77e5\u9053\u4f55\u6765\u6b64\u95ee\uff1f","time":"4\u5929\u524d","position":1,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_id":1,"user_login":"innov","can_delete":false,"id":1144}]},{"id":1112,"content":"\u8fd9\u4e2a\u5b9e\u8bad\u5f88\u8d5e\uff01","time":"10\u5929\u524d","position":2,"user_id":12,"reward":null,"image_url":"avatars/User/12","username":"\u9ec4\u4e95\u6cc9","user_login":"Hjqreturn","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":1057,"content":"\u4e0d\u9519","time":"20\u5929\u524d","position":2,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":975,"content":"q","time":"1\u4e2a\u6708\u524d","position":2,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":[{"content":"\u4e0b\u6b21\u518d\u53d1\u65e0\u610f\u4e49\u7684\u5185\u5bb9\uff0c\u5c06\u88ab\u6263\u91d1\u5e01\u54e6","time":"1\u4e2a\u6708\u524d","position":2,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_id":1,"user_login":"innov","can_delete":false,"id":980}]},{"id":974,"content":"k","time":"1\u4e2a\u6708\u524d","position":2,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":[{"content":"\u4e0b\u6b21\u518d\u53d1\u65e0\u610f\u4e49\u7684\u5185\u5bb9\uff0c\u5c06\u88ab\u6263\u91d1\u5e01\u54e6","time":"1\u4e2a\u6708\u524d","position":2,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_id":1,"user_login":"innov","can_delete":false,"id":981}]},{"id":859,"content":"\u5f88\u68d2\uff01\uff01\uff01","time":"1\u4e2a\u6708\u524d","position":4,"user_id":1,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_login":"innov","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":null},{"id":802,"content":"\u4e0d\u9519\uff01","time":"2\u4e2a\u6708\u524d","position":1,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":619,"content":"\u770b\u6765\u8001\u5e08\u5bf9\u9f50\u7528\u7684\u90fd\u662f\u7a7a\u683c","time":"5\u4e2a\u6708\u524d","position":3,"user_id":29145,"reward":null,"image_url":"avatars/User/b","username":"yang","user_login":"m02945638","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":553,"content":"<p>\r\n\t666\r\n</p>\r\n<p>\r\n\t<br />\r\n</p>","time":"6\u4e2a\u6708\u524d","position":4,"user_id":26838,"reward":null,"image_url":"avatars/User/b","username":"\u5189\u529b","user_login":"m54013296","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":null}],"disscuss_count":183}
-
-			this.setState({
-				comments: data.children_list,
-				comment_count_without_reply: data.disscuss_count,
-
-				currentPage: page,
-				loadingComments: false,
-			})
-			return;
-		}
-
-		axios.get(url,
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	// test
-
-		    	if (response.data) { 
-		    		this.responseDataParse(response)
-		    		this.setState({
-						comments: response.data.comments,
-						comment_count_without_reply: response.data.disscuss_count,
-
-						currentPage: page,
-						loadingComments: false,
-					}, ()=>{
-						// keditor代码美化
-		    			window.prettyPrint()
-					})
-		    	}
-		    	// console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
-	// 切换关卡时，清空state
-	clearCommentsInState = () => {
-		this.setState({ comments: [] })
-	}
-	fetchCommentIfNotFetched() {
-		if (this.state.comments && this.state.comments.length) {
-			return;
-		}
-		
-		// http://localhost:3000/api/v1/shixuns/cz7yw3en/shixun_discusses?page=0	
-		
-		this.fetchComment();
-	}
-	// 新增父级评论
-	createNewComment() {
-		console.log('createNewComment...')
-
-		const { challenge, shixun, showSnackbar } = this.props;
-		let content = window._commentInput.html();
-		if (!content || content.length === 0) {
-			showSnackbar('必须填写内容！')
-			return;
-		}
-
-		// const url = `/api/v1/discusses`
-		const url = `/discusses.json`
-
-		if(content != undefined){
-            var beforeImage = content.split("<img");
-            var afterImage = content.split("/>");
-            if(beforeImage[0] == "" && afterImage[1] == ""){
-                window.notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
-                return;
-            }
-        }
-
-		$("#new_message_submit_btn_" + this.props.challenge.shixun_id).hide();
-
-        if (content) {	// 去掉尾部的回车换行
-	        content = content.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
-	    }
-
-		axios.post(url, {
-					container_type: "Shixun",
-				    container_id: shixun.id,
-				    challenge_id: challenge.id,
-				    content,
-				    position: challenge.position
-			    },
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	if (response.data.discuss) { 
-		    		
-					window._commentInput.html('');
-					window._commentInput.afterBlur()
-		   //  		this.setState({
-					// 	runTesting: false,
-					// })
-		    		this.fetchComment()
-		    	}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-		return true;
-	}
-	_findCommentById(id, arg_comments) {
-		let comments;
-		if (!arg_comments) {
-			comments = this.state.comments;
-		} else {
-			comments = arg_comments;
-		}
-		for(let i = 0; i < comments.length; i++) {
-			if (id === comments[i].id) {
-				return i;
-			}
-		}
-	}
-	replyComment(commentContent, id, editor) {
-		// http://localhost:3000/api/v1/discusses/812/reply
-		const { challenge, shixun, user, showSnackbar, match } = this.props;
-
-		if (!commentContent || commentContent.length === 0) {
-			showSnackbar('必须填写内容！')
-			return;
-		}
-		// const url = `/api/v1/discusses/${id}/reply`
-		const url = `/discusses/${id}/reply.json`
-		if (commentContent) {
-	        commentContent = commentContent.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
-	    }
-	    if (!user.login && user.user_url) {
-		    const loginAr = user.user_url.split('/')
-		    user.login = loginAr[loginAr.length - 1]
-	    }
-		axios.post(url, {
-				    content: commentContent,
-					// TODO
-					"container_id": match.params.shixunId,
-					"container_type": "Shixun",
-			    },
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	if (response.data.discuss) { 
-		    		let newDiscuss = response.data.discuss;
-		    		let { comments } = this.state;
-		    		var commentIndex = this._findCommentById(id);
-		    		let comment = comments[commentIndex]
-						comment = Object.assign({}, comment)
-		    		if (!comment.children ) {
-		    			comment.children = []
-		    		} else {
-						comment.children = comment.children.slice(0);
-					}
-		    		// TODO userName iamge_url
-		    		comment.children.push( {
-		    			"can_delete": true,
-	                    "content": commentContent,
-
-	                    "image_url": user.image_url,
-	                    "username": user.username,
-	                    "user_login": user.login,
-	                    "id": newDiscuss.id,
-	                    "position": newDiscuss.position,
-	                    "time": "1分钟前",
-	                    "praise_count": newDiscuss.praise_count,
-	                    
-	                    "user_id": newDiscuss.user_id,
-	                    
-	                })
-
-					comments = comments.slice(0)
-	                comments[commentIndex] = comment
-
-	                // ke
-		            editor.html && editor.html('')
-		            // md
-		            if (editor.setValue) {
-		              	editor.setValue('')
-		              	const $ = window.$
-		              	var view_selector = `.commentItemMDEditorView_${id}`
-		              	$(view_selector).hide();
-		            }  
-
-
-		    		this.setState({
-						// runTesting: false,
-						comments: comments
-					}, ()=>{
-						// keditor代码美化
-		    			editor.html && window.prettyPrint()
-					})
-		    	}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}	
-	hiddenComment(item, childCommentId) {
-		const id = item.id
-		const { challenge, shixun, user, showSnackbar, match } = this.props;
-		// const url = `/api/v1/discusses/${id}/hidden`
-		const url = `/discusses/${id}/hidden.json`
-
-		const commentIndex = this._findCommentById(id);
-		const { comments } = this.state;
-		const comment = Object.assign({}, comments[commentIndex]);
-		axios.post(url, {
-				    hidden: !comment.hidden ? "1" : "0",
-					container_identifier: match.params.shixunId || shixun.identifier
-			    },
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	if (response.data.status === -1) { 
-		    		showSnackbar(response.data.message)
-		    		return;
-		    	}
-		    	if (response.data.status === 1) { 
-		    		
-		    		if (!childCommentId) {
-							comment.hidden = !comment.hidden;
-							const commentsCopy = this.state.comments.slice(0)
-							commentsCopy[commentIndex] = comment
-			    		this.setState({
-			    			comments: commentsCopy
-			    		})
-		    		} else {	// TODO 目前子回复没hidden字段
-		    			let childCommentIndex = this._findCommentById(childCommentId, comments[commentIndex].children);
-		    			const childComment = comments[commentIndex].children[childCommentIndex]
-		    			childComment.hidden = !childComment.hidden;
-		    			this.setState({ comments })
-		    		}
-		    		
-		    	}
-		    	// {"message":"Couldn't find Discuss with id=911","status":-1}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
-	deleteComment(parrentComment, childCommentId) {
-		const { challenge, shixun } = this.props;
-		let deleteCommentId = parrentComment.id
-		if (childCommentId) {
-			deleteCommentId = childCommentId;
-		}
-		// const url = `/api/v1/discusses/${deleteCommentId}`
-		const url = `/discusses/${deleteCommentId}.json`
-
-		axios.delete(url,
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	// TODO 删除成功或失败
-		    	if (response.data && response.data.status === 1) { 
-		    		const commentIndex = this._findCommentById(parrentComment.id);
-
-		    		// https://stackoverflow.com/questions/29527385/removing-element-from-array-in-component-state
-		    		if (!childCommentId) {
-			    		this.setState((prevState) => ({
-						    comments: update(prevState.comments, {$splice: [[commentIndex, 1]]})
-						}))
-
-			    		if (this.state.comments.length <= 5) {
-			    			this.fetchComment()
-			    		}
-		    		} else {
-		    			let comments = this.state.comments; 
-						let newComments = Object.assign({}, comments)
-		    			let childCommentIndex = this._findCommentById(childCommentId, newComments[commentIndex].children);
-		    			newComments[commentIndex].children = update(newComments[commentIndex].children, {$splice: [[childCommentIndex, 1]]})
-		    			this.setState({ newComments })
-		    		}
-		    	}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
-
-	rewardCode(parrentComment, childComment, amount) {
-		const { challenge, shixun, showSnackbar } = this.props;
-		let handleComment = parrentComment
-		if (childComment) {
-			handleComment = childComment;
-		}
-		let handleCommentId = handleComment.id;
-		// const url = `/api/v1/discusses/${handleCommentId}/reward_code`
-		const url = `/discusses/${handleCommentId}/reward_code.json`
-
-		axios.post(url, {
-					// id: handleCommentId,
-
-					// container_id: shixun.id,
-					container_type: 'Discusses',
-					score: amount,
-					user_id: handleComment.user_id
-				},
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	if (response.data && response.data.code) { 
-		    		const commentIndex = this._findCommentById(parrentComment.id);
-		    		let { comments } = this.state;
-					const newComments = comments.slice(0)
-
-		    		if (childComment) {
-		    			const childCommentIndex = this._findCommentById(handleComment.id, parrentComment.children);
-		    			const newChildComment = Object.assign({}, childComment);
-		    			newChildComment.reward = response.data.code
-						parrentComment = Object.assign({}, parrentComment)
-						parrentComment.children = parrentComment.children.slice(0)
-		    			parrentComment.children[childCommentIndex] = newChildComment
-
-						newComments[commentIndex] = parrentComment;
-						
-			    		
-		    		} else {
-						const newComment = Object.assign({}, newComments[commentIndex]);
-						newComment.reward = response.data.code;
-						newComments[commentIndex] = newComment;
-					}
-					this.setState({
-						comments: newComments
-					})
-		    	}
-		    }).catch((error) => {
-		    	console.log(error)
-		    	showSnackbar('奖励失败，请联系系统管理员！')
-		    })
-	}
-
-	// 评论点赞
-	commentPraise(discussId) {
-		const commentIndex = this._findCommentById(discussId);
-		const { comments } = this.state;
-
-		const { challenge } = this.props;
-		// const url = `/api/v1/discusses/${discussId}/plus`
-		const url = `/discusses/${discussId}/plus.json`
-		axios.post(url, {
-				    // id: discussId,
-				    // container_id: challenge.id,
-				    container_type: 'Discuss',	//Discuss
-				    type: comments[commentIndex].user_praise === true ? 0 : 1,   //  "踩0；赞1"
-			    },
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	if (response.data.praise_count === 0 || response.data.praise_count) { 
-		    		const newComments = comments.slice(0)
-					const comment = Object.assign({}, newComments[commentIndex])
-					comment.user_praise = !comment.user_praise;
-					comment.praise_count = response.data.praise_count;
-					newComments[commentIndex] = comment;
-		    		this.setState({
-						comments: newComments
-					})
-		    	}
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
-
-	newMessage() {
-		return; // newMessage 暂时不用了
-		const { shixun, myshixun } = this.props;
-		const url = `/api/v1/shixuns/${shixun.id}/new_message?container_type=Shixun&myshixun_id=${myshixun.id}`
-		// this.setState({
-		//     			gotNewReply: true
-		//     		})
-		axios.get(url,
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	const new_message = response.data.new_message;
-		    	if (response.data.new_message) { 
-		    		this.setState({
-		    			gotNewReply: new_message
-		    		})
-		    	}
-		    	// console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
-
-	showNewReply() {
-		const { shixun, myshixun } = this.props;
-		const commentId = 929 // TODO
-		const url = `/api/v1/shixuns/${shixun.id}/anchor?container_type=Shixun&myshixun_id=${myshixun.id}&discuss_id=${commentId}`
-
-		this.setState({
-			loadingComments: true,
-			gotNewReply: false,
-
-		});
-		axios.get(url,
-			    {
-			    	// withCredentials: true
-			    }	    
-		    ).then((response) => {
-		    	const data = response.data;
-		    	const new_message = data.new_message;
-
-		    	this.setState({
-					comments: data.children_list,
-					comment_count_without_reply: data.disscuss_count,
-
-					currentPage: data.page,
-					loadingComments: false,
-
-				}, () => {
-					if (response.data.find_status) { // 没找到评论的话，默认会返回第一页的评论
-						const comment_J = window.$(`#reply_content_${commentId}`);
-						if (comment_J.length) {
-							comment_J[0].scrollIntoView()
-							comment_J.parents('.comment_item_cont').css('border', '1px solid #4CACFF')
-						}
-			    	}
-				})		    	
-		    	console.log(response)
-		    }).catch((error) => {
-		    	console.log(error)
-		    })
-	}
-
-	// ----------------------------------------------------------------------------------------------评论 End
-
-	// ----------------------------------------------------------------------------------------------评论 End
-
-	componentDidMount() {	
-		// commentsDelegateParent #game_left_contents #tab_con_4
-		$(".commentsDelegateParent")
-			.delegate(".J_Comment_Reply .comment_content img, .J_Comment_Reply .childrenCommentsView img","click", (event) => {
-			
-		  	const imageSrc = event.target.src
-		  	// 非回复里的头像图片; 非emoticons
-          	if (imageSrc.indexOf('/images/avatars/User') === -1 && 
-              imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) {  
-		  		this.setState({
-			  		showImage: true,
-			  		imageSrc,
-			  	})
-		  	}
-		});
-	}
-	onImageLayerClose = () => {
-		this.setState({
-			showImage: false,
-		  	imageSrc: '',
-		})
-	}
-    render() {
-      return (
-        <React.Fragment>
-			<ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>
-
-	        <WrappedComponent {...this.props} {...this.state}
-	        	createNewComment={this.createNewComment}
-	      		fetchCommentIfNotFetched={this.fetchCommentIfNotFetched}
-						clearCommentsInState={this.clearCommentsInState}
-	      		replyComment={this.replyComment}
-	      		deleteComment={this.deleteComment}
-	      		commentPraise={this.commentPraise}
-	      		hiddenComment={this.hiddenComment}
-	      		rewardCode={this.rewardCode}
-	      		onPaginationChange={this.onPaginationChange}
-
-	      		newMessage={this.newMessage}
-	      		showNewReply={this.showNewReply}
-	        ></WrappedComponent>
-        </React.Fragment>
-
-      )
-    }
-  }
-}
-/*
-	<div>
-          <h2>
-            HOC Debugger Component
-          </h2>
-          <p>
-            Props
-          </p>
-          <pre>{stringify(this.props)}</pre>
-          <p>
-            State
-          </p>
-          <pre>{stringify(this.state)}</pre>
-          {super.render()}
-        </div>
-
+import React from 'react'
+import ReactDOM from 'react-dom'
+import axios from 'axios'
+import { notification } from 'antd'
+import update from 'immutability-helper'
+
+import ImageLayer from '../page/layers/ImageLayer'
+
+const $ = window.$
+/* 需要的props:  
+	shixun
+		id
+	myshixun 
+		id
+	challenge
+		id
+	user
+		"image_url": user.image_url,
+		"username": user.username,
+	showSnackbar
+
+	*/
+/*
+	这里提供props给WrappedComponent，用于封装特定的state和功能（评论列表）
+	不要直接使用this.xxx调用WrappedComponent内的方法，尽量避免互相依赖，封装好后供不同场景使用（tpi、tpm）
+*/
+export function commentHOC(WrappedComponent) {
+	// 这里如果extends WrappedComponent 会出现 WrappedComponent mount twice的问题
+  return class II extends React.Component {
+  	constructor(props) {
+		super(props)
+		
+		// ------------------------------------
+		this.createNewComment = this.createNewComment.bind(this)
+		this.fetchCommentIfNotFetched = this.fetchCommentIfNotFetched.bind(this)
+		this.replyComment = this.replyComment.bind(this)
+		this.deleteComment = this.deleteComment.bind(this)
+		this.commentPraise = this.commentPraise.bind(this)
+		this.hiddenComment = this.hiddenComment.bind(this)
+		this.rewardCode = this.rewardCode.bind(this)
+		this.showNewReply = this.showNewReply.bind(this)
+		this.newMessage = this.newMessage.bind(this)
+		// ------------------------------------
+
+		this.onPaginationChange = this.onPaginationChange.bind(this)
+
+		this.state = {
+			// 评论
+			comments: [],
+			comment_count_without_reply: 0,
+			// 默认pageSize为10
+			currentPage: 1,
+			loadingComments: true,
+
+			// 图片最大化
+			showImage: false,
+		  	imageSrc: '',
+		}
+	}
+
+	// ----------------------------------------------------------------------------------------------评论 Start
+
+	// ----------------------------------------------------------------------------------------------评论 Start
+	onPaginationChange(page) {
+		this.fetchComment(page)
+		this.setState({
+	        currentPage: page,
+	    });
+	}
+	/*
+	email: "1843820944@qq.com"
+	grade: 2138
+	image_url: "avatar/User/36497"
+	login: "p24891375"
+	name: "杨俊男"
+	user_url: "/users/p24891375"
+*/ 
+	handleComments(comments, responseData) {
+		comments.forEach(element => {
+			if (element.children) {
+				this.handleComments(element.children, responseData)
+			}
+			element.admin = responseData.all
+			element.manager = element.manage
+
+			element.username = element.author.name
+			element.user_login = element.author.login
+			element.image_url = element.author.image_url
+			element.user_id = element.author.user_id
+			
+		});
+	}
+	responseDataParse(response) {
+		const comments = response.data.comments
+		this.handleComments(comments, response.data)
+	}
+	fetchComment(page = 1) {
+		const { challenge, shixun, match } = this.props;
+		// const url = `/api/v1/shixuns/${shixun.id}/shixun_discusses?page=${page-1}&container_type=Shixun`
+		const url = 
+			`/discusses.json?page=${page-1}&container_identifier=${shixun && shixun.identifier ?
+				shixun.identifier : match.params.shixunId}&container_type=Shixun`
+		
+		this.setState({
+			loadingComments: true,
+		});
+
+		// test
+		// if (true) {
+		if (false) {
+	    	var data = {"children_list":[{"id":1165,"content":"\u7535\u8111\u6ca1\u6709pi\u554a","time":"4\u5929\u524d","position":2,"user_id":31542,"reward":null,"image_url":"avatars/User/b","username":"\u8d75\u94f6\u7fd4","user_login":"p81572036","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":null},{"id":1142,"content":"\u6700\u540e\u4e00\u9898\u4e09\u5929\u6253\u9c7c\uff0c\u4e24\u5929\u6652\u7f51\uff0c\u4e0d\u5e94\u8be5\u662f1.01*1.01*1.01*0.99*0.99\uff0c\u800c\u4e0d\u662f\u52a0\u5417\uff1f","time":"4\u5929\u524d","position":1,"user_id":33714,"reward":null,"image_url":"avatars/User/b","username":"\u843d\u5c18","user_login":"p52769048","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":[{"content":"\u672c\u5173\u5e76\u6ca1\u6709\u5199\u5230\u201c<span style=\"color:#333333;font-family:&quot;background-color:#FFFFFF;\">1.01*1.01*1.01*0.99*0.99</span>\u201d\uff0c\u4e0d\u77e5\u9053\u4f55\u6765\u6b64\u95ee\uff1f","time":"4\u5929\u524d","position":1,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_id":1,"user_login":"innov","can_delete":false,"id":1144}]},{"id":1112,"content":"\u8fd9\u4e2a\u5b9e\u8bad\u5f88\u8d5e\uff01","time":"10\u5929\u524d","position":2,"user_id":12,"reward":null,"image_url":"avatars/User/12","username":"\u9ec4\u4e95\u6cc9","user_login":"Hjqreturn","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":1057,"content":"\u4e0d\u9519","time":"20\u5929\u524d","position":2,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":975,"content":"q","time":"1\u4e2a\u6708\u524d","position":2,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":[{"content":"\u4e0b\u6b21\u518d\u53d1\u65e0\u610f\u4e49\u7684\u5185\u5bb9\uff0c\u5c06\u88ab\u6263\u91d1\u5e01\u54e6","time":"1\u4e2a\u6708\u524d","position":2,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_id":1,"user_login":"innov","can_delete":false,"id":980}]},{"id":974,"content":"k","time":"1\u4e2a\u6708\u524d","position":2,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":[{"content":"\u4e0b\u6b21\u518d\u53d1\u65e0\u610f\u4e49\u7684\u5185\u5bb9\uff0c\u5c06\u88ab\u6263\u91d1\u5e01\u54e6","time":"1\u4e2a\u6708\u524d","position":2,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_id":1,"user_login":"innov","can_delete":false,"id":981}]},{"id":859,"content":"\u5f88\u68d2\uff01\uff01\uff01","time":"1\u4e2a\u6708\u524d","position":4,"user_id":1,"reward":null,"image_url":"avatars/User/1","username":"Coder","user_login":"innov","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":null},{"id":802,"content":"\u4e0d\u9519\uff01","time":"2\u4e2a\u6708\u524d","position":1,"user_id":30403,"reward":null,"image_url":"avatars/User/b","username":"Jimmy","user_login":"p69243850","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":619,"content":"\u770b\u6765\u8001\u5e08\u5bf9\u9f50\u7528\u7684\u90fd\u662f\u7a7a\u683c","time":"5\u4e2a\u6708\u524d","position":3,"user_id":29145,"reward":null,"image_url":"avatars/User/b","username":"yang","user_login":"m02945638","shixun_id":61,"hidden":false,"manager":false,"praise_count":1,"user_praise":false,"admin":false,"children":null},{"id":553,"content":"<p>\r\n\t666\r\n</p>\r\n<p>\r\n\t<br />\r\n</p>","time":"6\u4e2a\u6708\u524d","position":4,"user_id":26838,"reward":null,"image_url":"avatars/User/b","username":"\u5189\u529b","user_login":"m54013296","shixun_id":61,"hidden":false,"manager":false,"praise_count":0,"user_praise":false,"admin":false,"children":null}],"disscuss_count":183}
+
+			this.setState({
+				comments: data.children_list,
+				comment_count_without_reply: data.disscuss_count,
+
+				currentPage: page,
+				loadingComments: false,
+			})
+			return;
+		}
+
+		axios.get(url,
+			    {
+			    	// withCredentials: true
+			    }	    
+		    ).then((response) => {
+		    	// test
+
+		    	if (response.data) { 
+		    		this.responseDataParse(response)
+		    		this.setState({
+						comments: response.data.comments,
+						comment_count_without_reply: response.data.disscuss_count,
+
+						currentPage: page,
+						loadingComments: false,
+					}, ()=>{
+						// keditor代码美化
+		    			window.prettyPrint()
+					})
+		    	}
+		    	// console.log(response)
+		    }).catch((error) => {
+		    	console.log(error)
+		    })
+	}
+	// 切换关卡时，清空state
+	clearCommentsInState = () => {
+		this.setState({ comments: [] })
+	}
+	fetchCommentIfNotFetched() {
+		if (this.state.comments && this.state.comments.length) {
+			return;
+		}
+		
+		// http://localhost:3000/api/v1/shixuns/cz7yw3en/shixun_discusses?page=0	
+		
+		this.fetchComment();
+	}
+	// 新增父级评论
+	createNewComment() {
+		console.log('createNewComment...')
+
+		const { challenge, shixun, showSnackbar } = this.props;
+		let content = window._commentInput.html();
+		if (!content || content.length === 0) {
+			showSnackbar('必须填写内容！')
+			return;
+		}
+
+		// const url = `/api/v1/discusses`
+		const url = `/discusses.json`
+
+		if(content != undefined){
+            var beforeImage = content.split("<img");
+            var afterImage = content.split("/>");
+            if(beforeImage[0] == "" && afterImage[1] == ""){
+                window.notice_box('不支持纯图片评论<br/>请在评论中增加文字信息');
+                return;
+            }
+        }
+
+		$("#new_message_submit_btn_" + this.props.challenge.shixun_id).hide();
+
+        if (content) {	// 去掉尾部的回车换行
+	        content = content.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
+	    }
+
+		axios.post(url, {
+					container_type: "Shixun",
+				    container_id: shixun.id,
+				    challenge_id: challenge.id,
+				    content,
+				    position: challenge.position
+			    },
+			    {
+			    	// withCredentials: true
+			    }	    
+		    ).then((response) => {
+		    	if (response.data.discuss) { 
+		    		
+					window._commentInput.html('');
+					window._commentInput.afterBlur()
+		   //  		this.setState({
+					// 	runTesting: false,
+					// })
+		    		this.fetchComment()
+		    	}
+		    	console.log(response)
+		    }).catch((error) => {
+		    	console.log(error)
+		    })
+		return true;
+	}
+	_findCommentById(id, arg_comments) {
+		let comments;
+		if (!arg_comments) {
+			comments = this.state.comments;
+		} else {
+			comments = arg_comments;
+		}
+		for(let i = 0; i < comments.length; i++) {
+			if (id === comments[i].id) {
+				return i;
+			}
+		}
+	}
+	replyComment(commentContent, id, editor) {
+		// http://localhost:3000/api/v1/discusses/812/reply
+		const { challenge, shixun, user, showSnackbar, match } = this.props;
+
+		if (!commentContent || commentContent.length === 0) {
+			showSnackbar('必须填写内容！')
+			return;
+		}
+		// const url = `/api/v1/discusses/${id}/reply`
+		const url = `/discusses/${id}/reply.json`
+		if (commentContent) {
+	        commentContent = commentContent.replace(/(\n<p>\n\t<br \/>\n<\/p>)*$/g,'');
+	    }
+	    if (!user.login && user.user_url) {
+		    const loginAr = user.user_url.split('/')
+		    user.login = loginAr[loginAr.length - 1]
+	    }
+		axios.post(url, {
+				    content: commentContent,
+					// TODO
+					"container_id": match.params.shixunId,
+					"container_type": "Shixun",
+			    },
+			    {
+			    	// withCredentials: true
+			    }	    
+		    ).then((response) => {
+		    	if (response.data.discuss) { 
+		    		let newDiscuss = response.data.discuss;
+		    		let { comments } = this.state;
+		    		var commentIndex = this._findCommentById(id);
+		    		let comment = comments[commentIndex]
+						comment = Object.assign({}, comment)
+		    		if (!comment.children ) {
+		    			comment.children = []
+		    		} else {
+						comment.children = comment.children.slice(0);
+					}
+		    		// TODO userName iamge_url
+		    		comment.children.push( {
+		    			"can_delete": true,
+	                    "content": commentContent,
+
+	                    "image_url": user.image_url,
+	                    "username": user.username,
+	                    "user_login": user.login,
+	                    "id": newDiscuss.id,
+	                    "position": newDiscuss.position,
+	                    "time": "1分钟前",
+	                    "praise_count": newDiscuss.praise_count,
+	                    
+	                    "user_id": newDiscuss.user_id,
+	                    
+	                })
+
+					comments = comments.slice(0)
+	                comments[commentIndex] = comment
+
+	                // ke
+		            editor.html && editor.html('')
+		            // md
+		            if (editor.setValue) {
+		              	editor.setValue('')
+		              	const $ = window.$
+		              	var view_selector = `.commentItemMDEditorView_${id}`
+		              	$(view_selector).hide();
+		            }  
+
+
+		    		this.setState({
+						// runTesting: false,
+						comments: comments
+					}, ()=>{
+						// keditor代码美化
+		    			editor.html && window.prettyPrint()
+					})
+		    	}
+		    	console.log(response)
+		    }).catch((error) => {
+		    	console.log(error)
+		    })
+	}	
+	hiddenComment(item, childCommentId) {
+		const id = item.id
+		const { challenge, shixun, user, showSnackbar, match } = this.props;
+		// const url = `/api/v1/discusses/${id}/hidden`
+		const url = `/discusses/${id}/hidden.json`
+
+		const commentIndex = this._findCommentById(id);
+		const { comments } = this.state;
+		const comment = Object.assign({}, comments[commentIndex]);
+		axios.post(url, {
+				    hidden: !comment.hidden ? "1" : "0",
+					container_identifier: match.params.shixunId || shixun.identifier
+			    },
+			    {
+			    	// withCredentials: true
+			    }	    
+		    ).then((response) => {
+		    	if (response.data.status === -1) { 
+		    		showSnackbar(response.data.message)
+		    		return;
+		    	}
+		    	if (response.data.status === 1) { 
+		    		
+		    		if (!childCommentId) {
+							comment.hidden = !comment.hidden;
+							const commentsCopy = this.state.comments.slice(0)
+							commentsCopy[commentIndex] = comment
+			    		this.setState({
+			    			comments: commentsCopy
+			    		})
+		    		} else {	// TODO 目前子回复没hidden字段
+		    			let childCommentIndex = this._findCommentById(childCommentId, comments[commentIndex].children);
+		    			const childComment = comments[commentIndex].children[childCommentIndex]
+		    			childComment.hidden = !childComment.hidden;
+		    			this.setState({ comments })
+		    		}
+		    		
+		    	}
+		    	// {"message":"Couldn't find Discuss with id=911","status":-1}
+		    	console.log(response)
+		    }).catch((error) => {
+		    	console.log(error)
+		    })
+	}
+	deleteComment(parrentComment, childCommentId) {
+		const { challenge, shixun } = this.props;
+		let deleteCommentId = parrentComment.id
+		if (childCommentId) {
+			deleteCommentId = childCommentId;
+		}
+		// const url = `/api/v1/discusses/${deleteCommentId}`
+		const url = `/discusses/${deleteCommentId}.json`
+
+		axios.delete(url,
+			    {
+			    	// withCredentials: true
+			    }	    
+		    ).then((response) => {
+		    	// TODO 删除成功或失败
+		    	if (response.data && response.data.status === 1) { 
+		    		const commentIndex = this._findCommentById(parrentComment.id);
+
+		    		// https://stackoverflow.com/questions/29527385/removing-element-from-array-in-component-state
+		    		if (!childCommentId) {
+			    		this.setState((prevState) => ({
+						    comments: update(prevState.comments, {$splice: [[commentIndex, 1]]})
+						}))
+
+			    		if (this.state.comments.length <= 5) {
+			    			this.fetchComment()
+			    		}
+		    		} else {
+		    			let comments = this.state.comments; 
+						let newComments = Object.assign({}, comments)
+		    			let childCommentIndex = this._findCommentById(childCommentId, newComments[commentIndex].children);
+		    			newComments[commentIndex].children = update(newComments[commentIndex].children, {$splice: [[childCommentIndex, 1]]})
+		    			this.setState({ newComments })
+		    		}
+		    	}
+		    	console.log(response)
+		    }).catch((error) => {
+		    	console.log(error)
+		    })
+	}
+
+	rewardCode(parrentComment, childComment, amount) {
+		const { challenge, shixun, showSnackbar } = this.props;
+		let handleComment = parrentComment
+		if (childComment) {
+			handleComment = childComment;
+		}
+		let handleCommentId = handleComment.id;
+		// const url = `/api/v1/discusses/${handleCommentId}/reward_code`
+		const url = `/discusses/${handleCommentId}/reward_code.json`
+
+		axios.post(url, {
+					// id: handleCommentId,
+
+					// container_id: shixun.id,
+					container_type: 'Discusses',
+					score: amount,
+					user_id: handleComment.user_id
+				},
+			    {
+			    	// withCredentials: true
+			    }	    
+		    ).then((response) => {
+		    	if (response.data && response.data.code) { 
+		    		const commentIndex = this._findCommentById(parrentComment.id);
+		    		let { comments } = this.state;
+					const newComments = comments.slice(0)
+
+		    		if (childComment) {
+		    			const childCommentIndex = this._findCommentById(handleComment.id, parrentComment.children);
+		    			const newChildComment = Object.assign({}, childComment);
+		    			newChildComment.reward = response.data.code
+						parrentComment = Object.assign({}, parrentComment)
+						parrentComment.children = parrentComment.children.slice(0)
+		    			parrentComment.children[childCommentIndex] = newChildComment
+
+						newComments[commentIndex] = parrentComment;
+						
+			    		
+		    		} else {
+						const newComment = Object.assign({}, newComments[commentIndex]);
+						newComment.reward = response.data.code;
+						newComments[commentIndex] = newComment;
+					}
+					this.setState({
+						comments: newComments
+					})
+		    	}
+		    }).catch((error) => {
+		    	console.log(error)
+		    	showSnackbar('奖励失败，请联系系统管理员！')
+		    })
+	}
+
+	// 评论点赞
+	commentPraise(discussId) {
+		const commentIndex = this._findCommentById(discussId);
+		const { comments } = this.state;
+
+		const { challenge } = this.props;
+		// const url = `/api/v1/discusses/${discussId}/plus`
+		const url = `/discusses/${discussId}/plus.json`
+		axios.post(url, {
+				    // id: discussId,
+				    // container_id: challenge.id,
+				    container_type: 'Discuss',	//Discuss
+				    type: comments[commentIndex].user_praise === true ? 0 : 1,   //  "踩0；赞1"
+			    },
+			    {
+			    	// withCredentials: true
+			    }	    
+		    ).then((response) => {
+		    	if (response.data.praise_count === 0 || response.data.praise_count) { 
+		    		const newComments = comments.slice(0)
+					const comment = Object.assign({}, newComments[commentIndex])
+					comment.user_praise = !comment.user_praise;
+					comment.praise_count = response.data.praise_count;
+					newComments[commentIndex] = comment;
+		    		this.setState({
+						comments: newComments
+					})
+		    	}
+		    	console.log(response)
+		    }).catch((error) => {
+		    	console.log(error)
+		    })
+	}
+
+	newMessage() {
+		return; // newMessage 暂时不用了
+		const { shixun, myshixun } = this.props;
+		const url = `/api/v1/shixuns/${shixun.id}/new_message?container_type=Shixun&myshixun_id=${myshixun.id}`
+		// this.setState({
+		//     			gotNewReply: true
+		//     		})
+		axios.get(url,
+			    {
+			    	// withCredentials: true
+			    }	    
+		    ).then((response) => {
+		    	const new_message = response.data.new_message;
+		    	if (response.data.new_message) { 
+		    		this.setState({
+		    			gotNewReply: new_message
+		    		})
+		    	}
+		    	// console.log(response)
+		    }).catch((error) => {
+		    	console.log(error)
+		    })
+	}
+
+	showNewReply() {
+		const { shixun, myshixun } = this.props;
+		const commentId = 929 // TODO
+		const url = `/api/v1/shixuns/${shixun.id}/anchor?container_type=Shixun&myshixun_id=${myshixun.id}&discuss_id=${commentId}`
+
+		this.setState({
+			loadingComments: true,
+			gotNewReply: false,
+
+		});
+		axios.get(url,
+			    {
+			    	// withCredentials: true
+			    }	    
+		    ).then((response) => {
+		    	const data = response.data;
+		    	const new_message = data.new_message;
+
+		    	this.setState({
+					comments: data.children_list,
+					comment_count_without_reply: data.disscuss_count,
+
+					currentPage: data.page,
+					loadingComments: false,
+
+				}, () => {
+					if (response.data.find_status) { // 没找到评论的话，默认会返回第一页的评论
+						const comment_J = window.$(`#reply_content_${commentId}`);
+						if (comment_J.length) {
+							comment_J[0].scrollIntoView()
+							comment_J.parents('.comment_item_cont').css('border', '1px solid #4CACFF')
+						}
+			    	}
+				})		    	
+		    	console.log(response)
+		    }).catch((error) => {
+		    	console.log(error)
+		    })
+	}
+
+	// ----------------------------------------------------------------------------------------------评论 End
+
+	// ----------------------------------------------------------------------------------------------评论 End
+
+	componentDidMount() {	
+		// commentsDelegateParent #game_left_contents #tab_con_4
+		$(".commentsDelegateParent")
+			.delegate(".J_Comment_Reply .comment_content img, .J_Comment_Reply .childrenCommentsView img","click", (event) => {
+			
+		  	const imageSrc = event.target.src
+		  	// 非回复里的头像图片; 非emoticons
+          	if (imageSrc.indexOf('/images/avatars/User') === -1 && 
+              imageSrc.indexOf('kindeditor/plugins/emoticons') === -1 ) {  
+		  		this.setState({
+			  		showImage: true,
+			  		imageSrc,
+			  	})
+		  	}
+		});
+	}
+	onImageLayerClose = () => {
+		this.setState({
+			showImage: false,
+		  	imageSrc: '',
+		})
+	}
+
+		showNotification = (description, message = "提示", icon) => {
+			const data = {
+				message,
+				description
+			}
+			if (icon) {
+				data.icon = icon;
+			}
+			notification.open(data);
+		}
+    render() {
+      return (
+        <React.Fragment>
+			<ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>
+
+	        <WrappedComponent {...this.props} {...this.state}
+	        	createNewComment={this.createNewComment}
+	      		fetchCommentIfNotFetched={this.fetchCommentIfNotFetched}
+						clearCommentsInState={this.clearCommentsInState}
+	      		replyComment={this.replyComment}
+	      		deleteComment={this.deleteComment}
+	      		commentPraise={this.commentPraise}
+	      		hiddenComment={this.hiddenComment}
+	      		rewardCode={this.rewardCode}
+	      		onPaginationChange={this.onPaginationChange}
+				    showNotification= { this.showNotification }
+	      		newMessage={this.newMessage}
+	      		showNewReply={this.showNewReply}
+	        ></WrappedComponent>
+        </React.Fragment>
+
+      )
+    }
+  }
+}
+/*
+	<div>
+          <h2>
+            HOC Debugger Component
+          </h2>
+          <p>
+            Props
+          </p>
+          <pre>{stringify(this.props)}</pre>
+          <p>
+            State
+          </p>
+          <pre>{stringify(this.state)}</pre>
+          {super.render()}
+        </div>
+
 */
\ No newline at end of file
diff --git a/public/react/src/modules/courses/coursesPublic/Addcourses.js b/public/react/src/modules/courses/coursesPublic/Addcourses.js
index 097d55053..c3e579872 100644
--- a/public/react/src/modules/courses/coursesPublic/Addcourses.js
+++ b/public/react/src/modules/courses/coursesPublic/Addcourses.js
@@ -1,5 +1,5 @@
 import React,{ Component } from "react";
-import { Modal,Checkbox,Input, Spin, Icon } from "antd";
+import { Modal,Checkbox,Input, Spin, Icon,notification } from "antd";
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 const CheckboxGroup = Checkbox.Group;
@@ -187,15 +187,26 @@ class Addcourses extends Component{
 				if(response.data.course_id!=undefined){
 					this.submitasyn(response.data.course_id)
 				}
+				notification.open({
+					message:"提示",
+					description:response.data.message
+				});
 				this.props.hideAddcoursestype();
 
-				this.props.showNotification(response.data.message);
+				// this.props.showNotification(response.data.message);
+
       }else{
-        this.setState({
-          Addcoursestype:false
-        })
+
+				notification.open({
+					message:"提示",
+					description:response.data.message
+				});
+				this.setState({
+					Addcoursestype:false
+				})
         this.props.hideAddcoursestype();
-        this.props.showNotification(response.data.message);
+
+
         // this.setState({
         //   loadtype:true,
         //   modalsType:true,
diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
index 5ba33032c..0dfbed1ab 100644
--- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
+++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js
@@ -222,6 +222,8 @@ class Testpapersettinghomepage extends Component{
                                         :
                                         <Menu mode="horizontal" selectedKeys={tab} onClick={this.changeTab}>
                                             <Menu.Item key="0">答题列表</Menu.Item>
+																					{Commonheadofthetestpaper&&Commonheadofthetestpaper.show_statistic===true?
+																						<Menu.Item key="1">统计结果</Menu.Item>:""}
                                             <Menu.Item key="3">设置</Menu.Item>
                                         </Menu>
                                     }
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
index 3c9202921..660ef1c71 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksedit.js
@@ -33,7 +33,7 @@ class GraduationTasksedit extends Component{
 
   componentDidMount(){
 
-
+   let {title_num}=this.state;
 
     let tasksid=this.props.match.params.category_id;
     let url ="/graduation_tasks/"+tasksid+"/edit.json"
@@ -52,15 +52,18 @@ class GraduationTasksedit extends Component{
           }
 
         }
-
+			let namelength=result.data.task_name.length;
+      let sixlength=title_num-namelength
       this.setState({
           fileList:newfilelist,
           description:result.data.description,
           tasktype:result.data.task_type,
           name:result.data.task_name,
           data:result.data,
+				  title_num:sixlength
       })
 
+
       this.props.form.setFieldsValue({
         tasktype:result.data.task_type,
         name:result.data.task_name,
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index b5c34e975..6b5930bc2 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -1168,7 +1168,8 @@ class GraduationTaskssettingapp extends Component{
                       value={end_time===null||end_time===""?"":moment(end_time, dateFormat)}
                       onChange={this.onChangeTimeend}
                       disabledTime={disabledDateTime}
-                      disabled={this.props.isSuperAdmin()===true?flagPageEdit===true?false:true:this.props.isAdmin()===true?endtimetype===true?true:flagPageEdit===true?false:true:true}
+                      // disabled={this.props.isSuperAdmin()===true?flagPageEdit===true?false:true:this.props.isAdmin()===true?endtimetype===true?true:flagPageEdit===true?false:true:true}
+											disabled={this.props.isAdmin()===true?endtimetype===true?true:flagPageEdit===true?false:true:true}
                       className={this.state.endTimetypes===true||end_timetype===true?"noticeTip":""}
                     />
                     </span>
@@ -1251,7 +1252,8 @@ class GraduationTaskssettingapp extends Component{
                 <div className="stud-class-set bor-bottom-greyE pd20 edu-back-white pl36">
                   <div className={" font-16 color-dark h20 mb20"}>评分设置 </div>
                   <div className={"font-16 h20 mb20"}>最终成绩组成 <span className={"font-14 color-grey-c"}>（取各教师最终评分的平均分）</span></div>
-                  <Checkbox className="ml40 font-16" checked={crosscomment} onChange={this.funcrosscomment}    disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true} >启用交叉评阅 <span className={"font-14 color-grey-c"}>（给老师分配其他指导老师的学生作品）</span>
+                  <Checkbox className="ml40 font-16" checked={crosscomment} onChange={this.funcrosscomment}
+														disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true} >启用交叉评阅 <span className={"font-14 color-grey-c"}>（给老师分配其他指导老师的学生作品）</span>
                   </Checkbox>
                   {crosscomment===true?<div>
                   <div className={"h20 mb30 ml30 mt20 ml87"}>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 1433319b3..2d205001e 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -800,55 +800,62 @@ class GraduationTaskssettinglist extends Component{
 		let category_id=this.props.match.params.category_id;
 		let task_Id = this.props.match.params.task_Id;
 
+		if(this.props.isStudent()===true){
+
+			columns.some((item,key)=> {
+					if (item.title === "学号") {
+					  columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+
+		}
 
 		if(taskslistdata&&taskslistdata.course_group_count<=0){
-			//分班有显示
 
-			columns.map((item,key)=>{
-				if(item.title==="分班"){
-					columns.splice(key,1)
+			columns.some((item,key)=> {
+					if (item.title === "分班") {
+						columns.splice(key, 1)
+						return true
+					}
 				}
-			})
+			)
 
 		}
 
      if(taskslistdata&&taskslistdata.cross_comment===false){
 
-			 columns.map((item,key)=>{
-			 		if(item.title==="交叉评分"){
-						columns.splice(key,1)
+			 columns.some((item,key)=> {
+					 if (item.title === "交叉评分") {
+						 columns.splice(key, 1)
+						 return true
+					 }
+				 }
+			 )
+
+		 }
+
+		if(taskslistdata&&taskslistdata.have_grouping===false){
+
+			columns.some((item,key)=> {
+					if (item.title === "关联项目") {
+						columns.splice(key, 1)
+						return true
 					}
-			 })
+				}
+			)
 
-			 if(taskslistdata&&taskslistdata.have_grouping===false){
-				 columns.map((item,key)=>{
-					 if(item.title==="关联项目"){
-						 columns.splice(key,1)
-					 }
-				 })
 
-				 columns.map((item,key)=>{
-					 if(item.title==="分组"){
-						 columns.splice(key,1)
-					 }
-				 })
-			 }
-
-		 }else{
-			 if(taskslistdata&&taskslistdata.have_grouping===false){
-				 columns.map((item,key)=>{
-					 if(item.title==="关联项目"){
-						 columns.splice(key,1)
-					 }
-				 })
+			columns.some((item,key)=> {
+					if (item.title === "分组") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
 
-				 columns.map((item,key)=>{
-					 if(item.title==="分组"){
-						 columns.splice(key,1)
-					 }
-				 })
-			 }
-		 }
+		}
 
 		return(
 			<React.Fragment>
@@ -1018,8 +1025,8 @@ class GraduationTaskssettinglist extends Component{
 											{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
 												导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 												<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">导出成绩</a></li>
-													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">导出作品附件</a></li>
+													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} className="color-dark">学生成绩</a></li>
+													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} className="color-dark">作品附件</a></li>
 												</ul>
 											</li>:""}
 
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index ea368d478..c7ae7292d 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -3,6 +3,7 @@ import CoursesListType from '../coursesPublic/CoursesListType';
 import {WordsBtn,ActionBtn} from 'educoder';
 import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal';
 import HomeworkModal from "../coursesPublic/HomeworkModal";
+import NoneData from '../coursesPublic/NoneData'
 import {
 	Form,
 	Select,
@@ -93,23 +94,27 @@ class ShixunStudentWork extends Component {
 		let url = "/homework_commons/" + homeworkid + "/code_review_results.json";
 
 		axios.get(url).then((response) => {
+			debugger
 			if (response.data.status === undefined || response.data.status === 0) {
 				if(response.data!=undefined){
-					let datas=[];
-					let list=response.data.users_reviews;
-					for(var i=0; i<list.length; i++){
-						datas.push({
-							number:i+1,
-							name:list[i].username,
-							stduynumber:list[i].student_id,
-							classroom:parseInt(list[i].code_rate),
-							operating:list[i].user_id
+					if(response.data.status!=-2){
+						let datas=[];
+						let list=response.data.users_reviews;
+						for(var i=0; i<list.length; i++){
+							datas.push({
+								number:i+1,
+								name:list[i].username,
+								stduynumber:list[i].student_id,
+								classroom:parseInt(list[i].code_rate),
+								operating:list[i].user_id
+							})
+						}
+						this.setState({
+							data: response.data,
+							datalist:datas
 						})
 					}
-					this.setState({
-						data: response.data,
-						datalist:datas
-					})
+
 				}
 			}
 
@@ -154,21 +159,24 @@ class ShixunStudentWork extends Component {
 		}}).then((response) => {
 			if (response.data.status === undefined || response.data.status === 0) {
 				if(response.data!=undefined){
-					let datas=[];
-					let list=response.data.users_reviews;
-					for(var i=0; i<list.length; i++){
-						datas.push({
-							number:i+1,
-							name:list[i].username,
-							stduynumber:list[i].student_id,
-							classroom:parseInt(list[i].code_rate),
-							operating:list[i].user_id
+					if(response.data.status!=-2) {
+						let datas = [];
+						let list = response.data.users_reviews;
+						for (var i = 0; i < list.length; i++) {
+							datas.push({
+								number: i + 1,
+								name: list[i].username,
+								stduynumber: list[i].student_id,
+								classroom: parseInt(list[i].code_rate),
+								operating: list[i].user_id
+							})
+						}
+						this.setState({
+							data: response.data,
+							datalist: datas
 						})
 					}
-					this.setState({
-						data: response.data,
-						datalist:datas
-					})
+
 				}
 			}
 
@@ -505,6 +513,18 @@ class ShixunStudentWork extends Component {
 			},
 		];
 
+		if(this.props.isNotMember()===true){
+
+			columns.some((item,key)=> {
+					if (item.title === "学号") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+
+		}
+
 		return (
 			<div className="newMain clearfix ">
 				{this.state.showmodel===true?<ShixunWorkModal
@@ -535,7 +555,6 @@ class ShixunStudentWork extends Component {
 					starttimes={this.state.starttimes}
 					typs={this.state.typs}
 				/>
-				{data&&data?
 					<div className={"educontent mb20"}>
 						<div className="educontent mb25">
 							<p className="clearfix mb25 mt5">
@@ -554,10 +573,10 @@ class ShixunStudentWork extends Component {
 					</div>
 						<div className="educontent mb30">
 						<p className=" fl color-black  summaryname">
-							{data.homework_name}
+							{data&&data.homework_name}
 						</p>
 						<CoursesListType
-							typelist={data.homework_status}
+							typelist={data&&data.homework_status}
 						/>
 						<a className="color-grey-9 fr font-16 summaryname  ml20 mr20"
 							 href={`/courses/${this.state.props.match.params.coursesId}/${this.state.shixuntypes}/${jobsettingsdata === undefined ? "" :jobsettingsdata.data.category.category_id}`}>返回</a>
@@ -593,10 +612,10 @@ class ShixunStudentWork extends Component {
 									href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}
 								>导出</a> : ""}
 								{this.props.isAdmin()?
-									data.end_immediately===true?
+									data&&data.end_immediately===true?
 									<a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a> : "" : ""}
 								{this.props.isAdmin()?
-									data.publish_immediately===true?
+									data&&data.publish_immediately===true?
 									<a className="fr color-blue font-16" onClick={this.homeworkstart}>立即发布</a> : "" : ""}
 
 								{/*{this.props.isAdmin()?*/}
@@ -623,10 +642,11 @@ class ShixunStudentWork extends Component {
 
 							`}
 						</style>
-						<li className="clearfix startbox" style={{display:duplicatechecking===true?"":"none"}}>
+						<li className="clearfix startbox mb20" style={{display:duplicatechecking===true?"":"none"}}>
 							<span className={"startfont"}>
 									正在执行查重，请稍后刷新页面查看结果    温馨提示：执行时间因查重作品数以及作品的代码量而异
 							</span>
+							<NoneData></NoneData>
 						</li>
 						<style>
 							{`
@@ -638,6 +658,8 @@ class ShixunStudentWork extends Component {
 							`}
 						</style>
 
+						{data&&data?
+						<div>
 						<ul className="clearfix" style={{padding: '20px 40px 10px 40px'}}>
 							<li className="clearfix ">
 
@@ -742,9 +764,9 @@ class ShixunStudentWork extends Component {
 							/>}
 						</div>
 
-					</div>
+					</div>:""}
 
-				</div>:""}
+				</div></div>
 
 
 
diff --git a/public/react/src/modules/tpm/SiderBar.js b/public/react/src/modules/tpm/SiderBar.js
index b0b029b45..f8af121e1 100644
--- a/public/react/src/modules/tpm/SiderBar.js
+++ b/public/react/src/modules/tpm/SiderBar.js
@@ -95,7 +95,7 @@ class SiderBar extends Component {
                 </div>
 
                 <div className="feedback" tooltips="意见反馈">
-                    <a target="_blank" className="color_white" href="https://www.educoder.net/help?index=6">
+                    <a target="_blank" className="color_white" href="/help?index=6">
                         <i className="iconfont icon-yijianfankui color-white font-22"></i>
                     </a>
                 </div>

From 9832ae4c4c747946a763c3f0c9a10a5737b29225 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 16:14:40 +0800
Subject: [PATCH 35/39] =?UTF-8?q?=E5=85=A8=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/courses/members/teacherList.js    | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index 10e646590..35ef28bca 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -89,10 +89,20 @@ function buildColumns(that) {
                 </p>):
                 ''
               }
+              {course_groups && course_groups.length > 1 && <li key={'_all' + index} >
+              {/* 防止被外面group包裹 */}
+                <Checkbox.Group>
+                  <Checkbox 
+                    checked={that.state.checkAllArray[index]}
+                    style={{ marginRight: '6px' }} onClick={(e) => that.onCheckAllChange(e, item, index)} onChange={() => {}}
+                  >全选</Checkbox>
+                </Checkbox.Group>
+              </li>}
               <Checkbox.Group onChange={(checkedValues) => that.joinCourseGroup(checkedValues, item, index)} 
                   value={arg_course_groups.map(item => item.id)}
                   disabled={!isAdminOrCreator}
               >
+              
               {
                 course_groups && course_groups.filter((item) => {
                   return (!that.state.groupSearchValue || item.name.indexOf(that.state.groupSearchValue) != -1)
@@ -165,7 +175,7 @@ function buildColumns(that) {
     dataIndex: 'course_member_id',
     key: 'course_member_id',
     render: (content, item, index) => {
-      return <Checkbox value={content}></Checkbox>
+      return content ? <Checkbox value={content}></Checkbox> : ''
     }
   })
   }
@@ -190,7 +200,20 @@ class studentsList extends Component{
       teachers: [],
       checkBoxValues: [],
       isSpin:false,
-      application_list: []
+      application_list: [],
+      checkAllArray: []
+    }
+  }
+  onCheckAllChange = (e, item, index) => {
+    const that = this;
+    debugger;
+    const checkAllArray = that.state.checkAllArray.slice(0)
+    checkAllArray[index] = !checkAllArray[index]
+    that.setState({checkAllArray})
+    if (checkAllArray[index]) {
+      that.joinCourseGroup(that.state.course_groups.map((item) => item.id), item, index)
+    } else {
+      that.joinCourseGroup([], item, index)
     }
   }
   inputSearch=(e)=>{

From 5f1d34b1ff06b39943a8e5889243791c70f2ab64 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 16:20:25 +0800
Subject: [PATCH 36/39] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E7=8F=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/members/teacherList.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/public/react/src/modules/courses/members/teacherList.js b/public/react/src/modules/courses/members/teacherList.js
index 35ef28bca..c5422b96f 100644
--- a/public/react/src/modules/courses/members/teacherList.js
+++ b/public/react/src/modules/courses/members/teacherList.js
@@ -117,6 +117,11 @@ function buildColumns(that) {
                   )
                 })
               }
+              <p className="drop_down_btn">
+                <a href="javascript:void(0)" className="color-grey-6"
+                    onClick={() => trigger('groupAdd', that.props.coursesids)}
+                >添加分班...</a>
+              </p>
               </Checkbox.Group>
             </ul>}
           </React.Fragment> }

From 2ab6e4d874a86bde1fc2c316a65618c0b0e24384 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 16:28:00 +0800
Subject: [PATCH 37/39] =?UTF-8?q?=E5=B7=B2=E5=8A=A0=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/members/modal/AddStudentModal.js    | 6 ++++--
 .../src/modules/courses/members/modal/AddTeacherModal.js    | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/public/react/src/modules/courses/members/modal/AddStudentModal.js b/public/react/src/modules/courses/members/modal/AddStudentModal.js
index 0b747171d..cb40c1983 100644
--- a/public/react/src/modules/courses/members/modal/AddStudentModal.js
+++ b/public/react/src/modules/courses/members/modal/AddStudentModal.js
@@ -221,7 +221,8 @@ class AddStudentModal extends Component{
           <Checkbox className="fl" style={{ visibility: 'hidden' }}  ></Checkbox>
           <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'姓名'}</label></span>
           <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'学号'}</label></span>
-          <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span>
+          <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span>
+          <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px;"}}>{''}</label></span>
           
         </p>
         <Spin size="large" spinning={isSpin}>
@@ -252,7 +253,8 @@ class AddStudentModal extends Component{
                           <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.student_id || '　'}</label>
                         </ConditionToolTip>
                       </span>
-                      <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
+                      <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
+                      <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px"}}>{candidate.added ? '已加入' : ''}</label></span>
                       
                     </p>
                   )
diff --git a/public/react/src/modules/courses/members/modal/AddTeacherModal.js b/public/react/src/modules/courses/members/modal/AddTeacherModal.js
index 21bfdbc8c..268238d98 100644
--- a/public/react/src/modules/courses/members/modal/AddTeacherModal.js
+++ b/public/react/src/modules/courses/members/modal/AddTeacherModal.js
@@ -292,7 +292,8 @@ class AddTeacherModal extends Component{
           <Checkbox className="fl" style={{ visibility: 'hidden' }}  ></Checkbox>
           <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'姓名'}</label></span>
           <span className="fl with25"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'昵称'}</label></span>
-          <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span>
+          <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{'单位'}</label></span>
+          <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px"}}>{''}</label></span>
           
         </p>
         { candidates && candidates.length ? <div>
@@ -322,7 +323,8 @@ class AddTeacherModal extends Component{
                           <label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.nickname || '　'}</label>
                         </ConditionToolTip>
                       </span>
-                      <span className="fl with45"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
+                      <span className="fl with35"><label className="task-hide fl" style={{"maxWidth":"208px;"}}>{candidate.school_name}</label></span>
+                      <span className="fl with10"><label className="task-hide fl" style={{"maxWidth":"48px;"}}>{candidate.added ? '已加入' : ''}</label></span>
                       
                     </p>
                   )

From 193c9a2576223567622d953c90bd32f97bd52ef9 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 16:31:01 +0800
Subject: [PATCH 38/39] isAdminOrStudent

---
 public/react/src/modules/courses/busyWork/CommonWorkList.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 46d06e300..30bc37d88 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -93,7 +93,7 @@ function buildColumns(that, student_works) {
       </div>
     ),
   }]
-  if (!niPingAndIsStudent) {
+  if (!niPingAndIsStudent && isAdminOrStudent) {
     columns.push({
       width: 88,
       title: '学号',

From 7f57b5339788b6f4b8359dca2474ef21c5f29e89 Mon Sep 17 00:00:00 2001
From: hjm <63528605@qq.com>
Date: Sat, 29 Jun 2019 16:34:49 +0800
Subject: [PATCH 39/39] =?UTF-8?q?=E5=AD=A6=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/members/studentsList.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/public/react/src/modules/courses/members/studentsList.js b/public/react/src/modules/courses/members/studentsList.js
index 669d8a65d..63ae5683a 100644
--- a/public/react/src/modules/courses/members/studentsList.js
+++ b/public/react/src/modules/courses/members/studentsList.js
@@ -80,6 +80,15 @@ const buildColumns = (that) => {
     width:"50%",
     className:"color-grey-6"
   }];
+  const isAdminOrStudent = that.props.isAdminOrStudent()
+  if (!isAdminOrStudent) {
+    columns.some((item,key)=> {
+      if (item.title === "学号") {
+        columns.splice(key, 1)
+        return true
+      } 
+    })
+  }
   const isAdmin = that.props.isAdmin()
   if (isAdmin) {
     columns.unshift({