电子灾害、全局搜索

src/api/globalMap/index.ts

@@ -82,9 +82,9 @@ export const getEmergencyExpertNameLike = (params) => {
 // 全局模糊搜索
 export const getPointInfoComprehensiveSearch = (params) => {
   return request({
-    url: '/api/gateway/v1/get_point_info_comprehensive_search',
-    method: 'post',
-    data: params
+    url: '/api/comprehensive/search/info',
+    method: 'get',
+    params: params
   });
 };
 

src/views/censusDataAnalysis/MeteorologicalCalamity/data.ts

@@ -62,6 +62,11 @@ export const iconList = {
     imageHover: getImageUrl('surfacecollapse'),
     size: [43, 44]
   },
+  '13': {
+    image: getImageUrl('surfacesubsidence'),
+    imageHover: getImageUrl('surfacesubsidence'),
+    size: [43, 44]
+  },
   '13': {
     image: getImageUrl('surfacesubsidence'),
     imageHover: getImageUrl('surfacesubsidence'),

src/views/globalMap/LeftMenu.vue

@@ -37,7 +37,7 @@
                 style="margin-top: 5px"
                 @click="selectSearchMarker(item)"
               >
-                <div class="tag">{{ item.tag }}</div>
+                <div class="tag">{{ item.dict_label }}</div>
                 <div class="text1" :title="item.name">{{ item.name }}</div>
               </div>
               <div v-show="searchState.showList && searchState.layerList.length === 0" style="text-align: center">无数据</div>
@@ -136,6 +136,7 @@
 <script lang="ts" setup>
 import { getPointInfoComprehensiveSearch } from '@/api/globalMap';
 import { listMenu2 } from '@/api/system/menu';
+import { deepClone } from '@/utils';
 
 const emits = defineEmits(['switchMap', 'clickMenu', 'selectSearchMarker']);
 // 左侧菜单
@@ -157,47 +158,12 @@ const changeSearchText = () => {
   } else {
     console.log('搜索值：', searchState.searchText);
     getPointInfoComprehensiveSearch({
-      page: 1,
-      limit: 10,
-      keywords: searchState.searchText
+      keyword: searchState.searchText
     }).then((res) => {
       searchState.showList = true;
-      searchState.resultList = res.data.list;
-      searchState.layerList = res.data.layerList;
-      searchState.videoList = res.data.videoList;
-      // searchState.layerList = [
-      //   {
-      //     'name': '茂名市石化医院',
-      //     'id': '3',
-      //     'dataType': 6,
-      //     'longitude': '110.820184',
-      //     'latitude': '21.60546',
-      //     'type': '2',
-      //     tag: '医院'
-      //   },
-      //   {
-      //     'name': '茂名市人民医院',
-      //     'id': '1',
-      //     'dataType': 6,
-      //     'longitude': '110.838689',
-      //     'latitude': '21.56834',
-      //     'type': '2',
-      //     tag: '医院'
-      //   }
-      // ];
-      // searchState.videoList = [
-      //   {
-      //     name: '01083.159乡道石鳌塘村交汇路口.X320',
-      //     address: '44092251001320000110',
-      //     area: '茂名市视频数据共享管理平台/茂名市公安局/1市局直属/官渡派出所',
-      //     area_name: '市辖区',
-      //     longitude: 110.92495,
-      //     latitude: 21.67629167,
-      //     status: '在线',
-      //     video_code: '44092251001320000110',
-      //     tags: [{ name: '路网视频' }, { name: '森林防火' }]
-      //   }
-      // ];
+      searchState.resultList = res.data.add_data;
+      searchState.layerList = res.data.point_data;
+      searchState.videoList = res.data.video_data;
     });
   }
 };
@@ -287,7 +253,9 @@ const setChild = (data, item, flag) => {
 const handleShowDialog = (row) => {
   showDialog.value = false;
   nextTick(() => {
-    videoMonitorData.value = row;
+    const data = deepClone(row);
+    data.video_code = data.id;
+    videoMonitorData.value = data;
     showDialog.value = true;
   });
 };

src/views/globalMap/data/mapData.ts

@@ -4265,6 +4265,26 @@ export const iconList = {
     imageHover: getImageUrl('29_emergencyofficer_hover.png'),
     size: [60, 60]
   },
+  '35': {
+    image: getImageUrl('35_rescueStation.png'),
+    imageHover: getImageUrl('35_rescueStation_hover.png'),
+    size: [60, 60]
+  },
+  '37': {
+    image: getImageUrl('37_civilAirDefenseEngineering.png'),
+    imageHover: getImageUrl('37_civilAirDefenseEngineering_hover.png'),
+    size: [60, 60]
+  },
+  '38': {
+    image: getImageUrl('38_waterConservancyProject.png'),
+    imageHover: getImageUrl('38_waterConservancyProject_hover.png'),
+    size: [60, 60]
+  },
+  '39': {
+    image: getImageUrl('39_rescueStation.png'),
+    imageHover: getImageUrl('39_rescueStation_hover.png'),
+    size: [60, 60]
+  }
 };
 
 export const pointDetailTemplate = {