From a1c2fecb75c9c8fef3345dee6d071faae6d3dccd Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 28 Feb 2023 14:19:37 +0800
Subject: [PATCH] 模型加载的更改
---
src/components/map/components/mapPopup.vue | 108 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 84 insertions(+), 24 deletions(-)
diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 21fbe3b..881da15 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -1,8 +1,8 @@
<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">
+ <div class="divForms divForms-theme" :class="{ 'scale-dom': scaleDomFlag }">
<div class="divForms-wrap">
<div class="area">
<div class="arrow-lt"></div>
@@ -14,13 +14,15 @@
<div class="label-wrap">
<div class="title">
警情信息
- <div class="details-btn" @click="popupDetailShow">详情>>></div>
+ <div class="details-btn" @click="popupDetailShow">
+ 详情
+ <span>>>></span>
+ </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">
@@ -33,8 +35,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>
@@ -45,12 +47,12 @@
<div>{{ dataPopup.LXDH }}</div>
</div>
<div class="item">
- <div>联系电话:</div>
- <div>{{ dataPopup.BJNR }}</div>
+ <div>报警内容:</div>
+ <div :title="dataPopup.BJNR">{{ dataPopup.BJNR }}</div>
</div>
<div class="item">
<div>事发地址:</div>
- <div>{{ dataPopup.SFDZ }}</div>
+ <div :title="dataPopup.SFDZ">{{ dataPopup.SFDZ }}</div>
</div>
<div class="item">
<div>报警类型:</div>
@@ -62,7 +64,7 @@
</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 +102,9 @@
<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>
@@ -119,34 +124,73 @@
export default {
name: 'mapPopup',
+
+ inject: ["getWidth", 'userInfo'],
+
data () {
return {
currentBtn: '接警信息',
- CJdata: {}
+ CJdata: {},
+ scaleDomFlag: false
}
},
+
computed: {
...mapGetters([
'detailsPopup',
'dataPopup'
])
},
+
+ watch: {
+ detailsPopup: {
+ handler (newData, oldData) {
+ if (newData.showBox == false) {
+ this.currentBtn = '接警信息'
+ }
+ }
+ }
+ },
+
+ mounted () {
+
+ if (this.getWidth() > 7000) {
+ this.scaleDomFlag = true
+ } else {
+ this.scaleDomFlag = false
+ }
+
+ },
+
methods: {
closePopup () {
this.currentBtn = '接警信息'
- this.$store.commit('SET_DETAILSPOPUP', false)
+ this.$store.commit('SET_DETAILSPOPUP', {
+ showBox: false,
+ showBtn: false
+ })
},
currentBtnChange (type) {
this.currentBtn = type
- getActAsPoliceList(this.dataPopup.JJDBH, '').then(res => {
- console.log(res, 999999)
- // this.CJdata = res.data.result
+
+ this.CJdata = {}
+
+ getActAsPoliceList(this.dataPopup.JJDBH, this.userInfo.dept_id).then(res => {
+ if (res.data.data.records.length > 0) {
+ this.CJdata = res.data.data.records[0]
+ }
})
},
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)
+ }
}
}
}
@@ -157,15 +201,20 @@
position: fixed;
left: 0;
z-index: 1 !important;
+
+ .scale-dom {
+ transform: scale(3);
+ transform-origin: left;
+ }
}
.divForms .arrow {
position: absolute;
bottom: 50%;
- left: -8px;
+ left: 0;
width: 45px;
height: 2px;
- transform: rotate(-45deg);
+ transform: rotate(-45deg) translate(5px, -15px);
background-color: #28bbf0;
}
@@ -307,11 +356,20 @@
&>div:nth-of-type(2) {
width: calc(100% - 120px);
+ max-width: 190px;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
}
}
-
}
+ .label-content.no-data {
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ min-height: 240px;
+ }
}
.divForms .title {
@@ -327,6 +385,10 @@
right: 28px;
height: 100%;
cursor: pointer;
+
+ span {
+ font-size: 14px;
+ }
}
.details-btn:hover {
@@ -352,9 +414,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