From 8805d111644bc8eed2b5fc052d03856b40d7b394 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 09 Feb 2023 10:47:52 +0800
Subject: [PATCH] 设备通道号更换

---
 src/components/map/components/mapPopup.vue |   30 +++++++++++++++++++++++-------
 1 files changed, 23 insertions(+), 7 deletions(-)

diff --git a/src/components/map/components/mapPopup.vue b/src/components/map/components/mapPopup.vue
index 2f78d03..9f780b2 100644
--- a/src/components/map/components/mapPopup.vue
+++ b/src/components/map/components/mapPopup.vue
@@ -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>
@@ -119,6 +125,9 @@
 
 export default {
     name: 'mapPopup',
+
+    inject: ["getWidth", 'userInfo'],
+
     data () {
         return {
             currentBtn: '接警信息',
@@ -126,8 +135,6 @@
             scaleDomFlag: false
         }
     },
-
-    inject: ["getWidth"],
 
     computed: {
         ...mapGetters([
@@ -156,8 +163,11 @@
             this.currentBtn = type
 
             this.CJdata = {}
-            getActAsPoliceList(this.dataPopup.JJDBH, '').then(res => {
-                this.CJdata = res.data.data.records[0]
+
+            getActAsPoliceList(this.dataPopup.JJDBH, this.userInfo.dept_id).then(res => {
+                if (res.data.data.records.length > 0) {
+                    this.CJdata = res.data.data.records[0]
+                }
             })
         },
 
@@ -337,6 +347,12 @@
 
     }
 
+    .label-content.no-data {
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        min-height: 240px;
+    }
 }
 
 .divForms .title {

--
Gitblit v1.9.3