Merge remote-tracking branch 'origin/dev' into dev

src/types/components.d.ts

@@ -97,7 +97,6 @@ declare module 'vue' {
     RouterView: typeof import('vue-router')['RouterView']
     Screenfull: typeof import('./../components/Screenfull/index.vue')['default']
     ScrollTable: typeof import('./../components/ScrollTable/index.vue')['default']
-    ShareDialog: typeof import('./../components/Contact/ShareDialog.vue')['default']
     SizeSelect: typeof import('./../components/SizeSelect/index.vue')['default']
     Step: typeof import('./../components/Step/index.vue')['default']
     SubmitVerify: typeof import('./../components/Process/submitVerify.vue')['default']

src/views/globalMap/LeftMenu.vue

@@ -163,39 +163,41 @@ const changeSearchText = () => {
     }).then((res) => {
       searchState.showList = true;
       searchState.resultList = res.data.list;
-      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.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: '森林防火' }]
+      //   }
+      // ];
     });
   }
 };