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

# Conflicts:
#	src/types/components.d.ts

src/types/components.d.ts

@@ -20,7 +20,6 @@ declare module 'vue' {
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
@@ -42,28 +41,20 @@ declare module 'vue' {
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
-    ElPopover: typeof import('element-plus/es')['ElPopover']
-    ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
     ElSelect: typeof import('element-plus/es')['ElSelect']
     ElSkeleton: typeof import('element-plus/es')['ElSkeleton']
     ElSkeletonItem: typeof import('element-plus/es')['ElSkeletonItem']
     ElSlider: typeof import('element-plus/es')['ElSlider']
-    ElStep: typeof import('element-plus/es')['ElStep']
-    ElSteps: typeof import('element-plus/es')['ElSteps']
     ElSubMenu: typeof import('element-plus/es')['ElSubMenu']
     ElSwitch: typeof import('element-plus/es')['ElSwitch']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
-    ElTabPane: typeof import('element-plus/es')['ElTabPane']
-    ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTimeline: typeof import('element-plus/es')['ElTimeline']
     ElTimelineItem: typeof import('element-plus/es')['ElTimelineItem']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
-    ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
     ElUpload: typeof import('element-plus/es')['ElUpload']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
     FooterSection: typeof import('./../components/FooterSection/index.vue')['default']
@@ -74,7 +65,6 @@ declare module 'vue' {
     HikvisionPlayer: typeof import('./../components/HKVideo/hikvision-player.vue')['default']
     HKVideo: typeof import('./../components/HKVideo/index.vue')['default']
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
@@ -97,7 +87,6 @@ declare module 'vue' {
     Screenfull: typeof import('./../components/Screenfull/index.vue')['default']
     ScrollTable: typeof import('./../components/ScrollTable/index.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']
     SvgIcon: typeof import('./../components/SvgIcon/index.vue')['default']
     TimeAxis: typeof import('./../components/TimeAxis/index.vue')['default']
@@ -107,7 +96,6 @@ declare module 'vue' {
     VideoContainer: typeof import('./../components/HKVideo/video-container.vue')['default']
     VideoContainer2: typeof import('./../components/HKVideo/video-container2.vue')['default']
     YMap: typeof import('./../components/Map/YMap.vue')['default']
-    YMapold: typeof import('./../components/Map/YMapold.vue')['default']
     YztMap: typeof import('./../components/Map/YztMap/index.vue')['default']
   }
   export interface ComponentCustomProperties {

src/views/globalMap/data/mapData.ts

@@ -4203,9 +4203,34 @@ export const iconList = {
     size: [40, 40]
   },
   '16': {
-    image: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_b.png',
-    imageHover: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_b.png',
-    size: [19, 31]
+    image: getImageUrl('16_rainbow.png'),
+    imageHover: getImageUrl('16_rainbow_hover.png'),
+    size: [40, 40]
+  },
+  '18': {
+    image: getImageUrl('18_miningoperations.png'),
+    imageHover: getImageUrl('18_miningoperations_hover.png'),
+    size: [40, 40]
+  },
+  '19': {
+    image: getImageUrl('19_commercialtrade.png'),
+    imageHover: getImageUrl('19_commercialtrade_hover.png'),
+    size: [40, 40]
+  },
+  '21': {
+    image: getImageUrl('21_buildingproject.png'),
+    imageHover: getImageUrl('21_buildingproject_hover.png'),
+    size: [40, 40]
+  },
+  '22': {
+    image: getImageUrl('22_storage_tank.png'),
+    imageHover: getImageUrl('22_storage_tank_hover.png'),
+    size: [40, 40]
+  },
+  '23': {
+    image: getImageUrl('22_storage_tank.png'),
+    imageHover: getImageUrl('22_storage_tank_hover.png'),
+    size: [40, 40]
   },
   '24': {
     image: getImageUrl('24_stationinfo.png'),
@@ -4222,6 +4247,16 @@ export const iconList = {
     imageHover: getImageUrl('26_tourist_destinations_hover.png'),
     size: [40, 40]
   },
+  '27': {
+    image: getImageUrl('27_constructionsites.png'),
+    imageHover: getImageUrl('27_constructionsites_hover.png'),
+    size: [40, 40]
+  },
+  '28': {
+    image: getImageUrl('28_emergencytransportresources.png'),
+    imageHover: getImageUrl('28_emergencytransportresources_hover.png'),
+    size: [40, 40]
+  },
 };
 
 export const pointDetailTemplate = {