From f13afcb61276061871b30bce17a7877287df0b67 Mon Sep 17 00:00:00 2001
From: guanqb <18720758508@163.com>
Date: Sat, 20 Jan 2024 09:56:43 +0800
Subject: [PATCH] 1
---
src/components/map/components/activityPolicePopup.vue | 26 ++++++++++++++++++++------
1 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/components/map/components/activityPolicePopup.vue b/src/components/map/components/activityPolicePopup.vue
index a263e05..0c801ea 100644
--- a/src/components/map/components/activityPolicePopup.vue
+++ b/src/components/map/components/activityPolicePopup.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-02 09:39:32
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-03-07 11:02:54
+ * @LastEditTime: 2023-04-13 16:43:57
* @FilePath: \srs-police-affairs\src\components\map\components\activityPolicePopup.vue
* @Description:
*
@@ -14,7 +14,9 @@
<div style="transform: translate(-50%, 0);">
<!-- 样式自己修改 -->
<div class="content" :class="{ 'scale-dom': scaleDomFlag }">
- <div class="data-box" v-if="activityPolicePopupData.label != 'none'">
+
+ <div class="data-box"
+ v-if="activityPolicePopupData.label != 'none' && activityPolicePopupData.billboard == false">
<div class="line">
<div class="name">警车编号：</div>
<div class="value">{{ activityPolicePopupData.label }}</div>
@@ -39,9 +41,14 @@
<div class="name">所属辖区：</div>
<div class="value"> {{ activityPolicePopupData.deptName }}</div>
</div>
+ <div class="line">
+ <div class="value"> {{ activityPolicePopupData.Data.data.remark.trim() == '' ? '暂无描述' :
+ activityPolicePopupData.Data.data.remark }}</div>
+ </div>
</div>
- <div class="data-box" v-if="activityPolicePopupData.policeStationName != 'none'">
+ <div class="data-box"
+ v-if="activityPolicePopupData.policeStationName != 'none' && activityPolicePopupData.billboard == false">
<div class="line">
<div class="name">警员姓名：</div>
<div class="value"> {{ activityPolicePopupData.policeData.name }}</div>
@@ -66,8 +73,18 @@
<div class="name">所属辖区：</div>
<div class="value"> {{ activityPolicePopupData.policeData.deptName }}</div>
</div>
+ <div class="line">
+ <div class="value"> {{ activityPolicePopupData.Data.data.remark.trim() == '' ? '暂无描述' :
+ activityPolicePopupData.Data.data.remark }}</div>
+ </div>
</div>
+ <div class="data-box" v-if="activityPolicePopupData.billboard == true">
+ <div class="line">
+ <div class="value"> {{ activityPolicePopupData.Data.item.remark.trim() == '' ? '暂无描述' :
+ activityPolicePopupData.Data.item.remark }}</div>
+ </div>
+ </div>
</div>
</div>
</div>
@@ -124,8 +141,6 @@
}
.content {
- width: 220px;
- height: 130px;
background: $bg-color;
border-radius: 4px;
color: #fff;
@@ -138,7 +153,6 @@
justify-self: start;
.name {
- width: 90px;
text-align: justify;
}
}
--
Gitblit v1.9.3