From 576d28de6be2d75bfd5a213874dd8d06657635b5 Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期三, 25 十二月 2024 08:40:20 +0800
Subject: [PATCH] 1.添加实时报警和历史报警 2.添加云服务和局域网模式切换界面
---
pages/tabBar/monitor.vue | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/pages/tabBar/monitor.vue b/pages/tabBar/monitor.vue
index 3b80b2e..fbc86f7 100644
--- a/pages/tabBar/monitor.vue
+++ b/pages/tabBar/monitor.vue
@@ -381,7 +381,8 @@
dataLabel: false,
dataPointShape: false,
enableScroll: false,
- legend: {},
+ legend: {},
+ update:true,
xAxis: {
disableGrid: true,
labelCount: 6
@@ -403,13 +404,13 @@
model: {},
queryParam: {
machineid: "GM001",
- tenantid: 1000
+ tenantid: 1003
},
bannerList: [{
- imageUrl: 'https://dev.shlanbao.cn:9999/fileTransfer/preview?userFileId=1640616151832784896&isMin=false&shareBatchNum=&extractionCode='
+ imageUrl: '../../static/image/zcy_gzj1.png'
},
{
- imageUrl: 'https://dev.shlanbao.cn:9999/fileTransfer/preview?userFileId=1640617395255177216&isMin=false&shareBatchNum=&extractionCode='
+ imageUrl: '../../static/image/zcy_gzj1.png'
}
]
@@ -477,12 +478,12 @@
},
/**
- * 缁勪欢鏁版嵁
+ * 缁勫缓鏁版嵁
*/
createData() {
//娓╁害鏁版嵁 10s涓�娆�
let bellowsTemp = this.$lget(this.model, 'bellowsTemp');
- //绉伴噸鏁版嵁 锛堥噸閲忋�佹箍搴︼級
+ //绉伴噸鏁版嵁 锛堥噸閲忋�佸惈姘寸巼锛�
let detailList = this.$lget(this.model, 'detailList');
if (!bellowsTemp) return;
let wmap = {} //鍙栧嚭鎵�鏈夐噸閲忔暟鎹�
@@ -491,7 +492,7 @@
let minM = null; //绗竴涓俯搴︽暟鎹�
let maxW = null; //鏈�鍚庝竴涓噸閲忔暟鎹�
let maxM = null; //鏈�鍚庝竴涓俯搴︽暟鎹�
- //鍙栧嚭閲嶉噺鍜屾箍搴︽暟鎹�
+ //鍙栧嚭閲嶉噺鍜屽惈姘寸巼鏁版嵁
if (detailList && detailList.length > 0) {
for (var i = 0; i < detailList.length; i++) {
let item = detailList[i]
@@ -510,9 +511,9 @@
}
let tList = [] //娓╁害
let wList = [] //閲嶉噺
- let mList = [] //婀垮害
+ let mList = [] //鍚按鐜�
let xList = [] //xAxis
- //鏍规嵁娓╁害鏁版嵁闀垮害锛岀敓鎴恱杞淬�侀噸閲忓拰婀垮害鏁扮粍绛�
+ //鏍规嵁娓╁害鏁版嵁闀垮害锛岀敓鎴恱杞淬�侀噸閲忓拰鍚按鐜囨暟缁勭瓑
for (let key in bellowsTemp) {
//console.log(key + '---' + bellowsTemp[key])
tList.push(bellowsTemp[key])
@@ -556,7 +557,7 @@
connectNulls: true,
color: '#facc14'
}, {
- name: '婀垮害',
+ name: '鍚按',
data: mList,
connectNulls: true,
color: '#2fc25b'
--
Gitblit v1.9.3