Merge remote-tracking branch 'origin/visu_emergency_01_siping_2.5d' into visu_emergency_01_siping_2.5d

src/components/eventLocation.vue

@@ -28,9 +28,21 @@
                          @click="dropLocation(item.latitude,item.longitude)">
                       <div class="bgt-img">
                         <img v-if="item.picturePath!=null&&item.picturePath!=''" :src="item.picturePath"
-                             style="width: 93px;height: 64px"/>
+                             style="width: 93px;height: 64px" />
+                        <img v-else-if="item.eventType == '510'" src="../assets/images/水压.png"
+                             style="width: 93px;height: 64px" />
+                        <img v-else-if="item.eventType == '510'" src="../assets/images/水尺.png"
+                             style="width: 93px;height: 64px" />
+                        <img v-else-if="item.eventType == '511'" src="../assets/images/水流速.png"
+                             style="width: 93px;height: 64px" />
+                        <img v-else-if="item.eventType == '403'" src="../assets/images/土壤墒情监测.png"
+                             style="width: 93px;hei 64px" />
+                        <img v-else-if="item.eventType == '601'" src="../assets/images/大气监测.png"
+                             style="width: 93px;height: 64px" />
+                        <img v-else-if="item.eventType == '602'" src="../assets/images/水质监测.png"
+                             style="width: 93px;height: 64px" />
                         <img v-else src="../assets/images/integrated/event-img-sub.png"
-                             style="width: 93px;height: 64px"/>
+                             style="width: 93px;height: 64px" />
                       </div>
                       <div class="bgt-info">
                         <div v-if="item.eventStatusValue=='forest_event_status_1'&&item.urgeCount==0"

src/main.js

@@ -22,16 +22,20 @@ import '@/assets/styles/font.scss';//字体引入
 // 字典数据组件
 import DictData from '@/components/DictData'
 
+// 图片上传组件
+import ImageUpload from "@/components/ImageUpload"
 import './assets/icons' // icon
 import './permission' // permission control
 
 //DataV动效组件
 import dataV from '@jiaminghi/data-view'
-// 图片上传组件
-import ImageUpload from "@/components/ImageUpload"
-//公共过滤器
-import './filters'
 
+//全局混入 mixin
+import {mixinMapTip} from './mixin'
+Vue.mixin(mixinMapTip);
+
+//公共过滤器 
+import './filters'
 // //WebSocket封装方法
 // import * as socketApi from '@/api/socket'
 // Vue.prototype.socketApi = socketApi

src/mixin.js

@@ -0,0 +1,21 @@
+// 全局混入map上的tip气泡点击除地图外的区域也进行隐藏
+export const mixinMapTip = {
+    mounted() {
+        this.$nextTick(() => {
+            this.closedMapTip();
+        })       
+    },
+    methods: {
+        closedMapTip() {
+            if(this.$refs.supermap){
+                document.addEventListener("click", (e) => {
+                    let a = this.$refs.supermap.$el;
+                    if (this.$refs.supermap.mapshow && !a.contains(e.target)) {
+                        this.$refs.supermap.mapshow = false;
+                    }
+                });
+            }
+          
+        },
+    }   
+}

src/views/forest.vue

@@ -1205,16 +1205,18 @@ export default {
       if (data.tag == "eventPush" && that.markersList.filter(item => data.eventCode == item.parameter).length == 0) {
         getEventPush({ eventCode: data.eventCode }).then((res) => {
           if (res.data != undefined) {
-            if(res.data.eventType == 403){
-              res.data.picturePath = "../assets/images/土壤墒情监测.png"
+            if (res.data.eventStatusValue !== "forest_event_status_1") {
+              if (res.data.eventType == 403) {
+                res.data.picturePath = "../assets/images/土壤墒情监测.png"
+              }
+              //插入到第一条
+              this.eventList.unshift(res.data)
+              // 插入后删除最后一条 保证列表中为10条数据
+              if (this.eventList.length > 9)
+                this.eventList.splice(10, 1)
+              // 将收到的数据在地图上添加
+              this.getWebSocketEvent(res.data)
             }
-            //插入到第一条
-            this.eventList.unshift(res.data)
-            // 插入后删除最后一条 保证列表中为10条数据
-            if (this.eventList.length > 9)
-              this.eventList.splice(10, 1)
-            // 将收到的数据在地图上添加
-            this.getWebSocketEvent(res.data)
           }
         })
       }