From fba0b4cdc5d070394fc64b34d9e50ca65c23e0a6 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Fri, 07 Apr 2023 17:55:40 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs
---
src/views/activity/components/publicIndex.vue | 18 ++++++++----------
1 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/src/views/activity/components/publicIndex.vue b/src/views/activity/components/publicIndex.vue
index 33ee522..6a68575 100644
--- a/src/views/activity/components/publicIndex.vue
+++ b/src/views/activity/components/publicIndex.vue
@@ -4,19 +4,20 @@
:isHaveLine="isHaveLine" :policeSwitch="policeSwitch" :arrowBtnSwitch="arrowBtnSwitch"
:polylineBtnSwitch="polylineBtnSwitch"></layers-show-control>
- <polygon-plot ref="PolygonPlotPage" :showingSecurityId="showingSecurityId"></polygon-plot>
-
- <polyline-plot ref="PolylinePlotPage" :showingSecurityId="showingSecurityId"></polyline-plot>
+ <draw-btn-box v-if="currentPlotType == 3" ref="DRAWBTNBOX" :dialogVisible="dialogVisible"
+ :isShowActivityEditBox="isShowActivityEditBox" :showingSecurityId="showingSecurityId"
+ :policeSwitch="policeSwitch" :polylineBtnSwitch="polylineBtnSwitch" :arrowBtnSwitch="arrowBtnSwitch"
+ :policeIconId="policeIconId" :lineWidth="lineWidth" @setPoliceOption="setPoliceOption"></draw-btn-box>
<two-draw-btn-box v-if="currentPlotType == 1" ref="DRAWBTNBOX" :dialogVisible="dialogVisible"
:isShowActivityEditBox="isShowActivityEditBox" :showingSecurityId="showingSecurityId"
:policeSwitch="policeSwitch" :polylineBtnSwitch="polylineBtnSwitch" :arrowBtnSwitch="arrowBtnSwitch"
:policeIconId="policeIconId" :lineWidth="lineWidth" @setPoliceOption="setPoliceOption"></two-draw-btn-box>
- <draw-btn-box v-if="currentPlotType == 3" ref="DRAWBTNBOX" :dialogVisible="dialogVisible"
- :isShowActivityEditBox="isShowActivityEditBox" :showingSecurityId="showingSecurityId"
- :policeSwitch="policeSwitch" :polylineBtnSwitch="polylineBtnSwitch" :arrowBtnSwitch="arrowBtnSwitch"
- :policeIconId="policeIconId" :lineWidth="lineWidth" @setPoliceOption="setPoliceOption"></draw-btn-box>
+ <polygon-plot ref="PolygonPlotPage" :showingSecurityId="showingSecurityId"></polygon-plot>
+
+ <polyline-plot ref="PolylinePlotPage" :showingSecurityId="showingSecurityId"></polyline-plot>
+
<police-car-change ref="PoliceCarChange" :policeOption="policeOption"
:showingSecurityId="showingSecurityId"></police-car-change>
@@ -133,9 +134,6 @@
methods: {
addNewPolice (data, type, dataType = '') {
this.$refs.DRAWBTNBOX.addNewPolice(data, type, dataType)
-
- console.log(data, 4555)
- // this.$parent.
},
addPointPopupShow (type, positions) {
--
Gitblit v1.9.3