打点bug修复

.env.development

@@ -6,6 +6,7 @@ VITE_APP_ENV = 'development'
 
 # 开发环境
 VITE_APP_BASE_API = 'http://10.181.7.235'
+VITE_APP_BASE_API2 = 'http://10.181.7.235/'
 
 # 应用访问路径 例如使用前缀 /admin/
 VITE_APP_CONTEXT_PATH = '/'

.env.production

@@ -14,7 +14,7 @@ VITE_APP_MONITOR_ADMIN = '/admin/applications'
 VITE_APP_SNAILJOB_ADMIN = '/snail-job'
 
 # 生产环境
-VITE_APP_BASE_API = 'http://10.181.7.235'
+VITE_APP_BASE_API = '/'
 VITE_APP_BASE_API2 = '/'
 
 # 是否在打包时开启压缩，支持 gzip 和 brotli

src/types/components.d.ts

@@ -17,54 +17,35 @@ 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']
     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']
     ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
-    ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
-    ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
-    ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
-    ElLink: typeof import('element-plus/es')['ElLink']
     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']
-    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']
-    ElTag: typeof import('element-plus/es')['ElTag']
     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']
-    ElUpload: typeof import('element-plus/es')['ElUpload']
     FileUpload: typeof import('./../components/FileUpload/index.vue')['default']
     FooterSection: typeof import('./../components/FooterSection/index.vue')['default']
     Hamburger: typeof import('./../components/Hamburger/index.vue')['default']
@@ -107,7 +88,4 @@ declare module 'vue' {
     YMapold: typeof import('./../components/Map/YMapold.vue')['default']
     YztMap: typeof import('./../components/Map/YztMap/index.vue')['default']
   }
-  export interface ComponentCustomProperties {
-    vLoading: typeof import('element-plus/es')['ElLoadingDirective']
-  }
 }

src/views/globalMap/data/mapData.ts

@@ -4111,22 +4111,31 @@ export const logicalData = {
     ]
   ]
 };
-
+import expertImg from '@/assets/images/dotIcon/1_expert.png';
+import rescueSuppliesImg from '@/assets/images/dotIcon/2_rescue_supplies.png';
+import easyFloodPointImg from '@/assets/images/dotIcon/4_easy_flood_point.png';
+import hospitalImg from '@/assets/images/dotIcon/6_hospital.png';
+import gasStationImg from '@/assets/images/dotIcon/7_gas_station.png';
+import schoolImg from '@/assets/images/dotIcon/5_school.png';
+import nonCoalMineImg from '@/assets/images/dotIcon/8_non_coal_mine.png';
+import enterprisesImg from '@/assets/images/dotIcon/9_hazardous_chemical_enterprises.png';
+import shipDynamicsImg from '@/assets/images/dotIcon/10_ship_dynamics.png';
+import UAVImg from '@/assets/images/dotIcon/15_UAV.png';
 export const iconList = {
   '1': {
-    image: 'src/assets/images/dotIcon/1_expert.png',
+    image: expertImg,
     size: [40, 40]
   },
   '2': {
-    image: 'src/assets/images/dotIcon/2_rescue_supplies.png',
+    image: rescueSuppliesImg,
     size: [40, 40]
   },
   '3': {
     image: 'https://webapi.amap.com/theme/v1.3/markers/n/mark_b.png',
-    size: [40, 40]
+    size: [19, 31]
   },
   '4': {
-    image: 'src/assets/images/dotIcon/4_easy_flood_point.png',
+    image: easyFloodPointImg,
     size: [40, 40]
   },
   'common': {
@@ -4134,50 +4143,49 @@ export const iconList = {
     size: [19, 31]
   },
   '5': {
-    image: 'src/assets/images/dotIcon/5_school.png',
+    image: schoolImg,
     size: [40, 40]
   },
   '6': {
-    image: 'src/assets/images/dotIcon/6_hospital.png',
+    image: hospitalImg,
     size: [40, 40]
   },
   '7': {
-    image: 'src/assets/images/dotIcon/7_gas_station.png',
+    image: gasStationImg,
     size: [40, 40]
   },
   '8': {
-    image: 'src/assets/images/dotIcon/8_non_coal_mine.png',
+    image: nonCoalMineImg,
     size: [40, 40]
   },
   '9': {
-    image: 'src/assets/images/dotIcon/9_hazardous_chemical_enterprises.png',
+    image: enterprisesImg,
     size: [40, 40]
   },
   '10': {
-    image: 'src/assets/images/dotIcon/10_ship_dynamics.png',
+    image: shipDynamicsImg,
     size: [40, 40]
   },
   '11': {
-    image: 'src/assets/images/dotIcon/9_hazardous_chemical_enterprises.png',
+    image: enterprisesImg,
     size: [40, 40]
   },
   '12': {
-    image: 'src/assets/images/dotIcon/9_hazardous_chemical_enterprises.png',
+    image: enterprisesImg,
     size: [40, 40]
   },
   '13': {
-    image: 'src/assets/images/dotIcon/9_hazardous_chemical_enterprises.png',
+    image: enterprisesImg,
     size: [40, 40]
   },
   '14': {
-    image: 'src/assets/images/dotIcon/9_hazardous_chemical_enterprises.png',
+    image: enterprisesImg,
     size: [40, 40]
   },
   '15': {
-    image: 'src/assets/images/dotIcon/15_UAV.png',
+    image: UAVImg,
     size: [40, 40]
-  },
-
+  }
 };
 
 export const pointDetailTemplate = {