From 2de2f609b179fbe651d708d87f0857acfaeb0040 Mon Sep 17 00:00:00 2001 From: dongwug Date: Tue, 1 Nov 2022 17:02:26 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:=E5=88=A0=E9=99=A4=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/projectcenter/TaskAdd.vue | 31 +++++++++++++++++++++++++---- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 96753fa5..8c4127fc 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -540,6 +540,7 @@ import { message } from "ant-design-vue"; import * as api from "../../api/indexTaskadd"; import * as apilive from "../../api/indexLiveBroadcast"; import * as apieval from "../../api/indexEval"; +import * as apiinvist from "../../api/indexInvist"; const drawercolumns = [ { title: "项目名称", @@ -855,6 +856,8 @@ export default { isactive: -1, isActive: false, deleteLiveID: null, //删除直播id + deleteEvalID: null, //测评 + deleteInvistID: null, //评估 }); const selectProjectName = (value, index) => { console.log("value", value, index); @@ -979,7 +982,8 @@ export default { style="color:#4EA6FF;cursor:pointer" onClick={() => { showDelete(); - {/* deleteEvalText(); */} + deleteEvalText(); + deleteInvistText(); }} > 删除 @@ -1027,17 +1031,16 @@ export default { }); }; - //删除评估测试 + //删除测评测试 const deleteEvalText = () => { let obj = { - evaluationId:state.deleteLiveID, + evaluationId:state.deleteEvalID, }; apieval .deleteEvaluationById(obj) .then((res) => { console.log("删除成功", res); message.success("删除成功"); - state.deleteModal = false; //重新获取列表 getTask(); }) @@ -1045,6 +1048,25 @@ export default { console.log("删除失败", err); }); }; + + //删除评估测试 + const deleteInvistText = () => { + let obj = { + evaluationId:state.deleteInvistID, + }; + apiinvist + .deleteAppraise(obj) + .then((res) => { + console.log("删除成功", res); + message.success("删除成功"); + //重新获取列表 + getTask(); + }) + .catch((err) => { + console.log("删除失败", err); + }); + }; + const onSelectChange = (selectedRowKeys) => { console.log("selectedRowKeys changed: ", selectedRowKeys); state.selectedRowKeys = selectedRowKeys; @@ -1173,6 +1195,7 @@ export default { getTask, deleteLiveBroadcast, deleteEvalText, + deleteInvistText, }; }, }; From b0fe8b7fa3e99d622152dba9904b6c0df614b0aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E7=86=99=E4=B8=9C?= <2195178163@qq.com> Date: Tue, 1 Nov 2022 17:11:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?Fix:=20=E4=BD=9C=E4=B8=9A&=E8=80=83?= =?UTF-8?q?=E8=AF=95=E8=A1=A8=E5=8D=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddHomework.vue | 172 +++++++---- src/components/drawers/AddTest.vue | 387 ++++++++++++++++--------- 2 files changed, 368 insertions(+), 191 deletions(-) diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index f1fb1d21..8b1df370 100644 --- a/src/components/drawers/AddHomework.vue +++ b/src/components/drawers/AddHomework.vue @@ -16,56 +16,52 @@ @click="closeDrawer" /> +
+
-
-
- -
- 作业名称: -
- + + autocomplete="off" /> + +
-
-
- -
- 作业要求: -
-
+ -
+
-
- 提交时间: -
+ +
@@ -83,7 +79,6 @@ v-model:file-list="fileList" name="file" action="/api/file/upload" - :headers="headers" @change="handleChange" > @@ -100,14 +95,16 @@
- - + 取消 + 确定
+ +