From eb47cfef65f46868a995ce9bec7a0c510ecb392e Mon Sep 17 00:00:00 2001 From: zhangyc Date: Sun, 25 Dec 2022 21:18:46 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=80=83=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/drawers/AddTest.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/drawers/AddTest.vue b/src/components/drawers/AddTest.vue index 79b9091d..b66b78f0 100644 --- a/src/components/drawers/AddTest.vue +++ b/src/components/drawers/AddTest.vue @@ -436,7 +436,7 @@ export default { }; const afterVisibleChange = (bool) => { console.log("props", props); - if (props.addtestVisible && props.edit) { + if (props.addtestVisible && props.EditTestId) { // 该页面显示同时 edit为true 时，发送查询请求, queryTest(); } From 3003d69468be6f87b70415f071f85f38b3da2ba6 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Sun, 25 Dec 2022 22:17:24 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E9=A1=B5=E9=9D=A2tab?= =?UTF-8?q?=E7=BC=93=E5=AD=98=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/OpenPages.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/OpenPages.vue b/src/components/OpenPages.vue index 44077ee3..b683f706 100644 --- a/src/components/OpenPages.vue +++ b/src/components/OpenPages.vue @@ -51,7 +51,7 @@ export default { const store = useStore(); const $router = useRouter(); const state = reactive({ - openList: store.state.openpages, + //openList: store.state.openpages, }); const closePage = (value) => { From 4c3b3c78e7006b869232a56ee9ff0f57d3b5d0da Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 25 Dec 2022 22:41:32 +0800 Subject: [PATCH 3/8] -- bug --- src/api/request.js | 4 ++-- src/components/project/ProjectManagerNew.vue | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/api/request.js b/src/api/request.js index 9cc44508..7743f04b 100644 --- a/src/api/request.js +++ b/src/api/request.js @@ -77,12 +77,12 @@ export function useBoeUserListPage(_url, params = {}, init = true) { ...params }) - watch(() => params.keyWord, throttle(fetch, 600)) + watch(() => params.keyword, throttle(fetch, 600)) watch(() => params.page, fetch) function fetch() { state.loading = true - if (!params.keyWord) { + if (!params.keyword) { state.loading = false return } diff --git a/src/components/project/ProjectManagerNew.vue b/src/components/project/ProjectManagerNew.vue index 0db58813..bbb0270e 100644 --- a/src/components/project/ProjectManagerNew.vue +++ b/src/components/project/ProjectManagerNew.vue @@ -56,7 +56,7 @@ const emit = defineEmits({}) const isOpen = ref(false) -const memberParam = ref({keyWord: '', page: 1, pageSize: 20}) +const memberParam = ref({keyword: '', page: 1, pageSize: 20}) const {data: userList, loading} = useBoeUserListPage(USER_LIST, memberParam.value, false) @@ -87,23 +87,23 @@ const memberScroll = ({target: {scrollHeight, scrollTop, clientHeight}}) => { }; //搜索学员 -const searchMember = (keyWord) => { - console.log('searchMember', keyWord) +const searchMember = (keyword) => { + console.log('searchMember', keyword) loading.value = true isOpen.value = true userList.value = [] memberParam.value.page = 1 - memberParam.value.keyWord = keyWord + memberParam.value.keyword = keyword }; function blur() { isOpen.value = false - memberParam.value.keyWord = '' + memberParam.value.keyword = '' memberParam.value.page = 1 } function change(e, l) { - memberParam.value.keyWord = '' + memberParam.value.keyword = '' memberParam.value.page = 1 isOpen.value = false Array.isArray(l) && (selectOptions.value = l) From 5693bd9ee105768038abf3bbe3b93b4f92529fa2 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Sun, 25 Dec 2022 23:30:33 +0800 Subject: [PATCH 4/8] -- bug --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index f2f38740..0d841393 100644 --- a/vue.config.js +++ b/vue.config.js @@ -9,7 +9,7 @@ const { defineConfig } = require("@vue/cli-service"); module.exports = defineConfig({ - publicPath: "/manage", + publicPath: process.env.VUE_APP_BASE, // transpileDependencies: true, devServer: { port: 8080, From 60dc9ffcf71470e3bd3aeb6d48a67f48089c815c Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 01:23:01 +0800 Subject: [PATCH 5/8] -- bug --- src/components/student/CommonStudent.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 34f5575b..4839bd3d 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -654,6 +654,7 @@ const deleteDepSelect = () => { //重置受众 const resetAudienceInfo = () => { audienceName.value = { keyword: "", page: 1, pageSize: 10 }; + searchStu(); }; //全部清除 // const deleteAll = () => { From 072a9cab52122c63025cac4b7fe6e017584619dd Mon Sep 17 00:00:00 2001 From: zhangyc Date: Mon, 26 Dec 2022 08:35:40 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E5=95=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 14 ++++++++------ src/views/projectcenter/ProjectManage.vue | 5 ++++- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 4839bd3d..73d233b3 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -637,16 +637,18 @@ const auditChangePagination = (page) => { audienceName.value.page = page; searchAudi(); }; -//重置 +//重置 清空页面上的搜索记录 const resetStu = () => { - deleteDepSelect(); - nameSearch.value = { keyword: "", page: 1, pageSize: 10 }; + //deleteDepSelect(); + nameSearch.value = { keyword: "", page: 1, pageSize: 10, departId: null,}; + stuData.value = []; + stuSelectKeys.value =[]; }; //清空选择部门信息 -const deleteDepSelect = () => { - stuSelectKeys.value = []; -}; +//const deleteDepSelect = () => { + // stuSelectKeys.value = []; +//}; //重置组织 // const resetOrg = () => { // searchOrgName.value = {keyword: '', page: 1, pageSize: 10} diff --git a/src/views/projectcenter/ProjectManage.vue b/src/views/projectcenter/ProjectManage.vue index a67c921f..a0d160ff 100644 --- a/src/views/projectcenter/ProjectManage.vue +++ b/src/views/projectcenter/ProjectManage.vue @@ -45,6 +45,7 @@
创建时间：
+ +
From 44c8d7e43fc320cca2ecf9a417fb38d73ad58144 Mon Sep 17 00:00:00 2001 From: zhangyc Date: Mon, 26 Dec 2022 08:54:47 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E9=87=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/student/CommonStudent.vue | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/src/components/student/CommonStudent.vue b/src/components/student/CommonStudent.vue index 73d233b3..4839bd3d 100644 --- a/src/components/student/CommonStudent.vue +++ b/src/components/student/CommonStudent.vue @@ -637,18 +637,16 @@ const auditChangePagination = (page) => { audienceName.value.page = page; searchAudi(); }; -//重置 清空页面上的搜索记录 +//重置 const resetStu = () => { - //deleteDepSelect(); - nameSearch.value = { keyword: "", page: 1, pageSize: 10, departId: null,}; - stuData.value = []; - stuSelectKeys.value =[]; + deleteDepSelect(); + nameSearch.value = { keyword: "", page: 1, pageSize: 10 }; }; //清空选择部门信息 -//const deleteDepSelect = () => { - // stuSelectKeys.value = []; -//}; +const deleteDepSelect = () => { + stuSelectKeys.value = []; +}; //重置组织 // const resetOrg = () => { // searchOrgName.value = {keyword: '', page: 1, pageSize: 10} From 4fb7fe59ed782f4bba0b9b7529cc8c56a2f97b75 Mon Sep 17 00:00:00 2001 From: yuping <82253452@qq.com> Date: Mon, 26 Dec 2022 09:10:02 +0800 Subject: [PATCH 8/8] =?UTF-8?q?--=20=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 7c212efc..359b7015 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.05------------"); + console.log("版本1.06------------"); const routes = computed(() => { return router.getRoutes().filter((e) => e.meta?.isLink); });