diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 1e59417..4cd1b92 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -21,6 +21,7 @@ const useUserStore = defineStore( const password = userInfo.password const code = userInfo.code const uuid = userInfo.uuid + return new Promise((resolve, reject) => { login(username, password, code, uuid).then(res => { setToken(res.token) diff --git a/src/views/components/map/marsMap.vue b/src/views/components/map/marsMap.vue index 7ba9ad2..fe1ceef 100644 --- a/src/views/components/map/marsMap.vue +++ b/src/views/components/map/marsMap.vue @@ -8,6 +8,10 @@ import PointJson from "./point.json"; import { onMounted, ref, reactive, watch, onUnmounted } from "vue"; import moment from "moment"; import useUavStore from "@/store/modules/uav"; +import markerTypePark from "@/assets/images/marker-park.png" +import markerTypeSchool from "@/assets/images/marker-school.png" +import markerTypeUav from "@/assets/images/marker-uav.png" + const uavStore = useUavStore(); const { proxy } = getCurrentInstance(); @@ -78,10 +82,7 @@ let animationFrameId; let gamepad = reactive({}); -// 使用 import.meta.glob 动态导入本地图片 -const imageModules = import.meta.glob("@/assets/images/*.png", { eager: true }); -// 获取图片路径 -const imageUrls = Object.values(imageModules).map((module) => module.default); + let map = null; let list = []; @@ -405,10 +406,10 @@ const lablePoint = (item, index) => { } ">${item.name}</div> <img class="marker-icon" src="${ item.type == "school" - ? imageUrls[5] + ? markerTypeSchool : item.type == "park" - ? imageUrls[4] - : imageUrls[6] + ? markerTypePark + : markerTypeUav }" /> </div> `,