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 | 78 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index da3556a..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>
@@ -231,6 +231,7 @@
initFlag: true,
loading: true,
menuVisible:false,
+ isEdit:false,
page: {
pageSize: 10,
currentPage: 1,
@@ -463,7 +464,8 @@
label: "故障状态",
prop: "state",
addDisplay: false,
- editDisplay: false
+ editDisplay: false,
+ hide:true
},
{
label: "故障原因",
@@ -707,28 +709,34 @@
if (val) {
var that = this;
//重新加载一次页面详情数据，解决新的省市区无法写入问题
- getclient(this.form.id).then(res => {
- //this.form = res.data.data;
- //经纬度替换
- this.form.wd = val.latitude;
- this.form.jd = val.longitude;
- //地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
- var address = val.formattedAddress.toString();
- if(address.search("县") != -1){
- this.form.street = address.substring(address.indexOf("县")+1,address.length);
+ //判断是新增还是修改
+ 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;
+ });
}
- if(address.search("区") != -1){
- this.form.street = address.substring(address.indexOf("区")+1,address.length);
- }
- //写入新的省市区
- that.form.province = val.addressComponent.province;
- if(val.addressComponent.city==""){
- that.form.city = val.addressComponent.province;
- }else{
- that.form.city = val.addressComponent.city;
- }
- that.form.district = val.addressComponent.district;
- });
+
+ //经纬度替换
+ this.form.wd = val.latitude;
+ this.form.jd = val.longitude;
+ //地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
+ var address = val.formattedAddress.toString();
+ if(address.search("县") != -1){
+ this.form.street = address.substring(address.indexOf("县")+1,address.length);
+ }
+ if(address.search("区") != -1){
+ this.form.street = address.substring(address.indexOf("区")+1,address.length);
+ }
+ //写入新的省市区
+ that.form.province = val.addressComponent.province;
+ if(val.addressComponent.city==""){
+ that.form.city = val.addressComponent.province;
+ }else{
+ that.form.city = val.addressComponent.city;
+ }
+ that.form.district = val.addressComponent.district;
}
},
immediate: true,
@@ -853,9 +861,9 @@
});
},
rowUpdate(row, index, done, loading) {
- row.deptId = row.deptId.join(",");
- // row.jd=row.map.latitude;
- // row.wd=row.map.longitude;
+ if(Array.isArray(row.deptId)){
+ row.deptId = row.deptId.join(",");
+ }
update(row).then(() => {
// this.initFlag = false;
this.onLoad(this.page);
@@ -931,7 +939,11 @@
if (["edit", "view"].includes(type)) {
getclient(this.form.id).then(res => {
this.form = res.data.data;
+ this.isEdit=true;
});
+ }
+ if (["add"].includes(type)) {
+ this.isEdit=false;
}
// this.initFlag = true;
done();
@@ -988,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