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); }); 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/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) => { 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(); } 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) 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 = () => { 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 @@