From 6ed96bc3ce751d6943d6710a6fcf34b72c35aee9 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 13 Apr 2021 14:41:23 +0800
Subject: [PATCH] 修改 冲突

---
 src/views/dataL/dataL.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/dataL/dataL.vue b/src/views/dataL/dataL.vue
index 32577e2..c4d54db 100644
--- a/src/views/dataL/dataL.vue
+++ b/src/views/dataL/dataL.vue
@@ -1139,7 +1139,7 @@
         this.getMap();
       } else {
         // this.re();
-        this.getMap();
+        console.log(`没有找到到window.frames[0].init`)
       }
     };
   },

--
Gitblit v1.9.3