From d442b9579ee9a0e1876a0c04b8e5349ddcd83ac3 Mon Sep 17 00:00:00 2001 From: lpq Date: Sun, 5 Mar 2023 14:51:35 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E5=AD=A6=E5=91=98=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/TableStudent.vue | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index 91099234..c519d94e 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -689,13 +689,18 @@ function bathDel() { const deleteModalVisible = ref(false); const deleteId = ref(null); - +const deleteTargetId = ref(null); +const deleteType = ref(null); function del(id, row) { + debugger if (row.isLeader === "1") { return message.warning("" + row.name + "是小组长，请勿删除!"); } deleteModalVisible.value = true; deleteId.value = id; + deleteTargetId.value = row.pid; + deleteType.value = row.type + // Modal.confirm({ // title: () => "确定删除?", // icon: () => createVNode(ExclamationCircleOutlined), @@ -717,7 +722,7 @@ function del(id, row) { const sureSameModal = () => { if (deleteId.value) { tableData.value.loading = true; - delStudentList({ ids: [deleteId.value] }).then(() => getStuList()); + delStudentList({ ids: [deleteId.value],targetId: deleteTargetId.value,type:deleteType.value}).then(() => getStuList()); deleteModalVisible.value = false; } }; @@ -725,6 +730,8 @@ const sureSameModal = () => { const closeSameModal = () => { deleteModalVisible.value = false; deleteId.value = null; + deleteTargetId.value = null; + deleteType.value = null; }; function submitCall(flag) { From ad051036d1468d3ba257c62f8f2f1e89f47474b7 Mon Sep 17 00:00:00 2001 From: wyx Date: Sun, 5 Mar 2023 14:53:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=E7=B3=BB=E7=BB=9F=E8=80=83=E8=AF=95?= =?UTF-8?q?=E6=9C=AA=E5=8F=91=E5=B8=83=E6=97=B6=E5=85=81=E8=AE=B8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddTest.vue | 38 ++++++++++++++--------- src/views/learningpath/LevelAddDetail.vue | 1 + src/views/projectcenter/TaskAdd.vue | 3 +- 3 files changed, 27 insertions(+), 15 deletions(-) diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 4d015200..b74c8f47 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -43,7 +43,7 @@
+ placeholder="请输入考试名称" :maxlength="20" :disabled="taskIndex >= 0 && isEdit" />
@@ -58,7 +58,7 @@ {{ formData.examinationTestName }} - +
+ +
+ +
+
@@ -89,7 +96,7 @@ 考试时长：
- 分钟 @@ -103,7 +110,7 @@ 及格线：
- 分 @@ -114,7 +121,7 @@ 考试说明：
-
@@ -126,7 +133,7 @@
允许重复考试： - = 0 && isEdit" :min="-1" :max="300" :precision="0" style=" width: 100px; height: 32px; border-radius: 8px; @@ -142,7 +149,7 @@ 显示答案：
- + 允许查看 不允许查看 @@ -153,7 +160,7 @@ 显示解析：
- + 允许查看 不允许查看 @@ -164,7 +171,7 @@ 评分模式：
- + 最高一次 最后一次 @@ -177,7 +184,7 @@ 试题排列：
- 试题乱序 选项乱序 @@ -199,7 +206,7 @@ 考试名称：
-
@@ -212,7 +219,7 @@
@@ -221,7 +228,7 @@ 考试说明：
-
@@ -242,7 +249,8 @@ import { Form, message } from "ant-design-vue"; const props = defineProps({ type: Number, - taskList: [] + taskList: [], + infoType: String }) const visible = ref(false) const initValue = { @@ -318,6 +326,7 @@ const rulesRef = ref(innerRule); const emit = defineEmits({}) const taskIndex = ref(-1); const dateTime = ref([]); +let isEdit = ref(true); const { resetFields, validate } = Form.useForm(formData, rulesRef); @@ -366,6 +375,7 @@ async function confirm() { function openDrawer(i, row) { + row && (props.infoType=='1'?(row.projectTaskId?row.projectTaskId==null?isEdit.value=false:isEdit.value=true:isEdit.value=false):(row.routerTaskId?row.routerTaskId==null?isEdit.value=false:isEdit.value=true:isEdit.value=false)); row && resetFields(row.info); row && (dateTime.value = [row.info.examinationStartTime, row.info.examinationEndTime]); (i >= 0) && (taskIndex.value = i); diff --git a/src/views/learningpath/LevelAddDetail.vue b/src/views/learningpath/LevelAddDetail.vue index cbfdf832..ab866910 100644 --- a/src/views/learningpath/LevelAddDetail.vue +++ b/src/views/learningpath/LevelAddDetail.vue @@ -558,6 +558,7 @@ const submitStorage = async () => { await releaseRouter(routerId); message.success("关卡和任务数据已保存"); confirmLoading.value = false; + getDetail(); }, }); return; diff --git a/src/views/projectcenter/TaskAdd.vue b/src/views/projectcenter/TaskAdd.vue index 104d0b5e..b049fd82 100644 --- a/src/views/projectcenter/TaskAdd.vue +++ b/src/views/projectcenter/TaskAdd.vue @@ -606,7 +606,8 @@ const submitStorage = async () => { confirmLoading.value = true await request(PROJECT_RELEASE, {projectId: route.query.projectId}) message.success("保存成功"); - confirmLoading.value = false + confirmLoading.value = false; + getTask(); }, }) return