From 197540a7a4f0e6638f72a9a522556e599b1aee55 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 10 Mar 2023 17:04:14 +0800 Subject: [PATCH 1/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 393238b7..0b88f261 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本1.4.5------------"); +console.log("版本1.4.6------------"); // 监听关闭浏览器 let time1 = ref(0); From d6291d86b97370ba22dcebba3f84ba365c03372b Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 10 Mar 2023 19:53:48 +0800 Subject: [PATCH 2/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 0b88f261..9df04b88 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本1.4.6------------"); +console.log("版本1.4.7------------"); // 监听关闭浏览器 let time1 = ref(0); From c14660d79ffaa097792506dbfa57895aa63aad2d Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Fri, 17 Mar 2023 09:07:14 +0800 Subject: [PATCH 3/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 9df04b88..85d239da 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本1.4.7------------"); +console.log("版本1.4.8------------"); // 监听关闭浏览器 let time1 = ref(0); From b4ac4d36a38791b63fbf341e3124bb99c7baaacd Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Fri, 31 Mar 2023 11:30:30 +0800 Subject: [PATCH 4/9] --fix bug --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 533d8072..6b95833a 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本2.3.6------------"); +console.log("版本2.3.7------------"); // 监听关闭浏览器 let time1 = ref(0); From fca6a654fc966e5fbc17d4f68fa9a91b0ff26f8f Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 3 Apr 2023 13:40:29 +0800 Subject: [PATCH 5/9] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E9=9D=A2=E6=8E=88?= =?UTF-8?q?=E8=AF=BE=E7=9A=84=E5=BC=80=E8=AF=BE=EF=BC=8C=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BD=9C=E4=B8=9A=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- src/components/drawers/CommonHomework.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/App.vue b/src/App.vue index 6b95833a..b9f4cd01 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本2.3.7------------"); +console.log("版本2.3.8------------"); // 监听关闭浏览器 let time1 = ref(0); diff --git a/src/components/drawers/CommonHomework.vue b/src/components/drawers/CommonHomework.vue index 9c57079a..e4875a63 100644 --- a/src/components/drawers/CommonHomework.vue +++ b/src/components/drawers/CommonHomework.vue @@ -5,7 +5,7 @@
-
{{ info.workName ? "编辑" : "添加" }}任务
+
{{ info?.workName ? "编辑" : "添加" }}任务
From 82f66ca3afce95eb6d5d5b3460637f6e8046b746 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 3 Apr 2023 14:57:52 +0800 Subject: [PATCH 6/9] --fix bug --- src/components/student/CommonStudent.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 4cc78d6b..01c17440 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -643,7 +643,7 @@ function handleDialogOk() { } function handleStageOk() { - if (props.type === 1 && props.groupId && props.groupMemberCount < projectSelectRows.value.length + stuSelectRows.value.length) { + if (props.type === 1 && props.groupId && (props.groupMemberCount < (props.groupMemberNumber * 1 + projectSelectRows.value.length + stuSelectRows.value.length))) { return message.warning("添加小组学员超过最大值"); } stageVisible.value = false; From afe3f9f2c1ac0e195458daab6923b018794edfd1 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 3 Apr 2023 16:14:43 +0800 Subject: [PATCH 7/9] --fix bug --- src/components/common/BaseTable.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/common/BaseTable.vue b/src/components/common/BaseTable.vue index 8bff27dc..504c73bc 100644 --- a/src/components/common/BaseTable.vue +++ b/src/components/common/BaseTable.vue @@ -99,6 +99,7 @@ const pagination = computed(() => ({ })); const changePagination = (e) => { params.value[props.pageKey] = e; + emit("update:params", { ...params.value }); nextTick(onFetch); }; From 8cd130562df9a035b173608bffba20c352ff0d38 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 3 Apr 2023 16:35:48 +0800 Subject: [PATCH 8/9] --fix bug --- src/components/common/BaseTable.vue | 1 - src/components/student/CommonStudent.vue | 17 +++++++---------- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/src/components/common/BaseTable.vue b/src/components/common/BaseTable.vue index 504c73bc..8bff27dc 100644 --- a/src/components/common/BaseTable.vue +++ b/src/components/common/BaseTable.vue @@ -99,7 +99,6 @@ const pagination = computed(() => ({ })); const changePagination = (e) => { params.value[props.pageKey] = e; - emit("update:params", { ...params.value }); nextTick(onFetch); }; diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 01c17440..1128dbff 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -33,7 +33,7 @@
@@ -76,7 +76,7 @@ border: 1px solid #f0f0f0; "> @@ -131,8 +131,8 @@
-
@@ -397,8 +397,6 @@ const stuTreeSelectKeys = ref([]); const stuTreeExpandedKeys = ref([]); const audienceName = ref({ keyword: "", - page: 1, - pageSize: 10, }); const searchOrgName = ref({ keyword: "", @@ -550,7 +548,7 @@ const closeDrawer = () => { }; function searchAudi() { - auditTableRef.value.fetch(); + auditTableRef.value.reset(audienceName.value); } function onLoadData(treeNode) { @@ -579,8 +577,7 @@ const openDrawer = () => { }; function onSearchStu() { - nameSearch.value.page = 1; - stuTableRef.value.fetch(); + stuTableRef.value.reset(nameSearch.value); } function stuStuOrgSelect(e) { @@ -617,7 +614,7 @@ const deleteDepSelect = () => { }; //重置组织 const resetOrg = () => { - searchOrgName.value = { keyword: "", page: 1, pageSize: 10 }; + searchOrgName.value = { keyword: "" }; }; //重置受众 const resetAudienceInfo = () => { From 25a8b572321fbb57b932bdac745f2836418bcdd2 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Mon, 3 Apr 2023 17:09:00 +0800 Subject: [PATCH 9/9] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index b9f4cd01..9ef82df2 100644 --- a/src/App.vue +++ b/src/App.vue @@ -33,7 +33,7 @@ import {USER_PERMISSION} from "@/api/ThirdApi"; const store = useStore(); const isLogin = ref(false); -console.log("版本2.3.8------------"); +console.log("版本2.3.9------------"); // 监听关闭浏览器 let time1 = ref(0);