From 8b2fc551d8bee2d2143a36e1e2fcd7e81d051b18 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Sun, 15 Jan 2023 15:21:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/srs-police-affairs
---
src/components/map/components/mapPopup.vue | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index e026f1a..76919f7 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -2,7 +2,7 @@
<div>
<div v-if="detailsPopup" class="divForms-dom" id="divFormsDomBox">
<div style="width: 100%; height: 100%; transform: translate(0, 50%);">
- <div class="divForms divForms-theme">
+ <div class="divForms divForms-theme" :class="{ 'scale-dom': scaleDomFlag }">
<div class="divForms-wrap">
<div class="area">
<div class="arrow-lt"></div>
@@ -33,8 +33,8 @@
<div>{{ dataPopup.JJYXM }}</div>
</div>
<div class="item">
- <div>接警时间:</div>
- <div>{{ dataPopup.JJSJ }}</div>
+ <div>报警时间:</div>
+ <div>{{ dataPopup.BJSJ }}</div>
</div>
<div class="item">
<div>报警人:</div>
@@ -62,7 +62,8 @@
</div>
</div>
- <div v-show="currentBtn == '出警信息'" class="label-content">
+ <div v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) != '{}'"
+ class="label-content">
<div class="item">
<div>处警单位:</div>
<div>{{ CJdata.CJDWMC }}</div>
@@ -100,6 +101,11 @@
<div>{{ CJdata.MEMO }}</div>
</div>
</div>
+
+ <div v-show="currentBtn == '出警信息' && JSON.stringify(CJdata) == '{}'"
+ class="label-content no-data">
+ 暂无数据
+ </div>
</div>
</div>
<div class="b-t-l"></div>
@@ -122,15 +128,30 @@
data () {
return {
currentBtn: '接警信息',
- CJdata: {}
+ CJdata: {},
+ scaleDomFlag: false
}
},
+
+ inject: ["getWidth"],
+
computed: {
...mapGetters([
'detailsPopup',
'dataPopup'
])
},
+
+ mounted () {
+
+ if (this.getWidth() > 7000) {
+ this.scaleDomFlag = true
+ } else {
+ this.scaleDomFlag = false
+ }
+
+ },
+
methods: {
closePopup () {
this.currentBtn = '接警信息'
@@ -141,8 +162,11 @@
this.currentBtn = type
this.CJdata = {}
+
getActAsPoliceList(this.dataPopup.JJDBH, '').then(res => {
- this.CJdata = res.data.data.records
+ if (res.data.data.records.length > 0) {
+ this.CJdata = res.data.data.records[0]
+ }
})
},
@@ -158,6 +182,11 @@
position: fixed;
left: 0;
z-index: 1 !important;
+
+ .scale-dom {
+ transform: scale(3);
+ transform-origin: left;
+ }
}
.divForms .arrow {
@@ -317,6 +346,12 @@
}
+ .label-content.no-data {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ min-height: 240px;
+ }
}
.divForms .title {
--
Gitblit v1.9.3