From 14e02654e0545ee69456d64aef2f35c7c219d708 Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Fri, 07 May 2021 11:26:49 +0800
Subject: [PATCH] 地图模式设备状态修改
---
src/views/clientManagement/clientManagement.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index dc50cd8..bc94ea0 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -69,7 +69,7 @@
<template slot-scope="{ row }" slot="dxzt">
<el-tag>{{
- row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "在线" : "无"
+ row.dxzt == "0" ? "掉线" : row.dxzt == "1" ? "正常" :row.dxzt == "2" ? "报警":row.dxzt == "3" ? "故障":"无"
}}
</el-tag>
</template>
@@ -464,7 +464,8 @@
label: "故障状态",
prop: "state",
addDisplay: false,
- editDisplay: false
+ editDisplay: false,
+ hide:true
},
{
label: "故障原因",
@@ -711,10 +712,9 @@
//判断是新增还是修改
if(that.isEdit){
getclient(this.form.id).then(res => {
- that.province = res.data.data.province;
- that.city = res.data.data.city;
- that.district = res.data.data.district;
-
+ // that.province = res.data.data.province;
+ // that.city = res.data.data.city;
+ // that.district = res.data.data.district;
});
}
@@ -861,6 +861,9 @@
});
},
rowUpdate(row, index, done, loading) {
+ if(Array.isArray(row.deptId)){
+ row.deptId = row.deptId.join(",");
+ }
update(row).then(() => {
// this.initFlag = false;
this.onLoad(this.page);
@@ -997,7 +1000,19 @@
} else if (data.records[i].heartbeat == "") {
data.records[i].dxzt = 0;
} else {
- data.records[i].dxzt = 1;
+ if(data.records[i].dtype==1){
+ data.records[i].dxzt = data.records[i].dtype;
+ }
+ if(data.records[i].dtype==2){
+ data.records[i].dxzt = 2;
+ }
+ if(data.records[i].dtype==3){
+ data.records[i].dxzt = 3;
+ }
+ if(data.records[i].dtype=="" || data.records[i].dtype==0){
+ data.records[i].dxzt = 1;
+ }
+
}
}
--
Gitblit v1.9.3