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 | 162 ++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 109 insertions(+), 53 deletions(-)
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 29a34be..bc94ea0 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -30,7 +30,7 @@
@refresh-change="refreshChange"
@on-load="onLoad"
@row-click="rowClick">
-
+
<template slot="menuLeft">
<el-button type="danger"
size="mini"
@@ -69,14 +69,14 @@
<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>
- <template slot-scope="{ row }" slot="jfzt">
- <i class="el-icon-check client-jf" v-if="row.type == 0"></i>
- <i class="el-icon-close client-qf" v-else-if="row.type == 1"></i>
+ <template slot-scope="{ row }" slot="type">
+ <i class="el-icon-check client-jf" v-if="row.type == '0' "></i>
+ <i class="el-icon-close client-qf" v-else-if="row.type == '1' "></i>
</template>
</avue-crud>
@@ -141,7 +141,7 @@
</el-form-item>
</el-col>
</el-form>
-
+
</el-dialog>
@@ -231,6 +231,7 @@
initFlag: true,
loading: true,
menuVisible:false,
+ isEdit:false,
page: {
pageSize: 10,
currentPage: 1,
@@ -269,9 +270,9 @@
option: {
height: 'auto',
indexLabel: '序号',
- calcHeight: 80,
- labelWidth: '105',
- dialogWidth: 1040,
+ calcHeight: 54,
+ labelWidth: '125',
+ dialogWidth: 1150,
menuWidth: 150,
align:"center",
size: "mini",
@@ -343,9 +344,8 @@
label: "使用方",
prop: "deptId",
width: 200,
- type: "tree",
+ type: "cascader",
dicUrl: "/api/blade-system/dept/trees",
- multiple: true,
dicData: [],
checkStrictly:true,
hide:true,
@@ -407,10 +407,29 @@
}],
}, {
label: "缴费状态",
- prop: "jfzt",
+ prop: "type",
slot: true,
+ sortable:true,
addDisplay: false,
editDisplay: false,
+ }, {
+ label: "设备厂商",
+ prop: "manufacturers",
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=manufacturers",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ search:true,
+ type:"select",
+ rules: [{
+ required: true,
+ message: "请选择设备厂商",
+ trigger: "blur"
+ }],
}, {
label: "布撤防状态",
prop: "devicestate",
@@ -437,6 +456,7 @@
label: "设备状态",
prop: "dxzt",
slot: true,
+ sortable:true,
addDisplay: false,
editDisplay: false,
},
@@ -444,7 +464,8 @@
label: "故障状态",
prop: "state",
addDisplay: false,
- editDisplay: false
+ editDisplay: false,
+ hide:true
},
{
label: "故障原因",
@@ -452,13 +473,12 @@
addDisplay: false,
editDisplay: false
},
-
{
label: "省份",
prop: "province",
search: true,
searchSpan: 2,
- labelWidth: '100',
+ labelWidth: '110',
searchLabelWidth: 45,
placeholder: "省份",
type: "select",
@@ -468,7 +488,7 @@
},
cascaderItem: ["city", "district"],
dicUrl: "/api/blade-system/region/select",
- span: 7,
+ span: 8,
className: "city1",
hide: true,
addDisplay: true,
@@ -511,7 +531,7 @@
value: "code"
},
dicUrl: "/api/blade-system/region/select?code={{key}}",
- span: 3,
+ span: 2,
labelWidth: "0",
className: "city3",
hide: true,
@@ -521,9 +541,7 @@
}, {
label: "地址",
prop: "street",
- // type:"map",
- span:11,
- labelWidth: '160',
+ span:10,
hide: true,
},
{
@@ -533,7 +551,7 @@
searchSpan:0,
maxlength:0,
hide: true,
- span: 1,
+ span: 2,
// display:false,
component: "AvueMap"
},
@@ -543,7 +561,7 @@
prop: "jd",
searchSpan:2,
width:"100",
- labelWidth: "110",
+ labelWidth: "120",
formatter: (row,value,label,column)=>{
return value = value.substring(0,11);
},
@@ -559,20 +577,9 @@
},
span:5,
},
- {
- label: "心跳时间",
- prop: "heartbeat",
- type: "datetime",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd HH:mm:ss",
- width: 130,
- hide: true,
- addDisplay: true,
- editDisplay: true,
- viewDisplay: true,
- },
+
{
- label: "负责人1",
+ label: "主要负责人",
prop: "oneId",
type: "tree",
dicUrl: "/api/blade-system/dept/Batrees",
@@ -586,12 +593,12 @@
viewDisplay: true,
rules: [{
required: true,
- message: "请选择负责人",
+ message: "请选择主要负责人",
trigger: "blur"
}],
},
{
- label: "负责人1电话",
+ label: "主要负责人电话",
prop: "onePhone",
width: 110,
hide: true,
@@ -604,7 +611,7 @@
trigger: "blur"
}],
}, {
- label: "负责人2",
+ label: "负责人1",
prop: "twoId",
type: "tree",
dicUrl: "/api/blade-system/dept/Batrees",
@@ -618,7 +625,7 @@
viewDisplay: true,
},
{
- label: "负责人2电话",
+ label: "负责人1电话",
prop: "twoPhone",
width: 110,
hide: true,
@@ -626,7 +633,7 @@
editDisplay: true,
viewDisplay: true,
}, {
- label: "负责人3",
+ label: "负责人2",
prop: "threeId",
type: "tree",
dicUrl: "/api/blade-system/dept/Batrees",
@@ -640,7 +647,7 @@
viewDisplay: true,
},
{
- label: "负责人3电话",
+ label: "负责人2电话",
prop: "threePhone",
width: 110,
hide: true,
@@ -677,6 +684,18 @@
editDisplay: true,
viewDisplay: true,
},
+ {
+ label: "心跳时间",
+ prop: "heartbeat",
+ type: "datetime",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd HH:mm:ss",
+ width: 130,
+ hide: true,
+ addDisplay: true,
+ editDisplay: true,
+ viewDisplay: true,
+ }
]
},
@@ -689,10 +708,19 @@
handler(val) {
if (val) {
var that = this;
+ //重新加载一次页面详情数据，解决新的省市区无法写入问题
+ //判断是新增还是修改
+ 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;
+ });
+ }
+
+ //经纬度替换
this.form.wd = val.latitude;
- // this.form.wd = val.latitude.toString().substring(0,10);
this.form.jd = val.longitude;
- // this.form.jd = val.longitude.toString().substring(0,11);
//地址截取，从县/区开始截取,并且取从县区第一个出现的位置开始
var address = val.formattedAddress.toString();
if(address.search("县") != -1){
@@ -701,10 +729,14 @@
if(address.search("区") != -1){
this.form.street = address.substring(address.indexOf("区")+1,address.length);
}
-
- // that.form.province = val.addressComponent.province;
- // that.form.city = val.addressComponent.city;
- // that.form.district = val.addressComponent.district;
+ //写入新的省市区
+ 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,
@@ -755,7 +787,7 @@
// this.initData();
// }
// }
-
+
},
computed: {
...mapGetters(["permission"]),
@@ -795,7 +827,7 @@
});
},
- //初始化数据
+ //初始化数据
// initData() {
// //部门tree数据
// getDeptTree().then(res => {
@@ -803,7 +835,7 @@
// column.dicData = res.data.data;
// });
// },
-
+
handleClick(row) {
this.form = row;
this.dialogTableVisible = true;
@@ -815,6 +847,7 @@
this.onLoad(this.page);
},
rowSave(row, done, loading) {
+ row.deptId = row.deptId.join(",");
add(row).then(() => {
this.onLoad(this.page);
this.$message({
@@ -828,8 +861,9 @@
});
},
rowUpdate(row, index, done, loading) {
- // 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);
@@ -866,6 +900,7 @@
this.onLoad(this.page);
},
searchChange(params, done) {
+ console.log(params,done)
this.query = params;
this.page.currentPage = 1;
this.onLoad(this.page, params);
@@ -904,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();
@@ -961,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;
+ }
+
}
}
@@ -1013,14 +1064,19 @@
});
}, handleStart(row) {
+
+ console.log(row,11111111111);
row = this.selectRow;
+ console.log(row,22222222222);
var arr = [];
+ console.log(this.$store.state.tags.tagList,3333333);
this.$store.state.tags.tagList.forEach(item => {
if (item.label != "视频") {
arr.push(item);
}
});
this.$store.state.tags.tagList = arr;
+ console.log(arr,444444444444);
this.$router.push({
path: `/real/video/`, query: row
});
--
Gitblit v1.9.3