From e24f70ababdee2b4fdce71c6b80a9bc928fa0331 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 08 May 2023 14:45:08 +0800
Subject: [PATCH] 警情排行调整
---
src/components/map/components/mapPopup.vue | 55 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 36 insertions(+), 19 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 76919f7..1464b90 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">
@@ -14,13 +14,12 @@
<div class="label-wrap">
<div class="title">
警情信息
- <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="detailsPopup.showBtn">
<div @click="currentBtn = '接警信息'" :class="{ on: currentBtn == '接警信息' }">接警信息</div>
- <div @click="currentBtnChange('出警信息')" :class="{ on: currentBtn == '出警信息' }">出警信息
- </div>
+ <div @click="currentBtnChange('出警信息')" :class="{ on: currentBtn == '出警信息' }">出警信息</div>
</div>
<div v-show="currentBtn == '接警信息'" class="label-content">
@@ -62,8 +61,7 @@
</div>
</div>
- <div v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) != '{}'"
- class="label-content">
+ <div v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) != '{}'" class="label-content">
<div class="item">
<div>处警单位:</div>
<div>{{ CJdata.CJDWMC }}</div>
@@ -103,9 +101,7 @@
</div>
<div v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) == '{}'"
- class="label-content no-data">
- 暂无数据
- </div>
+ class="label-content no-data">暂无数据</div>
</div>
</div>
<div class="b-t-l"></div>
@@ -125,6 +121,9 @@
export default {
name: 'mapPopup',
+
+ inject: ["getWidth", 'userInfo'],
+
data () {
return {
currentBtn: '接警信息',
@@ -133,13 +132,21 @@
}
},
- inject: ["getWidth"],
-
computed: {
...mapGetters([
'detailsPopup',
'dataPopup'
])
+ },
+
+ watch: {
+ detailsPopup: {
+ handler (newData, oldData) {
+ if (newData.showBox == false) {
+ this.currentBtn = '接警信息'
+ }
+ }
+ }
},
mounted () {
@@ -155,7 +162,10 @@
methods: {
closePopup () {
this.currentBtn = '接警信息'
- this.$store.commit('SET_DETAILSPOPUP', false)
+ this.$store.commit('SET_DETAILSPOPUP', {
+ showBox: false,
+ showBtn: false
+ })
},
currentBtnChange (type) {
@@ -163,7 +173,7 @@
this.CJdata = {}
- getActAsPoliceList(this.dataPopup.JJDBH, '').then(res => {
+ getActAsPoliceList(this.dataPopup.JJDBH, this.userInfo.dept_id).then(res => {
if (res.data.data.records.length > 0) {
this.CJdata = res.data.data.records[0]
}
@@ -171,7 +181,13 @@
},
popupDetailShow () {
- this.$EventBus.$emit('policeSituationSiteClick', this.dataPopup)
+ if (this.detailsPopup.openMenu != '' && this.detailsPopup.openMenu == 'policeInfor') {
+ this.$EventBus.$emit('PoliceInforSiteClick', this.dataPopup)
+ } else {
+ this.detailsPopup.showBtn == true ?
+ this.$EventBus.$emit('policeSituationSiteClick', this.dataPopup) :
+ this.$EventBus.$emit('housingPoliceSiteClick', this.dataPopup)
+ }
}
}
}
@@ -343,7 +359,6 @@
white-space: nowrap;
}
}
-
}
.label-content.no-data {
@@ -367,6 +382,10 @@
right: 28px;
height: 100%;
cursor: pointer;
+
+ span {
+ font-size: 14px;
+ }
}
.details-btn:hover {
@@ -392,9 +411,7 @@
}
.divForms-theme .title {
- background-image: linear-gradient(135deg,
- transparent 25px,
- #1c309e9a 25px);
+ background-image: linear-gradient(135deg, transparent 25px, #1c309e9a 25px);
}
.divForms-theme .arrow,
--
Gitblit v1.9.3