Explorar el Código

[Fix 0000] 首页地图CAD图缩放后白边问题修复

houzekong hace 1 mes
padre
commit
780af714e7
Se han modificado 2 ficheros con 11 adiciones y 15 borrados
  1. 2 7
      src/layouts/default/feature/SimpleMap.vue
  2. 9 8
      src/views/system/cadFile/app.ts

+ 2 - 7
src/layouts/default/feature/SimpleMap.vue

@@ -1,11 +1,5 @@
 <template>
-  <div
-    ref="mapContainer"
-    class="map-container"
-    :style="{
-      transform: `scale(${1 / appStore.getWidthScale}, ${1 / appStore.getHeightScale})`,
-    }"
-  ></div>
+  <div ref="mapContainer" class="map-container"></div>
   <div v-if="!isTopLevel" class="map-reset-btn">
     <Button :loading="mapLoading" type="primary" @click="revertStack">返回上级</Button>
   </div>
@@ -188,6 +182,7 @@
       minZoom: 1,
       center: [DEFAULT_NODE.longitude, DEFAULT_NODE.latitude],
       zoom: DEFAULT_NODE.zoom,
+      trackResize: false,
       // style: svc.rasterStyle('https://webrd01.is.autonavi.com/appmaptile?lang=zh_cn&size=1&scale=1&style=7&x={x}&y={y}&z={z}'),
       style: `${window.location.origin}/js/shanxi.map.json`,
     });

+ 9 - 8
src/views/system/cadFile/app.ts

@@ -76,6 +76,7 @@ export const initMap2d = async (container: HTMLElement, config: { fileUrl?: stri
     zoom: 11, // 设置地图缩放级别
     // zoom: 1, // 设置地图缩放级别
     pitch: 0,
+    trackResize: false,
     antialias: true, // 反锯齿
     renderWorldCopies: false, // 不显示多屏地图
   });
@@ -440,11 +441,11 @@ const createMarkerElement = (goafItem: any, showInfo: boolean = false): HTMLDivE
     '3': '较高风险',
     '4': '高风险',
   };
-  
-  // 定义颜色映射,索引对应 alarmLevel - 1 
+
+  // 定义颜色映射,索引对应 alarmLevel - 1
   // StatusColorEnum.blue, gold, purple, red 分别对应 1, 2, 3, 4
   const alarmLevelColor = [StatusColorEnum.blue, StatusColorEnum.gold, StatusColorEnum.purple, StatusColorEnum.red];
-  
+
   // const customImage = `/src/assets/icons/location-icon.svg`;
   // const customImage3D = `/src/assets/icons/location-icon3D.png`;
   const el = document.createElement('div');
@@ -458,7 +459,7 @@ const createMarkerElement = (goafItem: any, showInfo: boolean = false): HTMLDivE
 
   // 获取当前等级对应的颜色
   const level = parseInt(goafItem.alarmLevel, 10);
-  const color = (level >= 1 && level <= 4) ? alarmLevelColor[level - 1] : '#333';
+  const color = level >= 1 && level <= 4 ? alarmLevelColor[level - 1] : '#333';
 
   if (showInfo) {
     const alarmLevelDiv = document.createElement('div');
@@ -469,22 +470,22 @@ const createMarkerElement = (goafItem: any, showInfo: boolean = false): HTMLDivE
       display: flex; /* 使用 flex 布局让文字并排 */
       align-items: center;
     `;
-    
+
     // 1. 创建固定文本节点 "风险等级:"
     const labelSpan = document.createElement('span');
     labelSpan.textContent = '风险等级:';
     labelSpan.style.color = '#333'; // 强制设置为深色/默认色
-    
+
     // 2. 创建动态文本节点 (应用动态颜色)
     const valueSpan = document.createElement('span');
     const riskText = riskMap[String(goafItem.alarmLevel)] || '正常';
     valueSpan.textContent = goafItem.alarmLevel ? riskText : '正常';
     valueSpan.style.color = color; // 应用动态颜色
-    
+
     // 组装
     alarmLevelDiv.appendChild(labelSpan);
     alarmLevelDiv.appendChild(valueSpan);
-    
+
     el.appendChild(alarmLevelDiv);
   }