From 0c6406afd19cf829d31ed08b4c642a9e7daa5739 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 23 Apr 2024 21:24:09 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 6 +++--- src/config/config.ts | 4 ++-- .../projectOverview/centerBottom.vue | 15 ++++++++------- 3 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.env.development b/.env.development index 93bb270..918dd2a 100644 --- a/.env.development +++ b/.env.development @@ -3,7 +3,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 -VITE_API_URL = 'http://192.168.34.221:9111' +# VITE_API_URL = 'http://192.168.34.221:9111' # VITE_API_URL = 'http://192.168.34.221:28888' # VITE_API_URL = 'http://121.196.214.246/api' # VITE_API_URL = 'http://jxj.zhgdyun.com:100' @@ -15,7 +15,7 @@ VITE_API_URL = 'http://192.168.34.221:9111' # 演示平台 # VITE_API_URL = 'http://jxj.zhgdyun.com:9809' # 百色七参数线上地址 -VITE_API_URL = 'http://101.43.164.214:11111' +# VITE_API_URL = 'http://101.43.164.214:11111' # 七参数标准版(测试平台) # VITE_API_URL = 'http://jxj.zhgdyun.com:15551' # 七参数标准版(测试平台) @@ -24,7 +24,7 @@ VITE_API_URL = 'http://101.43.164.214:11111' # VITE_API_URL = 'http://47.93.215.234:9809' # VITE_API_URL = 'http://jxj.zhgdyun.com:19812' # 苏立信 -# VITE_API_URL = 'http://101.43.164.214:11111' +VITE_API_URL = 'http://101.43.164.214:11111' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/config/config.ts b/src/config/config.ts index f88a56b..01767cf 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -23,11 +23,11 @@ export const BAIDU_MAP_KEY: string = ""; export const BASE_IMAGE_URL = import.meta.env.VITE_BASE_IMAGE_URL; // 项目环境标识配置 部署时需更改对应的项目 -// export const COMPANY: string = ""; //标准版 +export const COMPANY: string = ""; //标准版 // export const COMPANY: string = "as"; //鞍山项目 // export const COMPANY: string = "agjt"; //鞍钢集团 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 -export const COMPANY: string = "slx"; //苏立信项目 +// export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "hfqc"; //合肥启程项目 // export const COMPANY: string = "jsyc"; // 江苏盐城项目 // export const COMPANY: string = "syhy"; //沈阳合盈盘锦项目 (需要去src\routers\modules\staticRouter.ts更换首页) diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue index 6da5fa1..72a7ada 100644 --- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue +++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/centerBottom.vue @@ -9,8 +9,8 @@
项目总天数 - 0 - {{ item }} + 0 + {{ item }} @@ -20,8 +20,8 @@
项目剩余天数 - 0 - {{ item }} + 0 + {{ item }} @@ -118,8 +118,9 @@ watch( if (newVal) { // props.xData = newVal; projectData.value = newVal; - console.log("当前阶段", projectData.value.constructionStage); - if (progressList.value.length > 0) { + console.log("当前阶段", projectData.value); + console.log("当前阶段", progressList.value); + if (progressList.value.length > 0 && projectData.value.constructionStage) { progressList.value[projectData.value.constructionStage - 1].status = 1; } } @@ -138,7 +139,7 @@ const getProgressOption = async () => { }); progressList.value = newArray; console.log(projectData.value, "里程碑option", res); - if (projectData.value.constructionStage) { + if (projectData.value?.constructionStage) { progressList.value[projectData.value.constructionStage - 1].status = 1; } }