From d03efb8d6f22d7b24334bf3eefb9e5c5253e0834 Mon Sep 17 00:00:00 2001 From: Teo <2642673902@qq.com> Date: Mon, 14 Jul 2025 16:10:03 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=B7=AF=E7=94=B1bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 2 +- src/api/system/dict/data/index.ts | 7 ++--- .../engineeringChangeApplicationForm.vue | 24 ++++++++-------- src/views/cory/template/index.vue | 20 ++++++------- src/views/design/designChange/index.vue | 15 +++++----- src/views/design/drawing/index.vue | 6 ++-- src/views/design/specialScheme/index.vue | 6 ++-- src/views/design/technicalStandard/index.vue | 6 ++-- src/views/progress/plan/index.vue | 14 ++++++---- src/views/project/contractor/index.vue | 28 ++++++++----------- 10 files changed, 62 insertions(+), 66 deletions(-) diff --git a/.env.production b/.env.production index 62b1323..e1eaa1a 100644 --- a/.env.production +++ b/.env.production @@ -14,7 +14,7 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications' VITE_APP_SNAILJOB_ADMIN = '/snail-job' # 生产环境 -VITE_APP_BASE_API = 'http://192.168.110.2:8899' +VITE_APP_BASE_API = 'http://58.17.134.85:8899' # 是否在打包时开启压缩，支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip diff --git a/src/api/system/dict/data/index.ts b/src/api/system/dict/data/index.ts index 7692abc..09fb249 100644 --- a/src/api/system/dict/data/index.ts +++ b/src/api/system/dict/data/index.ts @@ -10,11 +10,10 @@ export function getDicts(dictType: string): AxiosPromise { } // 查询字典数据列表 -export function listData(query: DictDataQuery): AxiosPromise { +export function listData(query: string): AxiosPromise { return request({ - url: '/system/dict/data/list', - method: 'get', - params: query + url: '/system/dict/data/type/' + query, + method: 'get' }); } diff --git a/src/views/cory/template/components/engineeringChangeApplicationForm.vue b/src/views/cory/template/components/engineeringChangeApplicationForm.vue index fc24a51..1802ec7 100644 --- a/src/views/cory/template/components/engineeringChangeApplicationForm.vue +++ b/src/views/cory/template/components/engineeringChangeApplicationForm.vue @@ -15,13 +15,15 @@ - - + + - + userStore.selectedProject); const thumbnailUrl = ref(''); const tableData = ref([]); const total = ref(0); -const activeName = ref('1') +const activeName = ref('1'); const formRef = ref(); const dialogVisible = ref(false); const showSearch = ref(true); @@ -274,23 +270,23 @@ const selectType = (value: string) => { getList(); }; -const handleClick=(val)=>{ +const handleClick = (val) => { console.log(val); - queryParams.value.projectType=val.props.name; + queryParams.value.projectType = val.props.name; getList(); -} -const handleAddApp=(row)=>{ +}; +const handleAddApp = (row) => { // 添加审批 proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/cory/template/indexEdit`, + path: `/relation-management/template/indexEdit`, query: { thumbnailUrl: projectTypeOptions.value[1].thumbnail, row, type: 'add' } }); -} +}; onMounted(() => { getList(); }); diff --git a/src/views/design/designChange/index.vue b/src/views/design/designChange/index.vue index 833f8a4..e79d626 100644 --- a/src/views/design/designChange/index.vue +++ b/src/views/design/designChange/index.vue @@ -16,15 +16,16 @@ - - - + + + + 搜索 重置 @@ -82,7 +83,7 @@ - + @@ -173,7 +174,7 @@ const handleSelectionChange = (selection: DesignChangeVO[]) => { const handleAdd = () => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/test/designChange/indexEdit`, + path: `/design-management/designChange/indexEdit`, query: { type: 'add' } @@ -184,7 +185,7 @@ const handleAdd = () => { const handleUpdate = async (row?: DesignChangeVO) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/test/designChange/indexEdit`, + path: `/design-management/designChange/indexEdit`, query: { id: row.id, type: 'update' @@ -195,7 +196,7 @@ const handleUpdate = async (row?: DesignChangeVO) => { const handleViewInfo = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/test/designChange/indexEdit`, + path: `/design-management/designChange/indexEdit`, query: { id: row.id, type: 'view' diff --git a/src/views/design/drawing/index.vue b/src/views/design/drawing/index.vue index 22427fc..82cae6d 100644 --- a/src/views/design/drawing/index.vue +++ b/src/views/design/drawing/index.vue @@ -161,7 +161,7 @@ const handleSelectionChange = (selection: DrawingVO[]) => { const handleAdd = () => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/test/drawing/indexEdit`, + path: `/design-management/drawing/indexEdit`, query: { type: 'add' } @@ -172,7 +172,7 @@ const handleAdd = () => { const handleUpdate = async (row?: DrawingVO) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/test/drawing/indexEdit`, + path: `/design-management/drawing/indexEdit`, query: { id: row.id, type: 'update' @@ -198,7 +198,7 @@ const handleView = (row) => { const handleViewInfo = (row?: LeaveVO) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/test/drawing/indexEdit`, + path: `/design-management/drawing/indexEdit`, query: { id: row.id, type: 'view' diff --git a/src/views/design/specialScheme/index.vue b/src/views/design/specialScheme/index.vue index 9de8f1e..b4cae63 100644 --- a/src/views/design/specialScheme/index.vue +++ b/src/views/design/specialScheme/index.vue @@ -152,7 +152,7 @@ const handleSelectionChange = (selection: SpecialSchemeVO[]) => { const handleAdd = () => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/test/specialScheme/indexEdit`, + path: `/design-management/specialScheme/indexEdit`, query: { type: 'add' } @@ -163,7 +163,7 @@ const handleAdd = () => { const handleUpdate = async (row?: SpecialSchemeVO) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/test/specialScheme/indexEdit`, + path: `/design-management/specialScheme/indexEdit`, query: { id: row.id, type: 'update' @@ -186,7 +186,7 @@ const handleView = (row) => { const handleViewInfo = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/test/specialScheme/indexEdit`, + path: `/design-management/specialScheme/indexEdit`, query: { id: row.id, type: 'view' diff --git a/src/views/design/technicalStandard/index.vue b/src/views/design/technicalStandard/index.vue index 08e7046..a48a469 100644 --- a/src/views/design/technicalStandard/index.vue +++ b/src/views/design/technicalStandard/index.vue @@ -475,7 +475,7 @@ onUnmounted(() => { const handleApproval = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/technicalStandard/indexEdit`, + path: `/design-management/technicalStandard/indexEdit`, query: { id: row.id, type: 'update' @@ -485,7 +485,7 @@ const handleApproval = (row) => { const handleViewApproval = (row) => { proxy.$tab.closePage(proxy.$route); proxy.$router.push({ - path: `/technicalStandard/indexEdit`, + path: `/design-management/technicalStandard/indexEdit`, query: { id: row.id, type: 'view' @@ -585,7 +585,7 @@ const handleViewApproval = (row) => { } } .list_right { - width:79.5%; + width: 79.5%; background: white; border: 1px solid #ededed; padding: 10px; diff --git a/src/views/progress/plan/index.vue b/src/views/progress/plan/index.vue index b2734f7..0b4a896 100644 --- a/src/views/progress/plan/index.vue +++ b/src/views/progress/plan/index.vue @@ -288,12 +288,16 @@ const getList = async () => { } } loading.value = true; - console.log(queryParams.value); + loading.value = true; - const res = await listProgressCategory(queryParams.value); - const data = proxy?.handleTree(res.data, 'id', 'pid'); - if (data) { - progressCategoryList.value = data; + try { + const res = await listProgressCategory(queryParams.value); + const data = proxy?.handleTree(res.data, 'id', 'pid'); + if (data) { + progressCategoryList.value = data; + } + } finally { + // 不管成功或失败，最后都设置为 false loading.value = false; } }; diff --git a/src/views/project/contractor/index.vue b/src/views/project/contractor/index.vue index 7e38efe..9a9b695 100644 --- a/src/views/project/contractor/index.vue +++ b/src/views/project/contractor/index.vue @@ -59,7 +59,7 @@ - +