From 966dd10206c6ad2d55ed543a4963ff025615d511 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 11 Jun 2021 09:39:20 +0800
Subject: [PATCH] 首页预警，设备传参调整，设备状态条件修改
---
src/views/clientManagement/clientManagement.vue | 18 ++----------------
src/views/alarmManagement/alarmAnalysis.vue | 14 +++++++-------
2 files changed, 9 insertions(+), 23 deletions(-)
diff --git a/src/views/alarmManagement/alarmAnalysis.vue b/src/views/alarmManagement/alarmAnalysis.vue
index 0621482..35a1c40 100644
--- a/src/views/alarmManagement/alarmAnalysis.vue
+++ b/src/views/alarmManagement/alarmAnalysis.vue
@@ -204,7 +204,7 @@
data.push({
startTime:time[0],
endTime:time[1],
- waringType:'紧急求救',
+ // waringType:'紧急求救',
})
window.parent.handleStartAlarm(data);
},
@@ -265,7 +265,7 @@
click: function (item) {
var data =[];
data.push({
- dxtype: 1
+ dxtype: 4
});
//console.log(data[0],111);
window.parent.handleStartEquipment(data);
@@ -392,7 +392,7 @@
data.push({
startTime:params.name+" 00:00:00",
endTime:params.name+" 23:59:59",
- waringType:'紧急求救',
+ // waringType:'紧急求救',
})
window.parent.handleStartAlarm(data);
}
@@ -485,7 +485,7 @@
data.push({
startTime:time[0],
endTime:time[1],
- waringType:'紧急求救',
+ // waringType:'紧急求救',
})
window.parent.handleStartAlarm(data);
},
@@ -568,7 +568,7 @@
data.push({
startTime:startDate,
endTime:endDate,
- waringType:'紧急求救',
+ // waringType:'紧急求救',
})
window.parent.handleStartAlarm(data);
}
@@ -664,7 +664,7 @@
data.push({
startTime:time[0],
endTime:time[1],
- waringType:'紧急求救',
+ // waringType:'紧急求救',
})
window.parent.handleStartAlarm(data);
},
@@ -1003,7 +1003,7 @@
data.push({
startTime:time[0],
endTime:time[1],
- waringType:'紧急求救',
+ // waringType:'紧急求救',
timeDesc: params.name
})
window.parent.handleStartAlarm(data);
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index d40d510..52dd008 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -830,17 +830,9 @@
const data = res.data.data;
this.page.total = data.total;
- var Dqdate = new Date().getTime();
-
for (var i = 0; i < data.records.length; i++) {
- var date = new Date(data.records[i].heartbeat).getTime();
- if ((Dqdate - date) >= (150 * 1000)) {
- data.records[i].dxzt = 0;
- } else if (data.records[i].heartbeat == "") {
- data.records[i].dxzt = 0;
- } else {
if(data.records[i].dtype==1){
- data.records[i].dxzt = data.records[i].dtype;
+ data.records[i].dxzt = 1;
}
if(data.records[i].dtype==2){
data.records[i].dxzt = 2;
@@ -849,15 +841,9 @@
data.records[i].dxzt = 3;
}
if(data.records[i].dtype=="" || data.records[i].dtype==0){
- data.records[i].dxzt = 1;
+ data.records[i].dxzt = 0;
}
-
- }
}
-
- // data.records.sort((a, b) => {
- // return a.dxzt - b.dxzt;
- // });
this.data = data.records;
this.loading = false;
--
Gitblit v1.9.3