From 5857bef8ecf2ec14701d42005d4af24aa3c54a7a Mon Sep 17 00:00:00 2001 From: wuyx Date: Tue, 27 Dec 2022 10:21:15 +0800 Subject: [PATCH 1/7] =?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 2e21cb56..392e6ac1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本1.07------------"); + console.log("版本1.08------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); From 6e8840ba2853b58f1a48586ea9cb65b7f4ee4183 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 27 Dec 2022 14:47:43 +0800 Subject: [PATCH 2/7] =?UTF-8?q?fix:=E6=B7=BB=E5=8A=A0=E5=AD=A6=E5=91=98?= =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 57b73e3e..0632d507 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -28,8 +28,10 @@ { searchAudi(); }; //重置 +function peopleName(name) { + console.log('people-name', name.target.value) + nameSearch.value.keyword = name.target.value; +} + const resetStu = () => { deleteDepSelect(); - nameSearch.value = {keyword: "", page: 1, pageSize: 10}; - stuReset() + nameSearch.value.keyword = ""; }; //清空选择部门信息 const deleteDepSelect = () => { From a9350027b61a658c98f7661a9795ec74997d9a6c Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 27 Dec 2022 14:53:04 +0800 Subject: [PATCH 3/7] =?UTF-8?q?fix:=E9=94=81=E5=AE=9A=E9=A1=B9=E7=9B=AE/?= =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E8=B7=AF=E5=BE=84=E5=9B=BE=E6=93=8D=E4=BD=9C?= =?UTF-8?q?=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/learningpath/LearningPath.vue | 2 +- src/views/projectcenter/ProjectManage.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/learningpath/LearningPath.vue b/src/views/learningpath/LearningPath.vue index e7c377e8..2db48e06 100644 --- a/src/views/learningpath/LearningPath.vue +++ b/src/views/learningpath/LearningPath.vue @@ -1167,7 +1167,7 @@ export default { key: "opacation", width: "20%", align: "center", - // fixed: "right", + fixed: "right", scopedSlots: { customRender: "action" }, //引入的插槽 customRender: (text) => { // console.log(text); diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index 46e7ffa9..a2436296 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -1394,7 +1394,7 @@ export default { key: "operation", width: 300, align: "center", - // fixed: "right", + fixed: "right", customRender: (value) => { // console.log("value", value.record.type, value.record.status); return ( From 68773176911211a1bc8c24f5b1b3755da2a47801 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 27 Dec 2022 16:10:17 +0800 Subject: [PATCH 4/7] =?UTF-8?q?--=20=E5=AD=A6=E5=91=98=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 0632d507..16a1061f 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -663,6 +663,12 @@ function peopleName(name) { const resetStu = () => { deleteDepSelect(); nameSearch.value.keyword = ""; + nameSearch.value.page = 1; + nameSearch.value.pageSize = 10; + nameSearch.value.departId = null + stuTreeExpandedKeys.value = [] + stuTreeSelectKeys.value = [] + stuReset() }; //清空选择部门信息 const deleteDepSelect = () => { From 93c75bff8d1619373931b233fcb943dcda599161 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 27 Dec 2022 18:31:43 +0800 Subject: [PATCH 5/7] =?UTF-8?q?fix:=E6=96=B0=E5=BB=BA=E8=80=83=E8=AF=95?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/SelectTest.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/SelectTest.vue b/src/components/drawers/SelectTest.vue index 521584ae..c3786ebb 100644 --- a/src/components/drawers/SelectTest.vue +++ b/src/components/drawers/SelectTest.vue @@ -105,7 +105,7 @@ From 63b83e4ca67c6fb1e584306df94737f3931f5105 Mon Sep 17 00:00:00 2001 From: wyx <51903@qq.com> Date: Tue, 27 Dec 2022 20:56:44 +0800 Subject: [PATCH 6/7] =?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 392e6ac1..f62f7c0d 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ export default defineComponent({ const store = useStore(); const isLogin = ref(false); // console.log("router", router.getRoutes(), route); - console.log("版本1.08------------"); + console.log("版本1.09------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); }); From 2c9de25f53310ef8af8e0955ea27f883c6fc45e4 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Tue, 27 Dec 2022 21:00:45 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.prod | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.env.prod b/.env.prod index d1875375..451d13bb 100644 --- a/.env.prod +++ b/.env.prod @@ -2,4 +2,7 @@ NODE_ENV=prod VUE_APP_BASE=/manage VUE_APP_BASE_API=/manageApi -VUE_APP_BOE_API_URL=https://u-pre.boe.com \ No newline at end of file +VUE_APP_BOE_API_URL=https://u.boe.com + +VUE_APP_IFRAME_URL=https://u.boe.com/pc/iframe +VUE_APP_IFRAME_STUDENT_URL=https://u.boe.com/pc/loading \ No newline at end of file