diff --git a/src/assets/images/profile.jpg b/src/assets/images/profile.jpg index b3a940b..17dabb1 100644 Binary files a/src/assets/images/profile.jpg and b/src/assets/images/profile.jpg differ diff --git a/src/assets/styles/font.css b/src/assets/styles/font.css index 9e081ac..924962b 100644 --- a/src/assets/styles/font.css +++ b/src/assets/styles/font.css @@ -20,7 +20,7 @@ @font-face { font-family: 'Alimama ShuHeiTi-Bold'; - src: url("../font/ALIMAMASHUHEITI-BOLD.TTF"); + src: url("../font/ALIMAMASHUHEITI-BOLD.ttf"); } @font-face { font-family: 'LESLIE'; diff --git a/src/components/navigationBar/index.vue b/src/components/navigationBar/index.vue index 0b3023e..dbf83fc 100644 --- a/src/components/navigationBar/index.vue +++ b/src/components/navigationBar/index.vue @@ -21,6 +21,7 @@ import useUserStore from "@/store/modules/user"; const userStore = useUserStore(); import { ElMessageBox } from 'element-plus' +const router = useRouter(); const logout = () => { ElMessageBox.confirm("确定注销并退出系统吗?", "提示", { confirmButtonText: "确定", @@ -29,7 +30,7 @@ const logout = () => { }) .then(() => { userStore.logOut().then(() => { - location.href = "/index"; + router.replace("/login"); }); }) .catch(() => {}); diff --git a/src/router/index.js b/src/router/index.js index 267e994..6b9c2be 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -204,7 +204,7 @@ export const dynamicRoutes = [ ]; const router = createRouter({ - history: createWebHistory(), + history: createWebHashHistory(), routes: constantRoutes, scrollBehavior(to, from, savedPosition) { if (savedPosition) { diff --git a/src/views/emergency/workOrder/components/operation.vue b/src/views/emergency/workOrder/components/operation.vue index e1563a9..7f9c214 100644 --- a/src/views/emergency/workOrder/components/operation.vue +++ b/src/views/emergency/workOrder/components/operation.vue @@ -166,7 +166,7 @@ const props = defineProps({ const emit = defineEmits(["update:modelValue", "confirm"]); //地图配置 const publicPath = window.basePathUrl || ""; -const configUrl = publicPath + "/lib/config/config.json"; +const configUrl = "lib/config/config.json"; let mapData = null; let mapLayer = {}; let entity = null; diff --git a/src/views/login.vue b/src/views/login.vue index 55012fc..b2af614 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -99,8 +99,8 @@ const router = useRouter(); const { proxy } = getCurrentInstance(); const loginForm = ref({ - username: "admin", - password: "admin123", + username: "", + password: "", rememberMe: false, code: "", uuid: "", diff --git a/src/views/visualization/emergency/index.vue b/src/views/visualization/emergency/index.vue index 5a1882e..b852568 100644 --- a/src/views/visualization/emergency/index.vue +++ b/src/views/visualization/emergency/index.vue @@ -86,7 +86,7 @@ const checkList = ref([]); const dialogVisible = ref(false); const title = ref("现场视频"); //地图配置 -const configUrl = publicPath + "/lib/config/config.json"; +const configUrl = "lib/config/config.json"; let mapData = null; let mapLayer = {}; @@ -127,7 +127,7 @@ const initGd = () => { // 渲染徐汇区面 const initAreaCover = async () => { const jsonData = await mars3d.Util.fetchJson({ - url: `${publicPath}/lib/geoJson/xuhuiArea.json`, + url: `lib/geoJson/xuhuiArea.json`, }); const arr = mars3d.Util.geoJsonToGraphics(jsonData); // 解析geojson @@ -317,7 +317,7 @@ const inintEntity = (data, fill = false, height) => { */ const initStyleFeatures = async () => { const jsonData = await mars3d.Util.fetchJson({ - url: `${publicPath}/lib/geoJson/park-rectangle.json`, + url: `lib/geoJson/park-rectangle.json`, }); const arr = mars3d.Util.geoJsonToGraphics(jsonData); // 解析geojson inintEntity(arr[0], false);