|
@@ -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();
|
|
|
}
|