From e2f341b73943753e6ea96cf6d85a09ce070e2ee1 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Fri, 07 Apr 2023 10:46:03 +0800
Subject: [PATCH] 社区、电子沙盘

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

diff --git a/src/views/home/components/bottomContainer.vue b/src/views/home/components/bottomContainer.vue
index 28ada2c..b43171d 100644
--- a/src/views/home/components/bottomContainer.vue
+++ b/src/views/home/components/bottomContainer.vue
@@ -2,7 +2,7 @@
  * @Author: shuishen 1109946754@qq.com
  * @Date: 2023-01-13 15:52:59
  * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2023-04-06 17:52:48
+ * @LastEditTime: 2023-04-06 18:10:22
  * @FilePath: \srs-police-affairs\src\views\home\components\bottomContainer.vue
  * @Description: 
  * 
@@ -54,7 +54,7 @@
                 </ul>
 
                 <!-- <vue-seamless-scroll v-if="policeSituationRealtimeArr.length > 0" :data="policeSituationRealtimeArr"
-                                                                                                                                                                                                                                                                    class="warp" :class-option="classOption"> -->
+                                                                                                                                                                                                                                                                                    class="warp" :class-option="classOption"> -->
                 <div v-if="policeSituationRealtimeArr.length > 0" :data="policeSituationRealtimeArr" class="warp"
                     :class-option="classOption">
                     <el-carousel indicator-position="none" direction="vertical" @change="changeAlarm">
@@ -98,8 +98,8 @@
                     <el-table-column :show-overflow-tooltip="true" prop="BJLX" label="报警类型"></el-table-column>
                     <el-table-column :show-overflow-tooltip="true" prop="position" label="坐标" width="60">
                         <template slot-scope="scope">
-                            <el-button v-show="position == '有'" @click.stop="policeSituationClick(scope.row)" type="text"
-                                size="small" title="定位">
+                            <el-button v-show="scope.row.position == '有'" @click.stop="policeSituationClick(scope.row)"
+                                type="text" size="small" title="定位">
                                 <i class="el-icon-location" style="color: #1AFA29;"></i>
                             </el-button>
                         </template>
@@ -346,7 +346,7 @@
                         const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE || ''
 
                         if (item.JJDWMC.indexOf('上饶市公安局') != -1) item.JJDWMC = item.JJDWMC.replace(/上饶市公安局/, '市局')
-
+                        if (item.JJDWMC.indexOf('信州区分局') != -1) item.JJDWMC = item.JJDWMC.replace(/信州区分局/, '')
                         if (item.JJDWMC.indexOf('信州') != -1) item.JJDWMC = item.JJDWMC.replace(/信州/, '')
 
                         return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB && item.ZDDWYZB != 0 ? '有' : '无', BJLX: bjlxText }
@@ -483,7 +483,7 @@
                         const bjlxText = BjlxData.filter(i => item.BJLX == i.BJLX)[0].VALUE || ''
 
                         if (item.JJDWMC.indexOf('上饶市公安局') != -1) item.JJDWMC = item.JJDWMC.replace(/上饶市公安局/, '市局')
-
+                        if (item.JJDWMC.indexOf('信州区分局') != -1) item.JJDWMC = item.JJDWMC.replace(/信州区分局/, '')
                         if (item.JJDWMC.indexOf('信州') != -1) item.JJDWMC = item.JJDWMC.replace(/信州/, '')
 
                         return { ...item, index: index + 1, lng: item.ZDDWXZB, lat: item.ZDDWYZB, position: item.ZDDWYZB && item.ZDDWYZB != 0 ? '有' : '无', BJLX: bjlxText }

--
Gitblit v1.9.3