From f1c21b8e3dcfe6c561f332a61364d1c2e2952b0e Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 27 Apr 2021 08:55:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue
---
src/views/security/security.vue | 4 ++--
src/views/clientManagement/clientManagement.vue | 8 +++++++-
public/map/widgets/securityMap/SecurityMap.css | 2 +-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/public/map/widgets/securityMap/SecurityMap.css b/public/map/widgets/securityMap/SecurityMap.css
index 6e06802..290dd6f 100644
--- a/public/map/widgets/securityMap/SecurityMap.css
+++ b/public/map/widgets/securityMap/SecurityMap.css
@@ -1,6 +1,6 @@
.mapBtn {
background-color: #ffffff;
- width: 20.4vh;
+ width: 188px;
height: 4vh;
position: relative;
top: 3vh;
diff --git a/src/views/clientManagement/clientManagement.vue b/src/views/clientManagement/clientManagement.vue
index 11e5167..bdc9ea3 100644
--- a/src/views/clientManagement/clientManagement.vue
+++ b/src/views/clientManagement/clientManagement.vue
@@ -687,6 +687,7 @@
var that = this;
//重新加载一次页面详情数据，解决新的省市区无法写入问题
getclient(this.form.id).then(res => {
+ debugger;
this.form = res.data.data;
//经纬度替换
this.form.wd = val.latitude;
@@ -701,7 +702,12 @@
}
//写入新的省市区
that.form.province = val.addressComponent.province;
- that.form.city = val.addressComponent.city;
+ if(val.addressComponent.city==""){
+ that.form.city = val.addressComponent.province;
+ }else{
+ that.form.city = val.addressComponent.city;
+ }
+
that.form.district = val.addressComponent.district;
});
}
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 7787fd2..86c5c0b 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -118,11 +118,11 @@
prop: "online_status",
dicData: [{
label: "离线",
- value: 0
+ value: "0"
},
{
label: "在线",
- value: 1
+ value: "1"
},
],
},
--
Gitblit v1.9.3