Browse Source

事件管理列表

Hwf 7 months ago
parent
commit
11b1c573f1

+ 1 - 1
src/components/Map/index.vue

@@ -94,7 +94,7 @@ const { getAMap, getMap, switchMap, addMarker, addSearchMarker, clearMarker, get
     drawTool.initMouseTool({ container: 'aMap', map, AMap });
     handleResize();
   },
-  onMarkerClick: (data, e) => {
+  onMarkerClick: (data) => {
     // 多点位
     if (data.type === '1') {
       let path = [];

+ 9 - 0
src/views/globalMap/index.vue

@@ -165,6 +165,14 @@ const getDrawTool = () => {
   }
   return {};
 };
+const getMarkers = () => {
+  if (['satellite2', 'satellite3'].includes(activeMap.value)) {
+    return map2Ref.value.getMarkers();
+  } else if (['vectorgraph', 'satellite'].includes(activeMap.value)) {
+    return mapRef.value.getMarkers();
+  }
+  return {};
+};
 let showNearbyVideos = ref(false);
 let location = reactive([]);
 // 显示附近视频
@@ -181,6 +189,7 @@ const handleShowVideo = (data) => {
 
 provide('getMap', getMap);
 provide('getDrawTool', getDrawTool);
+provide('getMarkers', getMarkers);
 </script>
 
 <style lang="scss" scoped>

+ 3 - 5
src/views/routineCommandMap/LeftSection/EventManage.vue

@@ -118,8 +118,7 @@
       <div v-for="(item, index) in eventList" :key="index" class="tr">
         <div class="td">{{ item.event_id }}</div>
         <div class="td">{{ item.event_title }}</div>
-<!--        <div class="td">{{ item.event_type }}</div>-->
-        <div v-if="item.event_type === '0' || item.event_type === '1' || item.event_type === '2' || item.event_type === '3'" class="flex">
+        <div class="td">
           <template v-if="item.event_type === '0'">
             <div>自然灾害</div>
           </template>
@@ -133,8 +132,7 @@
             <div>社会安全事件</div>
           </template>
         </div>
-<!--        <div class="td">{{ item.event_level }}</div>-->
-        <div v-if="item.event_level === '0' || item.event_level === '1' || item.event_level === '2' || item.event_level === '3' || item.event_level === '4'" class="flex">
+        <div class="td">
           <template v-if="item.event_level === '0'">
             <div>其他</div>
           </template>
@@ -152,7 +150,7 @@
           </template>
         </div>
         <div class="td">{{ item.address }}</div>
-        <div v-if="item.event_status === '0' || item.event_status === '1' || item.event_status === '2' || item.event_status === '3'" class="flex">
+        <div class="td">
           <template v-if="item.event_status === '0'">
             <div>已登记</div>
           </template>