From dcbd5d098edf9decdde645a4941500fdb59a6277 Mon Sep 17 00:00:00 2001
From: jxdnsong <592566207@qq.com>
Date: Wed, 03 Feb 2021 11:10:07 +0800
Subject: [PATCH] 解决地图定位冲突
---
src/views/realTimePolice/real.vue | 9 ---------
1 files changed, 0 insertions(+), 9 deletions(-)
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 255e469..d633cf1 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -274,7 +274,6 @@
</el-form>
</el-dialog>
-<<<<<<< HEAD
<el-drawer
title="电子地图"
append-to-body="true"
@@ -287,10 +286,6 @@
width="100%"
height="100%"
></iframe>
-=======
- <el-drawer title="电子地图" append-to-body="true" :visible.sync="showMap">
- <iframe :src="mapUrl" frameborder="0" width="100%" height="100%"></iframe>
->>>>>>> cb724c3b33fc850771b87c3c6feaa582addac56a
</el-drawer>
</basic-container>
</template>
@@ -309,10 +304,6 @@
data() {
return {
showMap: false,
-<<<<<<< HEAD
-=======
- mapUrl: "https://s16s652780.51mypc.cn/jfpt/map/index.html",
->>>>>>> cb724c3b33fc850771b87c3c6feaa582addac56a
hls: "",
videoSource: "",
dialogTableVisible: false,
--
Gitblit v1.9.3