From 4f11d6a54ade61ba7daf8ba856014d2f8994badf Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sun, 09 May 2021 08:34:19 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/jfpt-Vue

---
 src/views/security/security.vue |   48 ++++++++++++++++++++++++------------------------
 1 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 25f33f5..503ef84 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -60,7 +60,7 @@
         form: {},
         query: {},
         loading: true,
-        showMap: true,
+        showMap: false,
         page: {
           pageSize: 10,
           currentPage: 1,
@@ -201,9 +201,6 @@
         return ids.join(",");
       }
     },
-    mounted() {
-      this.showMap = false;
-    },
     methods: {
       rowSave(row, done, loading) {
         add(row).then(() => {
@@ -251,6 +248,7 @@
       //打开地图
       handleMap(row) {
         var that =this;
+        this.showMap=true;
         if(row.jd=="" || row.jd=="0.0"){
           var rwjd = "115.862321";
           var rwwd = "28.591108";
@@ -258,28 +256,30 @@
         }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[1].init) {
-            if(row.jd=="" || row.jd=="0.0"){
-              //如果处警员无位置信息,则赋值一个默认数据,否则地图无法加载
-              window.frames[1].init("SecurityMap", {
-                              x: rwjd,
-                              y: rwwd,
-                              code:row.code
-                          });
-            }else{
-              window.frames[1].init("SecurityMap", {
-                              x: row.jd,
-                              y: row.wd,
-                              code:row.code
-                          });
+        
+        this.$nextTick(() => {
+          this.$refs.securityMap.onload = () => {
+            if (window.frames[0].init) {
+              if(row.jd=="" || row.jd=="0.0"){
+                //如果处警员无位置信息,则赋值一个默认数据,否则地图无法加载
+                window.frames[0].init("SecurityMap", {
+                                x: rwjd,
+                                y: rwwd,
+                                code:row.code
+                            });
+              }else{
+                window.frames[0].init("SecurityMap", {
+                                x: row.jd,
+                                y: row.wd,
+                                code:row.code
+                            });
+              }
+              
+            } else {
+              console.log(`没有找到到window.frames[0].init`)
             }
-
-          } else {
-            console.log(`没有找到到window.frames[1].init`)
           }
-        }
+        });
       },
       handleDelete() {
         if (this.selectionList.length === 0) {

--
Gitblit v1.9.3