diff --git a/.env.development b/.env.development index 40d199b..0036a02 100644 --- a/.env.development +++ b/.env.development @@ -14,7 +14,7 @@ VITE_APP_BASE_API_GO = 'http://xny.yj-3d.com:7464' # ws VITE_APP_BASE_WS_API = 'ws://192.168.110.149:8899/resource/websocket' # EARTH -VITE_APP_BASE_EARTH_API="http://192.168.110.2:8895" +VITE_APP_BASE_EARTH_API = "http://192.168.110.2:8895" # 无人机接口地址 VITE_APP_BASE_DRONE_API = 'http://58.17.134.85:9512' diff --git a/.env.production b/.env.production index 58af0c1..50d416d 100644 --- a/.env.production +++ b/.env.production @@ -17,6 +17,7 @@ VITE_APP_SNAILJOB_ADMIN = '/snail-job' # GO生产环境 VITE_APP_BASE_API_GO = 'http://58.17.134.85:7464' VITE_APP_BASE_API = 'http://xny.yj-3d.com:8899' +VITE_APP_BASE_EARTH_API = 'http://xny.yj-3d.com:8899' # 是否在打包时开启压缩,支持 gzip 和 brotli VITE_BUILD_COMPRESS = gzip diff --git a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue index 02c597b..cd73184 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/components/rightPage.vue @@ -155,7 +155,7 @@ const initPieChart = () => { const getOutputData = async () => { const res = await outpuProgress(); if (res.code == 200) { - designAreaData.value = res.data.map((item: any) => Number(item.plannedCapacity * item.progressPercentage)); + designAreaData.value = res.data.map((item: any) => Number((item.plannedCapacity * item.progressPercentage) / 100)); transferAreaData.value = res.data.map((item: any) => Number(item.plannedCapacity)); barNames.value = res.data.map((item: any) => item.projectName); initLineChart(); diff --git a/src/views/enterpriseLarge/digitalizationScreen/index.vue b/src/views/enterpriseLarge/digitalizationScreen/index.vue index fead15c..f7e3a4e 100644 --- a/src/views/enterpriseLarge/digitalizationScreen/index.vue +++ b/src/views/enterpriseLarge/digitalizationScreen/index.vue @@ -31,15 +31,15 @@ const isHideOther = ref(false); * 切换中心页面全屏 */ const handleChangePage = () => { - if (isFull.value) { - isFull.value = false; - setTimeout(() => { - isHideOther.value = false; - }, 500); - } else { - isFull.value = true; - isHideOther.value = true; - } + // if (isFull.value) { + // isFull.value = false; + // setTimeout(() => { + // isHideOther.value = false; + // }, 500); + // } else { + // isFull.value = true; + // isHideOther.value = true; + // } }; diff --git a/src/views/progress/progressCategory/index.vue b/src/views/progress/progressCategory/index.vue index b633fa4..ce3af14 100644 --- a/src/views/progress/progressCategory/index.vue +++ b/src/views/progress/progressCategory/index.vue @@ -22,7 +22,7 @@ - + 新增 @@ -43,7 +43,7 @@ 展开/折叠 - + @@ -53,7 +53,8 @@ 产值金额(业主) - {{ ownerOutputSum }} + {{ ownerOutputSum }} + 0 @@ -64,7 +65,8 @@ 产值金额(分包) - {{ constructionOutputSum }} + {{ constructionOutputSum }} + 0 @@ -553,58 +555,100 @@ onUnmounted(() => {