From 338deda86b1496870cd843e0bff835de897c3fb2 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Thu, 06 May 2021 17:20:48 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/policeTracking/policeTracking.vue | 1
src/views/system/user.vue | 4 +-
src/views/clientManagement/clientManagement.vue | 79 +++++++++++++++++++++++----------------
src/views/system/cs.vue | 18 ++++++--
src/page/index/logo.vue | 4 +-
5 files changed, 65 insertions(+), 41 deletions(-)
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index 52202cf..a4d3190 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -834,13 +834,13 @@
//执行重连
that.websocketStart();
}
- }, 10000);
+ }, 4000);
} else {
console.log("WebSocket连接没有建立成功！！");
//执行重连
that.websocketStart();
}
- }, 3000);
+ }, 1000);
},
onDialogTableVisible() {
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 401712a..27d5927 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,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>
@@ -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,
@@ -463,7 +464,8 @@
label: "故障状态",
prop: "state",
addDisplay: false,
- editDisplay: false
+ editDisplay: false,
+ hide:true
},
{
label: "故障原因",
@@ -575,7 +577,7 @@
},
span:5,
},
-
+
{
label: "主要负责人",
prop: "oneId",
@@ -707,28 +709,38 @@
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 = "11";
+ that.form.city = "1101";
+ that.form.district = "110101";
+ // 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,
@@ -779,7 +791,7 @@
// this.initData();
// }
// }
-
+
},
computed: {
...mapGetters(["permission"]),
@@ -819,7 +831,7 @@
});
},
- //初始化数据
+ //初始化数据
// initData() {
// //部门tree数据
// getDeptTree().then(res => {
@@ -827,7 +839,7 @@
// column.dicData = res.data.data;
// });
// },
-
+
handleClick(row) {
this.form = row;
this.dialogTableVisible = true;
@@ -839,6 +851,7 @@
this.onLoad(this.page);
},
rowSave(row, done, loading) {
+ row.deptId = row.deptId.join(",");
add(row).then(() => {
this.onLoad(this.page);
this.$message({
@@ -852,8 +865,6 @@
});
},
rowUpdate(row, index, done, loading) {
- // row.jd=row.map.latitude;
- // row.wd=row.map.longitude;
update(row).then(() => {
// this.initFlag = false;
this.onLoad(this.page);
@@ -929,7 +940,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();
@@ -986,7 +1001,7 @@
} else if (data.records[i].heartbeat == "") {
data.records[i].dxzt = 0;
} else {
- data.records[i].dxzt = 1;
+ data.records[i].dxzt = data.records[i].dtype;
}
}
diff --git a/src/views/policeTracking/policeTracking.vue b/src/views/policeTracking/policeTracking.vue
index 64f8200..a977d5a 100644
--- a/src/views/policeTracking/policeTracking.vue
+++ b/src/views/policeTracking/policeTracking.vue
@@ -730,6 +730,7 @@
bz: this.form.bz,
snumber: this.form.alarmId,
sname: this.form.alarmPeople,
+ deviceNumber:this.form.deviceNumber,
zc: zc,
zctime: this.getDate().current,
};
diff --git a/src/views/system/cs.vue b/src/views/system/cs.vue
index 69f60b4..15c292f 100644
--- a/src/views/system/cs.vue
+++ b/src/views/system/cs.vue
@@ -177,6 +177,7 @@
datas: [], //cc
loadings: true, //等待
querys: {}, //搜索
+ isEdit:false,
pages: {
pageSize: 10,
currentPage: 1,
@@ -727,11 +728,13 @@
// form是表单或者表格绑定的数据集，v-model='form'
handler(val) {
if (val) {
- getDetail(this.form.id).then((res) => {
- this.form = res.data.data;
- });
- this.form.wd = val.latitude;
- this.form.jd = val.longitude;
+ if(that.isEdit){
+ getDetail(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) {
@@ -902,6 +905,7 @@
},
beforeOpen(done, type) {
if (["edit"].includes(type)) {
+ that.isEdit=true;
getDetail(this.form.id).then((res) => {
if (this.form.type == "1") {
const data = res.data.data;
@@ -994,6 +998,10 @@
}
});
}
+
+ if (["edit"].includes(type)) {
+ that.isEdit=false;
+ }
done();
},
searchReset() {
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 8debe4a..ac38e50 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -515,8 +515,8 @@
{
label: "所属部门",
prop: "deptId",
- type: "tree",
- multiple: true,
+ type: "cascader",
+ //multiple: true,
dicData: [],
props: {
label: "title"
--
Gitblit v1.9.3