wenhongquan 3 жил өмнө
parent
commit
d722592ac5
3 өөрчлөгдсөн 43 нэмэгдсэн , 13 устгасан
  1. 8 0
      .env.zwy
  2. 2 1
      package.json
  3. 33 12
      src/store/useMarkerStore.ts

+ 8 - 0
.env.zwy

@@ -0,0 +1,8 @@
+# .env.zwy
+
+NODE_ENV = zwy
+
+VITE_API_SERVER = 'http://10.11.230.154:30009'
+VITE_MAP_SERVER = 'http://10.11.230.152:21009'
+VITE_LOGIN_SERVER = 'http://61.147.254.211:9999'
+VITE_DH_SERVER = 'http://sqtestdh.xt.wenhq.top:8083'

+ 2 - 1
package.json

@@ -6,6 +6,7 @@
         "dev": "vite serve --mode dev",
         "build": "vite build --mode test",
         "prod": "vite build --mode prod",
+        "zwy": "vite build --mode zwy",
         "lint": "eslint --fix --ext .ts,.tsx,.json src"
     },
     "dependencies": {
@@ -61,4 +62,4 @@
         "last 2 versions",
         "not dead"
     ]
-}
+}

+ 33 - 12
src/store/useMarkerStore.ts

@@ -136,22 +136,43 @@ export default defineStore<'marker', MarkerStateType, {}, MainActionsType>(
           const { data } = await getAllResources();
           // @ts-ignore
           this.emergencyVehicles =
-            data.应急车队.map((i) => ({
-              ...i,
-              locations: `${i.longitude},${i.latitude}`,
-            })) ?? [];
+            data.应急车队
+              .filter(
+                (i) =>
+                  i.latitude !== null &&
+                  i.latitude !== undefined &&
+                  i.latitude !== '',
+              )
+              .map((i) => ({
+                ...i,
+                locations: `${i.longitude},${i.latitude}`,
+              })) ?? [];
           // @ts-ignore
           this.emergencyTeam =
-            data.应急队伍.map((i) => ({
-              ...i,
-              locations: `${i.longitude},${i.latitude}`,
-            })) ?? [];
+            data.应急队伍
+              .filter(
+                (i) =>
+                  i.latitude !== null &&
+                  i.latitude !== undefined &&
+                  i.latitude !== '',
+              )
+              .map((i) => ({
+                ...i,
+                locations: `${i.longitude},${i.latitude}`,
+              })) ?? [];
           // @ts-ignore
           this.emergencyWarehouse =
-            data.应急仓库.map((i) => ({
-              ...i,
-              locations: `${i.longitude},${i.latitude}`,
-            })) ?? [];
+            data.应急仓库
+              .filter(
+                (i) =>
+                  i.latitude !== null &&
+                  i.latitude !== undefined &&
+                  i.latitude !== '',
+              )
+              .map((i) => ({
+                ...i,
+                locations: `${i.longitude},${i.latitude}`,
+              })) ?? [];
         } finally {
           this.toggleLoading();
         }