Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

liuyg

2021-04-27 f1c21b8e3dcfe6c561f332a61364d1c2e2952b0e

Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

 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;

 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;
            });
          }

 src/views/security/security.vue

@@ -118,11 +118,11 @@
              prop: "online_status",
              dicData: [{
                label: "离线",
                value: 0
                value: "0"
              },
                {
                  label: "在线",
                  value: 1
                  value: "1"
                },
              ],
            },