From f738f8fcfb2693d009a5756ae2d2a9f528b1575d Mon Sep 17 00:00:00 2001 From: jxj_yjl <1490736767@qq.com> Date: Wed, 12 Jul 2023 16:50:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index dc1e8cf..e43a287 100644 --- a/.env.development +++ b/.env.development @@ -3,8 +3,8 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # VITE_API_URL = 'http://121.196.214.246/api' -# VITE_API_URL = 'http://182.90.224.147:100' -VITE_API_URL = 'http://192.168.34.221:8070' +VITE_API_URL = 'http://182.90.224.147:100' +# VITE_API_URL = 'http://192.168.34.221:8070' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' From b98b1d6e419cf97a1a8c61b4e59fba282187be83 Mon Sep 17 00:00:00 2001 From: jxj_yjl <1490736767@qq.com> Date: Thu, 13 Jul 2023 15:37:02 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++-- .../weatherIcon/{weather3.png => qing.png} | Bin .../distributionMonitoring/index.vue | 2 +- .../sevenLargeScreen/elevatorMonitoring/index.vue | 4 ++-- .../sevenLargeScreen/headNoise/centerBottom.vue | 2 -- src/views/sevenLargeScreen/headNoise/index.vue | 4 ++-- .../sevenLargeScreen/headNoise/leftCenter.vue | 8 +++++--- .../sevenLargeScreen/headNoise/rightBottom.vue | 13 +++++++++++-- .../sevenLargeScreen/headNoise/rightCenter.vue | 2 +- src/views/sevenLargeScreen/indexL.vue | 2 +- .../sevenLargeScreen/laborManagement/index.vue | 4 ++-- .../towerCraneMonitoring/index.vue | 4 ++-- .../sevenLargeScreen/vehicleManagement/index.vue | 2 +- 13 files changed, 30 insertions(+), 21 deletions(-) rename src/assets/images/dustNoise/weatherIcon/{weather3.png => qing.png} (100%) diff --git a/.env.development b/.env.development index e43a287..11b975f 100644 --- a/.env.development +++ b/.env.development @@ -3,8 +3,8 @@ NODE_ENV = 'development' # 本地环境接口地址(/api/index.ts文件中使用) # VITE_API_URL = 'http://121.196.214.246/api' -VITE_API_URL = 'http://182.90.224.147:100' -# VITE_API_URL = 'http://192.168.34.221:8070' +# VITE_API_URL = 'http://182.90.224.147:100' +VITE_API_URL = 'http://192.168.34.221:12360' # 上传 VITE_ULD_API_URL = 'http://192.168.34.155:8012/onlinePreview?url=' diff --git a/src/assets/images/dustNoise/weatherIcon/weather3.png b/src/assets/images/dustNoise/weatherIcon/qing.png similarity index 100% rename from src/assets/images/dustNoise/weatherIcon/weather3.png rename to src/assets/images/dustNoise/weatherIcon/qing.png diff --git a/src/views/sevenLargeScreen/distributionMonitoring/index.vue b/src/views/sevenLargeScreen/distributionMonitoring/index.vue index 29ad605..8074937 100644 --- a/src/views/sevenLargeScreen/distributionMonitoring/index.vue +++ b/src/views/sevenLargeScreen/distributionMonitoring/index.vue @@ -54,7 +54,7 @@ export default { } } .bottom { - height: 40%; + height: 42%; display: flex; .bottomLeft { width: 50%; diff --git a/src/views/sevenLargeScreen/elevatorMonitoring/index.vue b/src/views/sevenLargeScreen/elevatorMonitoring/index.vue index 8aaf7d3..52799e9 100644 --- a/src/views/sevenLargeScreen/elevatorMonitoring/index.vue +++ b/src/views/sevenLargeScreen/elevatorMonitoring/index.vue @@ -27,7 +27,7 @@ import Right from "@/views/sevenLargeScreen/elevatorMonitoring/right.vue"; display: flex; .left { width: 30%; - height: 100%; + height: 102%; .leftTop { height: 29%; } @@ -43,7 +43,7 @@ import Right from "@/views/sevenLargeScreen/elevatorMonitoring/right.vue"; .right { margin-left: 1%; width: 83%; - height: 100%; + height: 102%; .rightBox { width: 100%; height: 100%; diff --git a/src/views/sevenLargeScreen/headNoise/centerBottom.vue b/src/views/sevenLargeScreen/headNoise/centerBottom.vue index e66cef5..1d6ddd0 100644 --- a/src/views/sevenLargeScreen/headNoise/centerBottom.vue +++ b/src/views/sevenLargeScreen/headNoise/centerBottom.vue @@ -24,10 +24,8 @@ const weatherList = ref([]); //获取天气 const loadWeather = async () => { const res = await getWeatherDataApi({ cityid: "" }); - console.log("获取天气", res); var json = JSON.parse(res.result); var list = json; - console.log("获取天气 - list", list); list.forEach((element, index) => { element.url = "src/assets/images/dustNoise/weatherIcon/" + element.wea_img + ".png"; weatherList.value.push(element); diff --git a/src/views/sevenLargeScreen/headNoise/index.vue b/src/views/sevenLargeScreen/headNoise/index.vue index 12219fd..dd5b2f8 100644 --- a/src/views/sevenLargeScreen/headNoise/index.vue +++ b/src/views/sevenLargeScreen/headNoise/index.vue @@ -52,7 +52,7 @@ export default { } .left { width: 30%; - height: 100%; + height: 103%; .leftTop { height: 29%; } @@ -69,7 +69,7 @@ export default { // width: calc(40% - 40px); margin: 0% 1%; width: 55%; - height: 100%; + height: 103%; .centerTop { height: 68%; } diff --git a/src/views/sevenLargeScreen/headNoise/leftCenter.vue b/src/views/sevenLargeScreen/headNoise/leftCenter.vue index db928ea..45b536b 100644 --- a/src/views/sevenLargeScreen/headNoise/leftCenter.vue +++ b/src/views/sevenLargeScreen/headNoise/leftCenter.vue @@ -100,13 +100,15 @@ onMounted(() => { font-size: calc(100vw * 14 / 1920); margin: 1% 3%; .decName { - width: 30%; + width: 90%; + display: flex; span { - margin-left: 10%; + margin-left: 2%; + display: inline-block; } } .status { - margin-left: 60%; + // margin-left: 60%; } } } diff --git a/src/views/sevenLargeScreen/headNoise/rightBottom.vue b/src/views/sevenLargeScreen/headNoise/rightBottom.vue index 45953c7..8445c0a 100644 --- a/src/views/sevenLargeScreen/headNoise/rightBottom.vue +++ b/src/views/sevenLargeScreen/headNoise/rightBottom.vue @@ -7,11 +7,13 @@
报警类型
+
-
{{ item.deviceName }}
+
{{ item.deviceName }}
{{ item.tempAlarmTime }}
-
{{ item.alarmTypeName }}
+
{{ item.alarmTypeName }}
+

暂无数据

@@ -59,6 +61,7 @@ onMounted(() => { justify-content: space-around; } .listBox { + height: 100%; .listStyle { display: flex; justify-content: space-around; @@ -66,6 +69,12 @@ onMounted(() => { height: 12%; line-height: 25px; font-size: calc(100vw * 12 / 1920); + .dev{ + width: 20%; + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } } .listStyle:hover { background: #091f3f; diff --git a/src/views/sevenLargeScreen/headNoise/rightCenter.vue b/src/views/sevenLargeScreen/headNoise/rightCenter.vue index 92dcad4..3fecfc9 100644 --- a/src/views/sevenLargeScreen/headNoise/rightCenter.vue +++ b/src/views/sevenLargeScreen/headNoise/rightCenter.vue @@ -489,7 +489,7 @@ onMounted(async () => { } .styleImg { left: 75%; - top: 46%; + top: 45%; width: 10%; position: absolute; height: 20%; diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue index 857b21b..3b6c85d 100644 --- a/src/views/sevenLargeScreen/indexL.vue +++ b/src/views/sevenLargeScreen/indexL.vue @@ -147,7 +147,7 @@ export default { } } .dataBoardContent { - height: 85%; + height: 83%; // height: calc(100% - 15px - 50px - 60px - 20px); margin: 15px auto 16px auto; width: calc(100% - 40px); diff --git a/src/views/sevenLargeScreen/laborManagement/index.vue b/src/views/sevenLargeScreen/laborManagement/index.vue index 6bb26b6..6673fc7 100644 --- a/src/views/sevenLargeScreen/laborManagement/index.vue +++ b/src/views/sevenLargeScreen/laborManagement/index.vue @@ -36,7 +36,7 @@ export default { display: flex; .left { width: 75%; - height: 100%; + height: 102%; .leftTop { height: 68%; } @@ -46,7 +46,7 @@ export default { } .right { width: 25%; - height: 100%; + height: 102%; .rightTop { height: 29%; } diff --git a/src/views/sevenLargeScreen/towerCraneMonitoring/index.vue b/src/views/sevenLargeScreen/towerCraneMonitoring/index.vue index 308478f..b14732d 100644 --- a/src/views/sevenLargeScreen/towerCraneMonitoring/index.vue +++ b/src/views/sevenLargeScreen/towerCraneMonitoring/index.vue @@ -27,7 +27,7 @@ import Right from "@/views/sevenLargeScreen/towerCraneMonitoring/right.vue"; display: flex; .left { width: 30%; - height: 100%; + height: 102%; .leftTop { height: 29%; } @@ -43,7 +43,7 @@ import Right from "@/views/sevenLargeScreen/towerCraneMonitoring/right.vue"; .right { margin-left: 1%; width: 83%; - height: 100%; + height: 102%; .rightBox { width: 100%; height: 100%; diff --git a/src/views/sevenLargeScreen/vehicleManagement/index.vue b/src/views/sevenLargeScreen/vehicleManagement/index.vue index 67c12a7..f18afe6 100644 --- a/src/views/sevenLargeScreen/vehicleManagement/index.vue +++ b/src/views/sevenLargeScreen/vehicleManagement/index.vue @@ -43,7 +43,7 @@ export default { } } .bottom { - height: 49%; + height: 51%; margin-top: 1%; } }