From 01d8b3f70e1279791935662ff8d0fd333b72adc2 Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Fri, 5 Jul 2024 11:54:28 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E5=A4=8D=E6=BC=94?= =?UTF-8?q?=E7=A4=BA=E5=A4=A7=E5=B1=8F=E6=A0=B7=E5=BC=8Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production | 4 +- src/config/config.ts | 4 +- src/config/staticMenu.ts | 8 ++++ .../electricityMonitor/bottomLeft.vue | 4 +- .../electricityMonitor/bottomRight.vue | 6 +-- .../electricityMonitor/topRight.vue | 23 ++++++++- .../waterMonitor/blueLineEchart.vue | 7 +-- .../waterMonitor/bottomLeft.vue | 2 +- .../waterMonitor/bottomRight.vue | 2 +- .../waterMonitor/greenLineEchart.vue | 8 ++-- .../sevenLargeScreen/headNoise/leftBottom.vue | 47 +++++++++---------- .../headNoise/rightBottom.vue | 12 +++-- .../laborManagement/rightBottom.vue | 42 ++++++++++------- .../rainfallMonitoring/leftBottom.vue | 1 + .../foundationPitMonitor/leftBottom.vue | 7 +-- .../foundationPitMonitor/rightFirst.vue | 7 +-- .../foundationPitMonitor/rightSecond.vue | 7 +-- .../foundationPitMonitor/rightThird.vue | 8 ++-- .../videoManagement/index.vue | 7 ++- 20 files changed, 127 insertions(+), 83 deletions(-) diff --git a/.env.development b/.env.development index b7870ef..fde4112 100644 --- a/.env.development +++ b/.env.development @@ -4,7 +4,7 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # 后端本地 # VITE_API_URL = 'http://192.168.34.155:19111' -VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 +# VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 # VITE_API_URL = 'http://182.90.224.237:51234' #雄哥远程 # VITE_API_URL = 'http://192.168.34.221:28889' # VITE_API_URL = 'http://121.196.214.246/api' @@ -33,7 +33,7 @@ VITE_API_URL = 'http://192.168.34.221:9111' #雄哥本地 # 中科安信 # VITE_API_URL = 'http://8.136.222.164:8808' # 中科佳成 -# VITE_API_URL = 'http://1.13.185.209:8089' +VITE_API_URL = 'http://1.13.185.209:8089' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/.env.production b/.env.production index 262ceb0..37cc7eb 100644 --- a/.env.production +++ b/.env.production @@ -21,14 +21,14 @@ NODE_ENV = "production" # 七参数标准版(测试平台) # VITE_API_URL = 'http://182.90.224.237:15551' # agjt -VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 +# VITE_API_URL = 'http://42.180.188.17:9809' #生产环境 # VITE_API_URL = 'http://42.180.188.17:11211' #测试环境 # 苏立信/重庆市南岸区 # VITE_API_URL = 'http://101.43.164.214:11111' # 中科安信 # VITE_API_URL = 'http://8.136.222.164:8808' # 中科佳成 -# VITE_API_URL = 'http://1.13.185.209:8089' +VITE_API_URL = 'http://1.13.185.209:8089' # 合肥启程(乌丹) # VITE_API_URL = 'http://192.168.100.4:9809' # 打包 diff --git a/src/config/config.ts b/src/config/config.ts index dee2ee6..8951440 100644 --- a/src/config/config.ts +++ b/src/config/config.ts @@ -23,7 +23,7 @@ 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 = "zhzrf"; //中海·臻如府 // export const COMPANY: string = "zsbf"; //中水北方 // export const COMPANY: string = "as"; //鞍山项目 @@ -32,7 +32,7 @@ export const COMPANY: string = ""; //标准版 // export const COMPANY: string = "agjtCommand"; //鞍钢集团指挥部大屏 // export const COMPANY: string = "agjtProjectKanban"; //鞍钢集团项目看板大屏 // export const COMPANY: string = "agjtOverviewScreen"; //鞍钢集团项目总览 -// export const COMPANY: string = "zkjc"; //中科佳成项目 +export const COMPANY: string = "zkjc"; //中科佳成项目 // export const COMPANY: string = "cqna"; //重庆南岸项目 // export const COMPANY: string = "slx"; //苏立信项目 // export const COMPANY: string = "hfqc"; //合肥启程(乌丹)项目 diff --git a/src/config/staticMenu.ts b/src/config/staticMenu.ts index 5943d1b..27dfb11 100644 --- a/src/config/staticMenu.ts +++ b/src/config/staticMenu.ts @@ -1413,6 +1413,10 @@ export const ZKJCMenu: Array = [ { menuName: "智能安全帽", companyPath: "/smartSafeHat" + }, + { + menuName: "基坑监测", + companyPath: "/foundationPitMonitor" } ] }, @@ -1441,6 +1445,10 @@ export const ZKJCMenu: Array = [ { companyPath: "/waterMonitor", menuName: "用水监测" + }, + { + companyPath: "/rainfallMonitoring", + menuName: "雨量监测" } ] } diff --git a/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomLeft.vue b/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomLeft.vue index a21b8bf..a8e90c2 100644 --- a/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomLeft.vue +++ b/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomLeft.vue @@ -59,10 +59,10 @@ onMounted(async () => { meterId.value = e; getShortTrend(); }); - // getMeterTotal(); + getShortTrend(); }); -// +// onBeforeUnmount(async () => { mitts.off("electricId"); }); diff --git a/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomRight.vue b/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomRight.vue index ef35a4d..44b58c9 100644 --- a/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomRight.vue +++ b/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/bottomRight.vue @@ -55,13 +55,13 @@ const getLongTrend = async () => { onMounted(async () => { mitts.on("electricId", e => { // console.log("当前电表对应长期趋势", e); - meterId.value = e + meterId.value = e; getLongTrend(); }); - // getMeterTotal(); + getLongTrend(); }); -// +// onBeforeUnmount(async () => { mitts.off("electricId"); }); diff --git a/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/topRight.vue b/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/topRight.vue index 527053e..02574f0 100644 --- a/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/topRight.vue +++ b/src/views/sevenLargeScreen/greenConstruct/electricityMonitor/topRight.vue @@ -7,6 +7,10 @@ 度
+
+ +

暂无数据

+
@@ -197,8 +201,8 @@ function draw() { const getYesterdayUseTotal = async () => { const res: any = await getElectricityUseRecord({ projectSn: store.sn, type: 1 }); - let nameArr = res.result.map((item: any) => item.ammeterName); - let useArr = res.result.map((item: any) => item.degree); + let nameArr = res.result instanceof Array ? res.result.map((item: any) => item.ammeterName) : []; + let useArr = res.result instanceof Array ? res.result.map((item: any) => item.degree) : []; xData.value = nameArr; yData.value = useArr; @@ -235,4 +239,19 @@ onBeforeUnmount(async () => { color: #ffffff; } } + +.not-data { + top: 40%; + width: 30%; + left: 35%; + position: absolute; + text-align: center; + img { + width: 50%; + } + p { + color: #fff; + font-size: 14px; + } +} diff --git a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/blueLineEchart.vue b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/blueLineEchart.vue index 2843389..a419b0e 100644 --- a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/blueLineEchart.vue +++ b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/blueLineEchart.vue @@ -222,9 +222,10 @@ onMounted(async () => { // transform: rotate(90deg); } .not-data { - top: 40%; - width: 30%; - left: 35%; + width: 20%; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); position: absolute; text-align: center; img { diff --git a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomLeft.vue b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomLeft.vue index 58a7d54..019bd1a 100644 --- a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomLeft.vue +++ b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomLeft.vue @@ -59,7 +59,7 @@ onMounted(async () => { meterId.value = e; getShortTrend(); }); - // getShortTrend(); + getShortTrend(); }); // diff --git a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomRight.vue b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomRight.vue index 935d682..3f1bd20 100644 --- a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomRight.vue +++ b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/bottomRight.vue @@ -58,7 +58,7 @@ onMounted(async () => { meterId.value = e; getLongTrend(); }); - // getLongTrend(); + getLongTrend(); }); // diff --git a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/greenLineEchart.vue b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/greenLineEchart.vue index a6058e8..6ea920f 100644 --- a/src/views/sevenLargeScreen/greenConstruct/waterMonitor/greenLineEchart.vue +++ b/src/views/sevenLargeScreen/greenConstruct/waterMonitor/greenLineEchart.vue @@ -215,7 +215,6 @@ onMounted(async () => { drawChart(); }); - onBeforeUnmount(async () => { mitts.off("devSn"); }); @@ -228,9 +227,10 @@ onBeforeUnmount(async () => { position: relative; } .not-data { - top: 40%; - width: 30%; - left: 35%; + width: 20%; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); position: absolute; text-align: center; img { diff --git a/src/views/sevenLargeScreen/headNoise/leftBottom.vue b/src/views/sevenLargeScreen/headNoise/leftBottom.vue index d17adb1..c9ff174 100644 --- a/src/views/sevenLargeScreen/headNoise/leftBottom.vue +++ b/src/views/sevenLargeScreen/headNoise/leftBottom.vue @@ -2,7 +2,7 @@
- - - - -
+ + + +
-
+
- @@ -340,9 +339,9 @@ onMounted(async () => { receive.value = e.deviceId; getList(e.deviceId); }); - + getList(receive.value); }); -// +// onBeforeUnmount(async () => { mitts.off("currentDevDetail"); echarts.dispose; @@ -350,17 +349,17 @@ onBeforeUnmount(async () => { diff --git a/src/views/sevenLargeScreen/rainfallMonitoring/leftBottom.vue b/src/views/sevenLargeScreen/rainfallMonitoring/leftBottom.vue index 148225d..adcd632 100644 --- a/src/views/sevenLargeScreen/rainfallMonitoring/leftBottom.vue +++ b/src/views/sevenLargeScreen/rainfallMonitoring/leftBottom.vue @@ -337,6 +337,7 @@ onMounted(async () => { receive.value = e.devSn; getList(e.devSn); }); + getList(receive.value); }); // onBeforeUnmount(async () => { diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue index 73ef712..e8b3808 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/leftBottom.vue @@ -516,9 +516,10 @@ onMounted(async () => { color: #fff; } .notoDta { - top: 25%; - width: 40%; - left: 30%; + top: 50%; + width: 25%; + left: 50%; + transform: translate(-50%, -50%); position: absolute; text-align: center; img { diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue index 32c9b9e..0a03df9 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightFirst.vue @@ -511,9 +511,10 @@ onMounted(async () => { color: #fff; } .notoDta { - top: 15%; - width: 40%; - left: 30%; + width: 25%; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); position: absolute; text-align: center; img { diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue index 333ce54..1c8e41e 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightSecond.vue @@ -509,9 +509,10 @@ onMounted(async () => { color: #fff; } .notoDta { - top: 15%; - width: 40%; - left: 30%; + width: 25%; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); position: absolute; text-align: center; img { diff --git a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue index 409dee7..d287611 100644 --- a/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue +++ b/src/views/sevenLargeScreen/safetyManagement/foundationPitMonitor/rightThird.vue @@ -506,9 +506,10 @@ onMounted(async () => { color: #fff; } .notoDta { - top: 15%; - width: 40%; - left: 30%; + width: 25%; + top: 50%; + left: 50%; + transform: translate(-50%, -50%); position: absolute; text-align: center; img { @@ -519,6 +520,7 @@ onMounted(async () => { color: #fff; font-size: 14px; margin: -6% 37%; + text-align: center; } } diff --git a/src/views/sevenLargeScreen/videoManagement/index.vue b/src/views/sevenLargeScreen/videoManagement/index.vue index e5379aa..d6287fe 100644 --- a/src/views/sevenLargeScreen/videoManagement/index.vue +++ b/src/views/sevenLargeScreen/videoManagement/index.vue @@ -574,8 +574,9 @@ const previewVideo = (data: string | null) => { } .notoDta { top: 50%; - width: 12%; - left: 2%; + width: 80%; + left: 50%; + transform: translate(-50%, -50%); position: absolute; img { width: 40%; @@ -585,11 +586,13 @@ const previewVideo = (data: string | null) => { color: #fff; font-size: calc(100vw * 14 / 1920); margin: -6% 37%; + text-align: center; } } } ::v-deep .h-card .content { background: none; + position: relative; } ::v-deep .h-card .title .titltText { margin-bottom: 0%;