Browse Source

Merge branch 'dev/lfh'

李富豪 1 year ago
parent
commit
1e9673260d
2 changed files with 4 additions and 4 deletions
  1. 2 2
      Web/env/.env.development
  2. 2 2
      Web/src/hooks/use-g-map-trajectory.ts

+ 2 - 2
Web/env/.env.development

@@ -2,7 +2,7 @@
 VITE_ENV = 'development'
 VITE_ENV = 'development'
 
 
 # Api 地址
 # Api 地址
-VITE_API_URL = 'http://192.168.3.218:6789'
+VITE_API_URL = 'http://192.168.3.89:6789'
 
 
 # WebSocket 地址
 # WebSocket 地址
-VITE_WEBSOCKET_URL = 'ws://192.168.3.218:6789/api/v1/ws'
+VITE_WEBSOCKET_URL = 'ws://192.168.3.89:6789/api/v1/ws'

+ 2 - 2
Web/src/hooks/use-g-map-trajectory.ts

@@ -37,7 +37,7 @@ export function useGMapTrajectory() {
       strokeWeight: 6,//线宽
       strokeWeight: 6,//线宽
       strokeStyle: 'solid',
       strokeStyle: 'solid',
     })
     })
-    const serialList = list.filter((item) => [2, 3].includes(item.type));
+    const serialList = list.filter((item) => item.show_point);
     // 序号
     // 序号
     const text = serialList.map((item, index) => {
     const text = serialList.map((item, index) => {
       return new AMap.Text({
       return new AMap.Text({
@@ -83,7 +83,7 @@ export function useGMapTrajectory() {
       });
       });
       distances.push(distanceText);
       distances.push(distanceText);
     }
     }
-    const other=[startMarker, polyline, ...text, ...circles, ...distances];
+    const other = [startMarker, polyline, ...text, ...circles, ...distances];
     root.$map.add(other);
     root.$map.add(other);
     // 自动缩放地图到合适的视野级别
     // 自动缩放地图到合适的视野级别
     root.$map.setFitView(other);
     root.$map.setFitView(other);