Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

shuishen

2021-04-27 72aaffefaf6049db0d8ed611bd4b289e32e659b9

Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/jfpt-Vue

 src/views/clientManagement/clientManagement.vue

@@ -687,7 +687,6 @@
            var that = this;
            //重新加载一次页面详情数据，解决新的省市区无法写入问题
            getclient(this.form.id).then(res => {
              debugger;
              this.form = res.data.data;
              //经纬度替换
              this.form.wd = val.latitude;
@@ -906,7 +905,6 @@
          });
      },
      beforeOpen(done, type) {
        debugger;
        if (["edit", "view"].includes(type)) {
          getclient(this.form.id).then(res => {
            this.form = res.data.data;

 src/views/security/security.vue

@@ -251,15 +251,21 @@
      //打开地图
      handleMap(row) {
        var that =this;
        that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${row.jd}&wd=${row.wd}&code=${row.code}&name=${row.realName}`;
        if(row.jd=="" || row.jd=="0.0"){
          var rwjd = "115.862321";
          var rwwd = "28.591108";
          that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${rwjd}&wd=${rwwd}&code=${row.code}&name=${row.realName}`;
        }else{
          that.baseUrl = `/map/index.html?ISinit=1&openid=SecurityMap&jd=${row.jd}&wd=${row.wd}&code=${row.code}&name=${row.realName}`;
        }
        this.showMap=true;
        this.$refs.securityMap.onload = () => {
          if (window.frames[0].init) {
            if(row.jd==""){
            if(row.jd=="" || row.jd=="0.0"){
              //如果处警员无位置信息，则赋值一个默认数据，否则地图无法加载
              window.frames[0].init("SecurityMap", {
                              x: "115.862321",
                              y: "28.591108",
                              x: rwjd,
                              y: rwwd,
                              code:row.code
                          });
            }else{