From e3afa642f416f605f3b183c6e4e76f964175c3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 17 Dec 2019 18:46:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 18b2620a9..541176301 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -344,7 +344,7 @@ class Listofworksstudentone extends Component { // ), // }, { - title: '当前完成关卡', + title: '最新完成关卡', dataIndex: 'curcomlevel', key: 'curcomlevel', align: "center", @@ -738,7 +738,7 @@ class Listofworksstudentone extends Component { // ), // }, { - title: '当前完成关卡', + title: '最新完成关卡', dataIndex: 'curcomlevel', key: 'curcomlevel', align: "center", @@ -1091,7 +1091,7 @@ class Listofworksstudentone extends Component { // ), // }, { - title: '当前完成关卡', + title: '最新完成关卡', dataIndex: 'curcomlevel', key: 'curcomlevel', align: "center", @@ -1454,7 +1454,7 @@ class Listofworksstudentone extends Component { ) }, { - title: '当前完成关卡', + title: '最新完成关卡', dataIndex: 'curcomlevel', key: 'curcomlevel', align: "center", @@ -3477,22 +3477,22 @@ class Listofworksstudentone extends Component { } if(homewrok===false){ for(var i=0;i Date: Tue, 17 Dec 2019 19:03:39 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 541176301..03bf13f13 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -496,7 +496,7 @@ class Listofworksstudentone extends Component { render: (text, record) => ( { - record.submitstate === "未提交" ? -- + record.submitstate === "未开启" ? -- : ( { - record.submitstate === "未提交" ? -- + record.submitstate === "未开启" ? -- : ( - record.submitstate === "未提交" ? + record.submitstate === "未开启" ? this.Viewstudenttraininginformationtysl2(e, record)} onClick={() => this.Viewstudenttraininginformationt(record)}>评阅 : @@ -1653,7 +1653,7 @@ class Listofworksstudentone extends Component { className: 'font-14', width: '40px', render: (text, record) => ( - record.submitstate === "未提交" ? + record.submitstate === "未开启" ? this.Viewstudenttraininginformationtysl2(e, record)} onClick={() => this.Viewstudenttraininginformationt(record)}>评阅 : @@ -1896,7 +1896,7 @@ class Listofworksstudentone extends Component { // search:搜索关键字 // order:排序方式：更新时间：update_time，当前成绩：work_score，学号：student_id // b_order:desc：倒序 ， asc：顺序 - // work_status:0:未提交， 1:按时完成， 2:延时完成，“”不限 + // work_status:0:未开启， 1:按时完成， 2:延时完成，“”不限 // course_group:分班情况 [232, 231]， []:不限（空数组） var order = "asc"; if (ordervlue === "updated_at") { @@ -2074,7 +2074,7 @@ class Listofworksstudentone extends Component { stduynumber: teacherdata.student_id, classroom: teacherdata.group_name, cost_time: teacherdata.cost_time, - submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关", + submitstate: teacherdata.work_status === 0 ? "未开启" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关", // updatetime:this.state.teacherdata.student_works[i].update_time, // updatetime:"", updatetime: timedata === "Invalid date" ? "--" : timedata, @@ -2118,7 +2118,7 @@ class Listofworksstudentone extends Component { stduynumber: student_works[i].student_id, classroom: student_works[i].group_name, cost_time: student_works[i].cost_time, - submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "未通关" : student_works[i].work_status === 2 ? "按时通关" : "迟交通关", + 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, @@ -2279,7 +2279,7 @@ class Listofworksstudentone extends Component { stduynumber: teacherdata.student_id, classroom: teacherdata.group_name, cost_time: teacherdata.cost_time, - submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关", + submitstate: teacherdata.work_status === 0 ? "未开启" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关", // updatetime:this.state.teacherdata.student_works[i].update_time, // updatetime:"", updatetime: timedata === "Invalid date" ? "--" : timedata, @@ -2432,7 +2432,7 @@ class Listofworksstudentone extends Component { // search:搜索关键字 // order:排序方式：更新时间：update_time，当前成绩：work_score，学号：student_id // b_order:desc：倒序 ， asc：顺序 - // work_status:0:未提交， 1:按时完成， 2:延时完成，“”不限 + // work_status:0:未开启， 1:按时完成， 2:延时完成，“”不限 // course_group:分班情况 [232, 231]， []:不限（空数组） var order = "asc"; if (ordervlue === "updated_at") { @@ -2641,7 +2641,7 @@ class Listofworksstudentone extends Component { stduynumber: student_works[i].student_id, classroom: student_works[i].group_name, cost_time: student_works[i].cost_time, - submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "未通关" : student_works[i].work_status === 2 ? "按时通关" : "迟交通关", + 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, From 136e0b9a91fe16b117109ba4585c3d62b9415794 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Dec 2019 19:07:08 +0800 Subject: [PATCH 3/3] =?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/config/webpack.config.prod.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/config/webpack.config.prod.js b/public/react/config/webpack.config.prod.js index 596843f5f..1fe7a6c93 100644 --- a/public/react/config/webpack.config.prod.js +++ b/public/react/config/webpack.config.prod.js @@ -326,8 +326,8 @@ module.exports = { comments: false }, compress: { - drop_debugger: false, - drop_console: false + drop_debugger: true, + drop_console: true } } }),