diff --git a/.env.development b/.env.development index 5ef7432..3d2e7c3 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 王昊地址 #VITE_GLOB_API_URL=http://192.168.1.98 #开发环境 -VITE_GLOB_API_URL=https://xjgateway.mcrm.vip:8888 +VITE_GLOB_API_URL=https://api-jkglpt.iosp.ydpt.tech #VITE_GLOB_API_URL=https://api.cqygjk.com #健康监测工具报警-websocket #VITE_GLOB_API_YIN_JI=ws://cqyt.dev.yg.dt.io/health-watch/websocket/watchMonitor diff --git a/.env.production b/.env.production index d6f909b..9c32a5c 100644 --- a/.env.production +++ b/.env.production @@ -1,3 +1,3 @@ #后台地址 -VITE_GLOB_API_URL=https://api.xjygjk.com +VITE_GLOB_API_URL=http://api-xj.tri.dt.io \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 73324fa..686dc84 100644 --- a/src/App.vue +++ b/src/App.vue @@ -19,8 +19,10 @@ onMounted(async () => { try { if (userStore.getToken) { - const { result } = await getEmergencyCenterApi(); - userStore.setCenterInfo(result); + const { code, result } = await getEmergencyCenterApi(); + if (code === 200) { + userStore.setCenterInfo(result); + } } } catch (e) {} if (userStore.getUserInfo) { diff --git a/src/enum/pageEnum.ts b/src/enum/pageEnum.ts index 2f7ee83..f21a6c3 100644 --- a/src/enum/pageEnum.ts +++ b/src/enum/pageEnum.ts @@ -13,11 +13,13 @@ export enum PageEnum { } export function setBaseLogin(baseLogin) { - localStorage.setItem('baseLogin', baseLogin); + // localStorage.setItem('baseLogin', baseLogin); + localStorage.setItem('baseLogin', '/login'); } export function getBaseLogin() { - return localStorage.getItem('baseLogin'); + // return localStorage.getItem('baseLogin'); + return '/login'; } //根据当前路径跳转登录页 diff --git a/src/views/components/emergencyDialog.vue b/src/views/components/emergencyDialog.vue index 5515a23..5494ee7 100644 --- a/src/views/components/emergencyDialog.vue +++ b/src/views/components/emergencyDialog.vue @@ -17,11 +17,11 @@
单位: - {{ userInfo?.departName }} + {{ userInfo?.orgName }}
部门: - {{ userInfo?.orgName }} + {{ userInfo?.departName }}
电话: diff --git a/src/views/indexSun.vue b/src/views/indexSun.vue index 053c00c..6470a8f 100644 --- a/src/views/indexSun.vue +++ b/src/views/indexSun.vue @@ -89,11 +89,13 @@ >