From 814a0e638ada593d84836b9602a4ac5cf403d87f Mon Sep 17 00:00:00 2001 From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com> Date: Thu, 22 May 2025 14:53:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=80=E6=B1=82=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages.json | 3 +- src/pages/comprehensiveQuery/index.vue | 9 +- .../components/addAndEditForm.vue | 72 ++++- .../components/addAndEditForm.vue | 4 +- .../components/addAndEditForm.vue | 73 ++++- .../components/addAndEditForm.vue | 73 ++++- .../components/addAndEditForm.vue | 72 ++++- .../workbenches/components/icon-card.vue | 1 - src/pages/workbenches/index.vue | 298 +++++++++++++++++- src/stores/modules/common.js | 55 ++++ 10 files changed, 634 insertions(+), 26 deletions(-) diff --git a/src/pages.json b/src/pages.json index 410feeb..5f3991d 100644 --- a/src/pages.json +++ b/src/pages.json @@ -20,7 +20,8 @@ { "path": "pages/workbenches/index", "style": { - "navigationBarTitleText": "工作台" + "navigationBarTitleText": "工作台", + "navigationStyle": "custom" // 自定义导航栏 } }, // tabBar 我的页面 diff --git a/src/pages/comprehensiveQuery/index.vue b/src/pages/comprehensiveQuery/index.vue index 6efc976..4f0d059 100644 --- a/src/pages/comprehensiveQuery/index.vue +++ b/src/pages/comprehensiveQuery/index.vue @@ -454,9 +454,12 @@ onReachBottom( ) // 监听滚动事件 显示返回顶部小图标 -onPageScroll((e) => { - scrollTop.value = e.scrollTop -}) +onPageScroll( + (e) => { + scrollTop.value = e.scrollTop + }, + { passive: true }, +) // 获取照片分类 const getClassCountData = async () => { diff --git a/src/pages/coordinatePhotos/components/addAndEditForm.vue b/src/pages/coordinatePhotos/components/addAndEditForm.vue index 04f7086..634bd0a 100644 --- a/src/pages/coordinatePhotos/components/addAndEditForm.vue +++ b/src/pages/coordinatePhotos/components/addAndEditForm.vue @@ -47,7 +47,7 @@ :placeholder="props.addAndEditFormType == 3 ? '' : '请输入建设地点'" /> - + - + commonStore.projectName, + (newVal) => { + addAndEditModel.proName = newVal + }, + { immediate: true }, +) +watch( + () => commonStore.majorName, + (newVal) => { + addAndEditModel.majorName = newVal + }, + { immediate: true }, +) +watch( + () => commonStore.procedureName, + (newVal) => { + addAndEditModel.gxName = newVal + }, + { immediate: true }, +) + +watch( + () => commonStore.projectId, + (newVal) => { + addAndEditModel.proId = newVal + }, + { immediate: true }, +) + +watch( + () => commonStore.majorId, + (newVal) => { + addAndEditModel.majorId = newVal + // 查工序 + getProcedureData(newVal) + }, + { immediate: true }, +) + +watch( + () => commonStore.procedureId, + (newVal) => { + addAndEditModel.gxId = newVal + }, + { immediate: true }, +) + onMounted(async () => { projectList.value = await getProjectList() projectListAll.value = await getProjectList() diff --git a/src/pages/importantMatters/components/addAndEditForm.vue b/src/pages/importantMatters/components/addAndEditForm.vue index 489b77f..aba3b0c 100644 --- a/src/pages/importantMatters/components/addAndEditForm.vue +++ b/src/pages/importantMatters/components/addAndEditForm.vue @@ -38,7 +38,7 @@ - + diff --git a/src/pages/qualityInspection/components/addAndEditForm.vue b/src/pages/qualityInspection/components/addAndEditForm.vue index 7e6d493..c7d7b6f 100644 --- a/src/pages/qualityInspection/components/addAndEditForm.vue +++ b/src/pages/qualityInspection/components/addAndEditForm.vue @@ -38,7 +38,7 @@ - + - + commonStore.projectName, + (newVal) => { + addAndEditModel.proName = newVal + }, + { immediate: true }, +) +watch( + () => commonStore.majorName, + (newVal) => { + addAndEditModel.majorName = newVal + }, + { immediate: true }, +) +watch( + () => commonStore.procedureName, + (newVal) => { + addAndEditModel.gxName = newVal + }, + { immediate: true }, +) + +watch( + () => commonStore.projectId, + (newVal) => { + addAndEditModel.proId = newVal + }, + { immediate: true }, +) + +watch( + () => commonStore.majorId, + (newVal) => { + addAndEditModel.majorId = newVal + // 查工序 + getProcedureData(newVal) + }, + { immediate: true }, +) + +watch( + () => commonStore.procedureId, + (newVal) => { + addAndEditModel.gxId = newVal + }, + { immediate: true }, +) diff --git a/src/stores/modules/common.js b/src/stores/modules/common.js index fbe5a50..feb80b7 100644 --- a/src/stores/modules/common.js +++ b/src/stores/modules/common.js @@ -8,6 +8,49 @@ export const useCommonStore = defineStore('common', () => { // 专业数据 const majorList = ref([]) + // 项目id + const projectId = ref('') + // 专业id + const majorId = ref('') + // 工序id + const procedureId = ref('') + // 项目名称 + const projectName = ref('') + // 专业名称 + const majorName = ref('') + // 工序名称 + const procedureName = ref('') + + // 存入项目id + const setProjectId = (id) => { + projectId.value = id + } + + // 存入项目名称 + const setProjectName = (name) => { + projectName.value = name + } + + // 存入专业id + const setMajorId = (id) => { + majorId.value = id + } + + // 存入专业名称 + const setMajorName = (name) => { + majorName.value = name + } + + // 存入工序id + const setProcedureId = (id) => { + procedureId.value = id + } + + // 存入工序名称 + const setProcedureName = (name) => { + procedureName.value = name + } + // 存储项目数据 const getProjectList = async () => { if (projectList.value.length < 1) { @@ -35,5 +78,17 @@ export const useCommonStore = defineStore('common', () => { majorList, getProjectList, getMajorList, + projectId, + majorId, + procedureId, + projectName, + majorName, + procedureName, + setProjectId, + setMajorId, + setProcedureId, + setProjectName, + setMajorName, + setProcedureName, } })