diff --git a/.env.yian b/.env.eontec similarity index 98% rename from .env.yian rename to .env.eontec index 50b95c9..57ee461 100644 --- a/.env.yian +++ b/.env.eontec @@ -2,7 +2,7 @@ NODE_ENV=test VITE_APP_ENV=test # 租户 -VITE_API_TENANT_NAME = base +VITE_API_TENANT_NAME = eontec # http请求的baseUrl,/api为代理字段 VITE_API_BASE_URL=/api/simulation # 本地环境http地址,线上通过nginx转发/api到指定服务地址 diff --git a/package.json b/package.json index 55b8b3d..58a19f7 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "dev": "vite --mode development", "build:dev": "vite build --mode development", "build:lyric": "vite build --mode lyric", - "build:yian": "vite build --mode yian", + "build:eontec": "vite build --mode eontec", "build:test": "vite build --mode test", "build:prod": "vite build --mode production", "build": "run-p type-check \"build-only {@}\" --", diff --git a/src/components/common/filePreview/index.vue b/src/components/common/filePreview/index.vue index d340a70..35205b2 100644 --- a/src/components/common/filePreview/index.vue +++ b/src/components/common/filePreview/index.vue @@ -105,7 +105,7 @@ const initFun = () => { modeType.value = 'csv'; return; } - if (enableConfigByTenant([TENANT_ENUM.LYRIC])) { + if (enableConfigByTenant([TENANT_ENUM.LYRIC, TENANT_ENUM.EONTEC])) { modeType.value = 'kkFile'; diaVisible.value = true; return; @@ -134,25 +134,31 @@ const getCsvDataFun = () => { current: 1, size: 1, }; - listSimulationKeyResultApi(params).then((res: any) => { - if (res.code === 200) { - csvData.value = res.data?.data[0] || {}; + listSimulationKeyResultApi(params) + .then((res: any) => { + if (res.code === 200) { + csvData.value = res.data?.data[0] || {}; + } + }) + .finally(() => { diaVisible.value = true; - } - }); + }); }; const getOnlyOfficeFun = () => { const params = { fileId: props.fileId, }; - downloadFileForEditApi(params).then((res: any) => { - if (res.code === 200) { - fileData.value = JSON.stringify(res.data); - fileKey.value = `${props.fileId}_${getUserId()}`; + downloadFileForEditApi(params) + .then((res: any) => { + if (res.code === 200) { + fileData.value = JSON.stringify(res.data); + fileKey.value = `${props.fileId}_${getUserId()}`; + } + }) + .finally(() => { diaVisible.value = true; - } - }); + }); }; const closeFun = () => { diff --git a/src/views/data/overview/components/index.vue b/src/views/data/overview/components/index.vue index 69086b3..9a4e9b5 100644 --- a/src/views/data/overview/components/index.vue +++ b/src/views/data/overview/components/index.vue @@ -755,6 +755,9 @@ const goDetailFun = (data: any) => { const mergeCurrentData = ref({}); const choseNodeFun = (mergeData: any) => { + if (isSearching.value) { + isSearching.value = false; + } mergeCurrentData.value = mergeData; chosenData.value = []; let data: any = {};