From 6a33c71f381aec0dbc778f80527b62d343fd0146 Mon Sep 17 00:00:00 2001
From: 马宇豪 <978517621@qq.com>
Date: 星期五, 05 一月 2024 10:28:24 +0800
Subject: [PATCH] 修改接口调用
---
/dev/null | 0
src/views/bigScreen/components/screen.vue | 16 ++++++++++------
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/public/bigMap.png b/public/bigMap.png
deleted file mode 100644
index 6025295..0000000
--- a/public/bigMap.png
+++ /dev/null
Binary files differ
diff --git a/public/bigMapPic.JPG b/public/bigMapPic.JPG
deleted file mode 100644
index fff6b78..0000000
--- a/public/bigMapPic.JPG
+++ /dev/null
Binary files differ
diff --git a/public/bigMapPic2.png b/public/bigMapPic2.png
deleted file mode 100644
index 36755f3..0000000
--- a/public/bigMapPic2.png
+++ /dev/null
Binary files differ
diff --git a/public/factoryMap.png b/public/factoryMap.png
deleted file mode 100644
index 02358ed..0000000
--- a/public/factoryMap.png
+++ /dev/null
Binary files differ
diff --git a/src/views/bigScreen/components/screen.vue b/src/views/bigScreen/components/screen.vue
index 6361fba..8dec455 100644
--- a/src/views/bigScreen/components/screen.vue
+++ b/src/views/bigScreen/components/screen.vue
@@ -863,10 +863,7 @@
let newArr = JSON.parse(JSON.stringify(state.gasData))
if(Array.isArray(newArr)){
state.gasTotal = newArr.length
- }else{
- state.gasTotal = 0
- }
- const weather = newArr.map((item)=>{
+ const weather = newArr.map((item)=>{
return {
time: item.dataReceivingTime?item.dataReceivingTime.slice(11,19):'--',
temp: item.temp?item.temp:'--',
@@ -875,8 +872,12 @@
windDirection: item.windDirection?item.windDirection:'--',
pressure: item.pressure?item.pressure:'--'
}
- })
- state.weatherData = [...weather].reverse().slice(0, 4);
+ })
+ state.weatherData = [...weather].reverse().slice(0, 4);
+ }else{
+ // state.gasTotal = 0
+ getGasNdData()
+ }
for(let key in newArr[0]){
if(newArr[0][key] == state.gasSearch && key.indexOf("gasName") !== -1){
gasNum = key.substring(7)
@@ -946,6 +947,9 @@
}
state.socket.onclose=()=>{
console.log("socket已经关闭")
+ getGasNdData()
+ getGasTlData()
+ getWindData()
}
}
}
--
Gitblit v1.9.2