From c161bd781d6a6696e4ee9be70067b7fcd824767c Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Sat, 11 Feb 2023 09:59:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/components/map/components/mapPopup.vue | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 9f780b2..b97a42f 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -1,6 +1,6 @@
<template>
<div>
- <div v-if="detailsPopup" class="divForms-dom" id="divFormsDomBox">
+ <div v-if="detailsPopup.showBox" class="divForms-dom" id="divFormsDomBox">
<div style="width: 100%; height: 100%; transform: translate(0, 50%);">
<div class="divForms divForms-theme" :class="{ 'scale-dom': scaleDomFlag }">
<div class="divForms-wrap">
@@ -17,7 +17,7 @@
<div class="details-btn" @click="popupDetailShow">详情>>></div>
<div class="close" @click="closePopup" title="关闭"></div>
</div>
- <div class="change-btn">
+ <div class="change-btn" v-show="showBtn">
<div @click="currentBtn = '接警信息'" :class="{ on: currentBtn == '接警信息' }">接警信息</div>
<div @click="currentBtnChange('出警信息')" :class="{ on: currentBtn == '出警信息' }">出警信息
</div>
@@ -156,7 +156,10 @@
methods: {
closePopup () {
this.currentBtn = '接警信息'
- this.$store.commit('SET_DETAILSPOPUP', false)
+ this.$store.commit('SET_DETAILSPOPUP', {
+ showBox: false,
+ showBtn: false
+ })
},
currentBtnChange (type) {
@@ -172,7 +175,11 @@
},
popupDetailShow () {
- this.$EventBus.$emit('policeSituationSiteClick', this.dataPopup)
+ if (this.detailsPopup.showBtn == true) {
+ this.$EventBus.$emit('policeSituationSiteClick', this.dataPopup)
+ } else {
+ this.$EventBus.$emit('housingPoliceSiteClick', this.dataPopup)
+ }
}
}
}
--
Gitblit v1.9.3