From d73d3a02494fc460968f95b735e2753955cac107 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 18 Mar 2020 21:31:55 +0800
Subject: [PATCH] =?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/busyWork/CommonWorkList.js        | 23 +++++++++++--------
 .../courses/shixunHomework/Chongzuomodel.js   |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js
index 4c53a8362..e45d016bb 100644
--- a/public/react/src/modules/courses/busyWork/CommonWorkList.js
+++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js
@@ -1,6 +1,6 @@
 import React,{Component} from "react";
-import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip,Spin, Pagination} from "antd";
-import {WordsBtn, ConditionToolTip, queryString, publicSearchs, on, off, NoneData, sortDirections} from 'educoder';
+import { Form, Table,Tooltip,Spin, Pagination} from "antd";
+import { queryString, publicSearchs, on, off, NoneData, sortDirections} from 'educoder';
 import axios from 'axios';
 import CheckAllGroup from '../common/button/CheckAllGroup'
 import moment from 'moment';
@@ -11,7 +11,6 @@ import ModulationModal from "../coursesPublic/ModulationModal";
 import AccessoryModal from "../coursesPublic/AccessoryModal";
 import LeaderIcon from './common/LeaderIcon'
 const $ = window.$;
-const Search = Input.Search;
 
 function renderScore(score, content) {
   let color = '#747A7F'
@@ -369,18 +368,24 @@ function buildColumns(that, student_works, studentData) {
           {/* 0 未提交 */}
           {/*<React.Fragment>*/}
           {/*</React.Fragment>*/}
+          <div>
+            <a style={{color: '#4CACFF'}} id={"asdasdasdasd"}
+               className="font-14"
+               onMouseDown={(e) => that.props.toWorkDetailPage2(e, courseId, workId, record.id)}
+              // onClick={() => that.props.toWorkDetailPage(courseId, workId, record.id)}
+            >{isAdmin ? record.has_comment===true?"已评阅":'评阅':"查看"}</a>
+          </div>
+
+          <div>
           { isAdmin && <Tooltip placement="bottom" title={<pre>调整学生当前成绩<br/>其它历史评分将全部失效</pre>}>
-						<a style={{color: "#4CACFF"}}
+						<a style={{color: "#32C090"}}
+               className="font-14"
 							 onClick={() => that.showModulationModal(record)}
               >调分</a>
             </Tooltip> }
+          </div>
             {/* toWorkDetailPage */}
             {/* /classrooms/"+courseId+"/common_homeworks/"+workId+ '/' + record.id +"/appraise */}
-					<a style={{color: '#4CACFF', marginLeft: '4px'}} id={"asdasdasdasd"}
-						 onMouseDown={(e) => that.props.toWorkDetailPage2(e, courseId, workId, record.id)}
-						 // onClick={() => that.props.toWorkDetailPage(courseId, workId, record.id)}
-          >{isAdmin ? record.has_comment===true?"已评阅":'评阅':"查看"}</a>
-
         </div>
 
       ),
diff --git a/public/react/src/modules/courses/shixunHomework/Chongzuomodel.js b/public/react/src/modules/courses/shixunHomework/Chongzuomodel.js
index e0bdc7378..edbd106c8 100644
--- a/public/react/src/modules/courses/shixunHomework/Chongzuomodel.js
+++ b/public/react/src/modules/courses/shixunHomework/Chongzuomodel.js
@@ -23,7 +23,7 @@ class Chongzuomodel extends React.Component {
     this.setState({
       antIcon:true
     })
-    let zrl=`/myshixuns/${this.props.chongzuoId}/reset_my_game.json`;
+    let zrl=`/myshixuns/${this.props.chongzuoId}/reset_my_game.json?course_id=${this.props.match.params.coursesId}`;
     axios.get(zrl).then((response) => {
       this.setState({
         antIcon:false