From fb62da02ec5aface8728f17d1b8d4314049e7d3d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 01 Apr 2023 11:01:54 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/srs-police-affairs

---
 src/views/home/components/bottomContainer.vue |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/home/components/bottomContainer.vue b/src/views/home/components/bottomContainer.vue
index cfc1603..9695198 100644
--- a/src/views/home/components/bottomContainer.vue
+++ b/src/views/home/components/bottomContainer.vue
@@ -71,7 +71,7 @@
                             <span class="call-police-content" :title="item.BJNR" v-text="item.BJNR"></span>
                             <span class="incident-site" :title="item.SFDZ" v-text="item.SFDZ"></span>
                             <span class="call-police-type" v-text="item.BJLX"></span>
-                            <span class="have-position" v-text="item.isHavePosition"></span>
+                            <span class="have-position" v-text="item.position"></span>
                             <span class="alarm-bz" v-text="item.MEMO"></span>
                         </li>
                     </ul>
@@ -427,7 +427,7 @@
             }]
 
             this.policeSituationRealtimeArr = this.policeSituationRealtimeArr.map((item, index) => {
-                return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB }
+                return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB ? '有' : '无' }
             })
 
             this.$emit('policeSituationChange')

--
Gitblit v1.9.3