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

liuyg

2021-05-09 2f25575cb3c1d045bab1bb265ef73f40772c8fc0

 src/views/security/security.vue

@@ -259,16 +259,16 @@
        
        this.$nextTick(() => {
          this.$refs.securityMap.onload = () => {
            if (window.frames[0].init) {
            if (window.frames[1].init) {
              if(row.jd=="" || row.jd=="0.0"){
                //如果处警员无位置信息，则赋值一个默认数据，否则地图无法加载
                window.frames[0].init("SecurityMap", {
                window.frames[1].init("SecurityMap", {
                                x: rwjd,
                                y: rwwd,
                                code:row.code
                            });
              }else{
                window.frames[0].init("SecurityMap", {
                window.frames[1].init("SecurityMap", {
                                x: row.jd,
                                y: row.wd,
                                code:row.code
@@ -276,7 +276,7 @@
              }
              
            } else {
              console.log(`没有找到到window.frames[0].init`)
              console.log(`没有找到到window.frames[1].init`)
            }
          }
        });