diff --git a/src/components/drawers/AddActive.vue b/src/components/drawers/AddActive.vue index 53a2f6fe..5388f71c 100644 --- a/src/components/drawers/AddActive.vue +++ b/src/components/drawers/AddActive.vue @@ -354,6 +354,7 @@ export default { display: flex; justify-content: space-between; align-items: center; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; diff --git a/src/components/drawers/AddDiscuss.vue b/src/components/drawers/AddDiscuss.vue index a77c6c06..ca4a7749 100644 --- a/src/components/drawers/AddDiscuss.vue +++ b/src/components/drawers/AddDiscuss.vue @@ -169,6 +169,7 @@ export default { display: flex; justify-content: space-between; align-items: center; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue index 6c8c4f29..16922bf3 100644 --- a/src/components/drawers/AddEval.vue +++ b/src/components/drawers/AddEval.vue @@ -374,6 +374,7 @@ export default { display: flex; justify-content: space-between; align-items: center; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; diff --git a/src/components/drawers/AddFaceteach.vue b/src/components/drawers/AddFaceteach.vue index 412dfb7a..cd42ca90 100644 --- a/src/components/drawers/AddFaceteach.vue +++ b/src/components/drawers/AddFaceteach.vue @@ -380,6 +380,7 @@ export default { display: flex; justify-content: space-between; align-items: center; + flex-shrink: 0; .headerTitle { font-size: 18px; font-weight: 600; diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue index f1fb1d21..e5f6f5fc 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 @@
- - + 取消 + 确定
+ +
diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 5bebe866..1a5a7ad1 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -542,6 +542,7 @@ import * as apilive from "../../api/indexLiveBroadcast"; import * as apidiscuss from "../../api/indexDiscuss"; import * as apiactivity from "../../api/indexActivity"; import * as apieval from "../../api/indexEval"; +import * as apiinvist from "../../api/indexInvist"; const drawercolumns = [ { title: "项目名称", @@ -857,6 +858,8 @@ export default { isactive: -1, isActive: false, deleteLiveID: null, //删除直播id + deleteEvalID: null, //测评 + deleteInvistID: null, //评估 deleteDiscussID: null, //删除讨论id deleteActivityID: null, //删除活动id }); @@ -983,7 +986,8 @@ export default { style="color:#4EA6FF;cursor:pointer" onClick={() => { showDelete(); - {/* deleteEvalText(); */} + deleteEvalText(); + deleteInvistText(); }} > 删除 @@ -1066,17 +1070,16 @@ export default { console.log("删除失败", err); }); }; - //删除评估测试 + //删除测评测试 const deleteEvalText = () => { let obj = { - evaluationId:state.deleteLiveID, + evaluationId:state.deleteEvalID, }; apieval .deleteEvaluationById(obj) .then((res) => { console.log("删除成功", res); message.success("删除成功"); - state.deleteModal = false; //重新获取列表 getTask(); }) @@ -1084,6 +1087,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; @@ -1214,6 +1236,7 @@ export default { deleteDiscuss, deleteEvalText, deleteActivity, + deleteInvistText, }; }, };