diff --git a/.env.production b/.env.production index 5808cf8..fe627ff 100644 --- a/.env.production +++ b/.env.production @@ -2,12 +2,12 @@ NODE_ENV=production VITE_APP_ENV=production VITE_API_BASE_URL=/api/simulation -VITE_API_HTTP_URL=http://192.168.65.161:7100 +VITE_API_HTTP_URL=http://192.168.190.161:7100 VITE_API_WS_BASE_URL=/wsApi/simulation -VITE_API_WS_URL=ws://192.168.65.161:7100 -VITE_API_IMAGE_PREVIEW_URL=http://192.168.65.161:7104 -VITE_API_FILE_PREVIEW_URL=http://192.168.65.161:3000/preview/onlinePreview -VITE_API_FILE_URL=http://192.168.65.161:7104 +VITE_API_WS_URL=ws://192.168.190.161:7100 +VITE_API_IMAGE_PREVIEW_URL=http://192.168.190.161:7104 +VITE_API_FILE_PREVIEW_URL=http://192.168.190.161:3000/preview/onlinePreview +VITE_API_FILE_URL=http://192.168.190.161:7104 VITE_API_PREFIX_APPROVE=/approve/ VITE_API_PREFIX_CAPABILITY=/capability/ diff --git a/src/api/system/dimensionTemplate.ts b/src/api/system/dimensionTemplate.ts index 812fb3e..1c82bff 100644 --- a/src/api/system/dimensionTemplate.ts +++ b/src/api/system/dimensionTemplate.ts @@ -15,6 +15,6 @@ export const getAllTemplateApi = () => { return post(`${PREFIX}dimensionTemplate/getAllTemplate`); }; -export const deleteTemplateWithHierarchiesApi = (params: {id:number}) => { +export const deleteTemplateWithHierarchiesApi = (params: { id: number }) => { return get(`${PREFIX}dimensionTemplate/deleteTemplateWithHierarchies`, params); }; diff --git a/src/components/common/dataFileTree/index.vue b/src/components/common/dataFileTree/index.vue index 6dc92ed..4596b7e 100644 --- a/src/components/common/dataFileTree/index.vue +++ b/src/components/common/dataFileTree/index.vue @@ -121,7 +121,7 @@ const loadMoreFun = async (node: any, resolve: any) => { // 获取节点数据 const getDataFun = async (data: any) => { - if (props.api) { + if (props.api && props.templateId) { const params = { dimensionTemplateId: props.templateId, fileIds: data.fileIds || [], @@ -132,6 +132,8 @@ const getDataFun = async (data: any) => { } else { return []; } + } else { + return []; } }; diff --git a/src/views/data/overview/components/configuration.vue b/src/views/data/overview/components/configuration.vue index e4bbeb1..efae964 100644 --- a/src/views/data/overview/components/configuration.vue +++ b/src/views/data/overview/components/configuration.vue @@ -240,6 +240,9 @@ const tabChangeFun = () => { }; const getTemplateWithHierarchiesFun = () => { + if (!currentEditableTab.value) { + return; + } getTemplateWithHierarchiesApi({ id: currentEditableTab.value }).then((res: any) => { if (res.code === 200) { selectLevelFormData.value.selectLevelList = res.data.dimensionTemplateHierarchies?.map( @@ -269,7 +272,7 @@ const addSelectLevelFun = () => { }); }; -const deleteSelectLevelFun = (index: number) => { +const deleteSelectLevelFun = (index: any) => { selectLevelFormData.value.selectLevelList.splice(index, 1); selectLevelFormData.value.selectLevelList.forEach((item: SelectLevelItem, index: number) => { item.name = index + 1 + '级'; diff --git a/src/views/data/overview/index.vue b/src/views/data/overview/index.vue index 2e0f331..1fe5e18 100644 --- a/src/views/data/overview/index.vue +++ b/src/views/data/overview/index.vue @@ -2,7 +2,6 @@