From fdcdbde21400d2b7600f8cf23458733ce88d6c16 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Tue, 10 Jan 2023 18:13:17 +0800 Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E8=A1=A8=E6=A0=BC=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drawers/project/ProjectEvalManage.vue | 6 ++- .../drawers/project/ProjectExamManage.vue | 3 +- .../drawers/project/ProjectFaceTaskManage.vue | 3 +- .../drawers/project/ProjectOnlineManage.vue | 6 ++- .../drawers/router/RouterCommonManage.vue | 52 ++++++++++++------- .../drawers/router/RouterEvaluationManage.vue | 6 +-- .../router/RouterExaminationManage.vue | 4 +- .../drawers/router/RouterFaceTeachManage.vue | 4 +- src/components/student/TableStudent.vue | 2 +- 9 files changed, 53 insertions(+), 33 deletions(-) diff --git a/src/components/drawers/project/ProjectEvalManage.vue b/src/components/drawers/project/ProjectEvalManage.vue index 4cc905c5..9f989811 100644 --- a/src/components/drawers/project/ProjectEvalManage.vue +++ b/src/components/drawers/project/ProjectEvalManage.vue @@ -25,9 +25,10 @@ > 起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }} +
@@ -69,10 +70,11 @@
+
导出数据
diff --git a/src/components/drawers/project/ProjectExamManage.vue b/src/components/drawers/project/ProjectExamManage.vue index 17bb879b..2a32f0a4 100644 --- a/src/components/drawers/project/ProjectExamManage.vue +++ b/src/components/drawers/project/ProjectExamManage.vue @@ -57,10 +57,11 @@
+
导出数据
diff --git a/src/components/drawers/project/ProjectFaceTaskManage.vue b/src/components/drawers/project/ProjectFaceTaskManage.vue index 675a2ad1..0fd62480 100644 --- a/src/components/drawers/project/ProjectFaceTaskManage.vue +++ b/src/components/drawers/project/ProjectFaceTaskManage.vue @@ -68,10 +68,11 @@
-
+
批量标注完成
diff --git a/src/components/drawers/project/ProjectOnlineManage.vue b/src/components/drawers/project/ProjectOnlineManage.vue index 8628b914..530a6e6f 100644 --- a/src/components/drawers/project/ProjectOnlineManage.vue +++ b/src/components/drawers/project/ProjectOnlineManage.vue @@ -39,7 +39,8 @@ v-if="datasource.type !== 6 && datasource.type !== 9" class="endtime" > - 起止时间：— +
起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }} @@ -85,10 +86,11 @@
-
+
导出数据
diff --git a/src/components/drawers/router/RouterCommonManage.vue b/src/components/drawers/router/RouterCommonManage.vue index 461393a2..20445442 100644 --- a/src/components/drawers/router/RouterCommonManage.vue +++ b/src/components/drawers/router/RouterCommonManage.vue @@ -4,7 +4,7 @@ :visible="CommonModelVisible" class="drawerStyle ProjectOnlineManage" placement="right" - width="60%" + width="80%" @after-visible-change="afterVisibleChange" >
@@ -39,7 +39,8 @@ v-if="datasource.type !== 6 && datasource.type !== 9" class="endtime" > - 起止时间：— + +
起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }} @@ -50,7 +51,7 @@
姓名：
@@ -59,12 +60,11 @@
@@ -85,10 +85,11 @@
+
导出数据
@@ -175,16 +176,21 @@ export default { tableDataTotal: 0, projectName: "", projectNameList: [ + { + id: 0, + value: '', + label: "全部", + }, { id: 1, value: "0", label: "未开始", }, - { - id: 2, - value: "2", - label: "进行中", - }, + //{ + // id: 2, + //value: "2", + // label: "进行中", + // }, { id: 3, value: "1", @@ -200,8 +206,9 @@ export default { title: "工号", dataIndex: "studentUserNo", key: "studentUserNo", - width: 50, + width: "20%", align: "center", + ellipsis: true, className: "h head", customRender: (text) => { return ( @@ -215,8 +222,9 @@ export default { title: "姓名", dataIndex: "studentName", key: "studentName", - width: 50, + width: "10%", align: "center", + ellipsis: true, className: "h head", customRender: (text) => { return ( @@ -230,9 +238,11 @@ export default { title: "所在部门", dataIndex: "studentDepartName", key: "studentDepartName", - width: 60, + width: "20%", align: "center", + className: "h", + ellipsis: true, customRender: (text) => { return (
@@ -245,8 +255,9 @@ export default { title: "所在岗位", dataIndex: "studentJobName", key: "studentJobName", - width: 60, + width: "10%", align: "center", + ellipsis: true, className: "h", customRender: (text) => { return ( @@ -260,8 +271,9 @@ export default { title: "学员关卡", dataIndex: "currentStageName", key: "currentStageName", - width: 60, + width: "10%", align: "center", + ellipsis: true, className: "h", customRender: () => { return ( @@ -275,8 +287,9 @@ export default { title: "完成时间", dataIndex: "lastStudyTime", key: "lastStudyTime", - width: 100, + width: "15%", align: "center", + ellipsis: true, className: "h", customRender: (text) => { return ( @@ -290,8 +303,9 @@ export default { title: "任务状态", dataIndex: "finishStatus", key: "finishStatus", - width: 60, + width: "10%", align: "center", + ellipsis: true, className: "h", customRender: (text) => { return ( diff --git a/src/components/drawers/router/RouterEvaluationManage.vue b/src/components/drawers/router/RouterEvaluationManage.vue index 050cac7e..c70633ed 100644 --- a/src/components/drawers/router/RouterEvaluationManage.vue +++ b/src/components/drawers/router/RouterEvaluationManage.vue @@ -26,7 +26,7 @@ 起止时间：{{ datasource.startTime }} ～ {{ datasource.endTime }}
- 起止时间：— +
@@ -69,10 +69,10 @@
-
+
导出数据
diff --git a/src/components/drawers/router/RouterExaminationManage.vue b/src/components/drawers/router/RouterExaminationManage.vue index d8ba8895..b1711cea 100644 --- a/src/components/drawers/router/RouterExaminationManage.vue +++ b/src/components/drawers/router/RouterExaminationManage.vue @@ -57,10 +57,10 @@
-
+
导出数据
diff --git a/src/components/drawers/router/RouterFaceTeachManage.vue b/src/components/drawers/router/RouterFaceTeachManage.vue index 3dd6cf5f..35717f54 100644 --- a/src/components/drawers/router/RouterFaceTeachManage.vue +++ b/src/components/drawers/router/RouterFaceTeachManage.vue @@ -63,10 +63,10 @@
-
+
批量标注完成
diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 69b12142..7f2898a1 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -699,7 +699,7 @@ const exportStu = () => { window.open( `${ process.env.VUE_APP_PROXY_URL - }admin/student/exportTaskStudent?type=${3}&pid=${props.id}` + }admin/student/exportTaskStudent?type=${3}&pid=${props.id}&thirdType=2` ); };