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/activityPolicePopup.vue |   96 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 72 insertions(+), 24 deletions(-)

diff --git a/src/components/map/components/activityPolicePopup.vue b/src/components/map/components/activityPolicePopup.vue
index 287bbb3..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-02 10:16:14
+ * @LastEditTime: 2023-04-13 16:43:57
  * @FilePath: \srs-police-affairs\src\components\map\components\activityPolicePopup.vue
  * @Description: 
  * 
@@ -14,28 +14,77 @@
             <div style="transform: translate(-50%, 0);">
                 <!-- 样式自己修改 -->
                 <div class="content" :class="{ 'scale-dom': scaleDomFlag }">
-                    <div class="data-box" v-if="activityPolicePopupData.label !='none'">
-                          <div class="line">
+
+                    <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>
-                          </div>
-                          <div class="line">
+                        </div>
+                        <div class="line">
                             <div class="name">警车型号:</div>
                             <div class="value"> {{ activityPolicePopupData.carType }}</div>
-                          </div>
+                        </div>
+                        <div class="line">
+                            <div class="name">车牌号:</div>
+                            <div class="value"> {{ activityPolicePopupData.carNo }}</div>
+                        </div>
+                        <div class="line">
+                            <div class="name">单位名称:</div>
+                            <div class="value"> {{ activityPolicePopupData.unitName }}</div>
+                        </div>
+                        <div class="line">
+                            <div class="name">单位编号:</div>
+                            <div class="value"> {{ activityPolicePopupData.unitCode }}</div>
+                        </div>
+                        <div class="line">
+                            <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="line">
-                            <div class="name">所属派出所:</div>
-                            <div class="value">{{ activityPolicePopupData.policeStationName }}</div>
-                          </div>
-                          <div class="line">
+
+                    <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>
-                          </div>
+                            <div class="value"> {{ activityPolicePopupData.policeData.name }}</div>
+                        </div>
+                        <div class="line">
+                            <div class="name">警员编号:</div>
+                            <div class="value"> {{ activityPolicePopupData.policeData.serialNumber }}</div>
+                        </div>
+                        <div class="line">
+                            <div class="name">联系电话:</div>
+                            <div class="value"> {{ activityPolicePopupData.policeData.contact }}</div>
+                        </div>
+                        <div class="line">
+                            <div class="name">单位名称:</div>
+                            <div class="value">{{ activityPolicePopupData.policeStationName }}</div>
+                        </div>
+                        <div class="line">
+                            <div class="name">单位编号:</div>
+                            <div class="value"> {{ activityPolicePopupData.policeData.unitCode }}</div>
+                        </div>
+                        <div class="line">
+                            <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>
@@ -92,24 +141,23 @@
     }
 
     .content {
-        width: 200px;
-        height: 60px;
         background: $bg-color;
         border-radius: 4px;
         color: #fff;
 
-        .data-box{
+        .data-box {
             padding: 10px;
+
             .line {
                 display: flex;
                 justify-self: start;
-            .name{
-                width: 90px;
-                text-align: justify;
+
+                .name {
+                    text-align: justify;
+                }
             }
         }
     }
-        }
-        
+
 }
 </style>
\ No newline at end of file

--
Gitblit v1.9.3