From fd4b065fc5a3f73dbe6ceb8f2ed66612b10a3c00 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 17:15:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
screen/src/views/FireFighting.vue | 37 +++++--------------------------------
1 files changed, 5 insertions(+), 32 deletions(-)
diff --git a/screen/src/views/FireFighting.vue b/screen/src/views/FireFighting.vue
index dc8bb57..8e63144 100644
--- a/screen/src/views/FireFighting.vue
+++ b/screen/src/views/FireFighting.vue
@@ -708,12 +708,6 @@
}
const dataList1 = ref([])
-// const getData1 = () => {
-// getFightingDeAlarm().then(res => {
-// dataList1.value = res.data
-// loopFn1()
-// })
-// }
const policeColors = ['#01D9FE', '#FE5501', '#0193FE', '#28F0C4']
const dataList2 = ref([])
const getData2 = () => {
@@ -751,7 +745,6 @@
const data3 = dataList3.value.map(i => i.liftNum)
const data4 = dataList3.value.map(i => i.errNum)
const months = dataList3.value.map(i => {
- console.log('i.startDate', i.startDate.substring(5, 7))
return i.startDate.substring(5, 7) + '鏈�'
}
)
@@ -901,7 +894,6 @@
getFightingcenterData().then(res => {
dataList4.value = res.data || {}
dataList1.value = res.data.deviceTypeList
- loopFn1()
})
}
const dataList5 = ref({}) // 缁翠繚
@@ -918,7 +910,6 @@
}
const dataList7 = ref([])
const getData7 = () => {
-
getFighalarmDataList().then(res => {
dataList7.value = res.data || []
dataList7.value = dataList7.value.map(item => {
@@ -926,18 +917,6 @@
return item
})
})
- // dataList7.value = [
- // { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
- // { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
- // { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
- // { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
- // { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
- // { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
- // { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
- // { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
- // { name: '娑堥槻鍛婅', addr: '鍘傚尯闂ㄥ彛', time: '2022-02-02' },
- // ]
- loopFn2()
}
const autoplayFlag = (list = [], leng = 4, time = 2000) => {
@@ -987,20 +966,14 @@
}, 60 * 60 * 1000)
-
initWatergage()
initLiquidlevel()
- // setInterval(() => {
- // getData4()
- // }, 1000 * 60)
- // setInterval(() => {
- // getData1()
- // getData2()
- // getData3()
- // getData5()
- // getData6()
- // }, 1000 * 60 * 60)
+ setTimeout(() => {
+ loopFn1()
+ loopFn2()
+ }, 12000)
+
})
--
Gitblit v1.9.3