info调整

src/components/Map/map.scss

@@ -1,6 +1,5 @@
 @use "sass:math";
-$vw_base: 8960;
-$vh_base: 2520;
+$vw_base: 4480;
 
 @function vw($px) {
   @return math.div($px, $vw_base) * 100vw;
@@ -25,7 +24,7 @@ $vh_base: 2520;
     overflow-y: auto;
     width: 100%;
     &::-webkit-scrollbar {
-      width: vw(6);
+      width: vw(12);
     }
   }
   .table {
@@ -75,8 +74,8 @@ $vh_base: 2520;
     position: absolute;
     top: vw(20);
     right: vw(60);
-    width: vw(32);
-    height: vw(32);
+    width: vw(54);
+    height: vw(54);
     background: url('@/assets/images/close.png') no-repeat;
     background-size: 100% 100%;
     cursor: pointer;

src/hooks/AMap/useAMap.ts

@@ -208,9 +208,13 @@ export function useAMap(options) {
     // 打开InfoWindow，并设置其内容和位置
     infoWindow.setContent(content);
     infoWindow.open(map, lnglat);
+    // 解决2.0版本无法滚动问题
+    infoWindow.on('mouseover', () => map.setStatus({ zoomEnable: false }));
+    infoWindow.on('mouseout', () => map.setStatus({ zoomEnable: true }));
   };
 
   const hideInfo = (e) => {
+    map.setStatus({ zoomEnable: true });
     if (!!infoWindow) {
       infoWindow.close();
       if (!!clickMarker && e) {

src/types/components.d.ts

@@ -19,23 +19,13 @@ declare module 'vue' {
     Dialog: typeof import('./../components/Dialog/index.vue')['default']
     DictTag: typeof import('./../components/DictTag/index.vue')['default']
     Editor: typeof import('./../components/Editor/index.vue')['default']
-    ElAnchor: typeof import('element-plus/es')['ElAnchor']
-    ElAnchorLink: typeof import('element-plus/es')['ElAnchorLink']
     ElAutocomplete: typeof import('element-plus/es')['ElAutocomplete']
     ElBadge: typeof import('element-plus/es')['ElBadge']
     ElButton: typeof import('element-plus/es')['ElButton']
-    ElCard: typeof import('element-plus/es')['ElCard']
-    ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
-    ElCollapse: typeof import('element-plus/es')['ElCollapse']
-    ElCollapseItem: typeof import('element-plus/es')['ElCollapseItem']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
-    ElContainer: typeof import('element-plus/es')['ElContainer']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
-    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
@@ -45,44 +35,26 @@ declare module 'vue' {
     ElEmpty: typeof import('element-plus/es')['ElEmpty']
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
-    ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
-    ElMain: typeof import('element-plus/es')['ElMain']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     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']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
-    ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
-    ElSegmented: typeof import('element-plus/es')['ElSegmented']
     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']
-    ElSpace: typeof import('element-plus/es')['ElSpace']
-    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']
     ElTag: typeof import('element-plus/es')['ElTag']
     ElText: typeof import('element-plus/es')['ElText']
     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']
     ExcelEditor: typeof import('./../components/ExcelEditor/index.vue')['default']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
@@ -94,9 +66,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']
-    IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
-    IEpCaretTop: typeof import('~icons/ep/caret-top')['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']

src/views/globalMap/data/mapData.ts

@@ -4125,22 +4125,22 @@ export const iconList = {
   '1': {
     image: getImageUrl('1_expert.png'),
     imageHover: getImageUrl('1_expert_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '2': {
     image: getImageUrl('2_rescue_supplies.png'),
     imageHover: getImageUrl('2_rescue_supplies_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '3': {
     image: getImageUrl('3_emergency_shelter.png'),
     imageHover: getImageUrl('3_emergency_shelter_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '4': {
     image: getImageUrl('4_easy_flood_point.png'),
     imageHover: getImageUrl('4_easy_flood_point_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   'common': {
     image: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_b.png',
@@ -4150,127 +4150,127 @@ export const iconList = {
   '5': {
     image: getImageUrl('5_school.png'),
     imageHover: getImageUrl('5_school_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '6': {
     image: getImageUrl('6_hospital.png'),
     imageHover: getImageUrl('6_hospital_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '7': {
     image: getImageUrl('7_gas_station.png'),
     imageHover: getImageUrl('7_gas_station_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '8': {
     image: getImageUrl('8_non_coal_mine.png'),
     imageHover: getImageUrl('8_non_coal_mine_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '9': {
     image: getImageUrl('9_hazardous_chemical_enterprises.png'),
     imageHover: getImageUrl('9_hazardous_chemical_enterprises_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '10': {
     image: getImageUrl('10_ship_dynamics.png'),
     imageHover: getImageUrl('10_ship_dynamics_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '11': {
     image: getImageUrl('9_hazardous_chemical_enterprises.png'),
     imageHover: getImageUrl('9_hazardous_chemical_enterprises_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '12': {
     image: getImageUrl('9_hazardous_chemical_enterprises.png'),
     imageHover: getImageUrl('9_hazardous_chemical_enterprises_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '13': {
     image: getImageUrl('9_hazardous_chemical_enterprises.png'),
     imageHover: getImageUrl('9_hazardous_chemical_enterprises_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '14': {
     image: getImageUrl('9_hazardous_chemical_enterprises.png'),
     imageHover: getImageUrl('9_hazardous_chemical_enterprises_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '15': {
     image: getImageUrl('15_UAV.png'),
     imageHover: getImageUrl('15_UAV_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '16': {
     image: getImageUrl('16_rainbow.png'),
     imageHover: getImageUrl('16_rainbow_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '17': {
     image: getImageUrl('17_midmapdzzh.png'),
     imageHover: getImageUrl('17_midmapdzzh_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '18': {
     image: getImageUrl('18_miningoperations.png'),
     imageHover: getImageUrl('18_miningoperations_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '19': {
     image: getImageUrl('19_commercialtrade.png'),
     imageHover: getImageUrl('19_commercialtrade_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '20': {
     image: getImageUrl('20_meteorological_disaster.png'),
     imageHover: getImageUrl('20_meteorological_disaster_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '21': {
     image: getImageUrl('21_buildingproject.png'),
     imageHover: getImageUrl('21_buildingproject_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '22': {
     image: getImageUrl('22_storage_tank.png'),
     imageHover: getImageUrl('22_storage_tank_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '23': {
     image: getImageUrl('22_storage_tank.png'),
     imageHover: getImageUrl('22_storage_tank_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '24': {
     image: getImageUrl('24_stationinfo.png'),
     imageHover: getImageUrl('24_stationinfo_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '25': {
     image: getImageUrl('25_yardsites.png'),
     imageHover: getImageUrl('25_yardsites_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '26': {
     image: getImageUrl('26_tourist_destinations.png'),
     imageHover: getImageUrl('26_tourist_destinations_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '27': {
     image: getImageUrl('27_constructionsites.png'),
     imageHover: getImageUrl('27_constructionsites_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '28': {
     image: getImageUrl('28_emergencytransportresources.png'),
     imageHover: getImageUrl('28_emergencytransportresources_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
   '29': {
     image: getImageUrl('29_emergencyofficer.png'),
     imageHover: getImageUrl('29_emergencyofficer_hover.png'),
-    size: [40, 40]
+    size: [60, 60]
   },
 };