From 87490ae4b5308ac1cffc222044da1b47a1626665 Mon Sep 17 00:00:00 2001 From: wx <645899409@qq.com> Date: Mon, 15 Dec 2025 14:53:32 +0800 Subject: [PATCH] =?UTF-8?q?update=201.=E4=BF=AE=E6=94=B9=E4=BA=91=E5=9D=90?= =?UTF-8?q?=E5=B8=AD=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=9C=B0?= =?UTF-8?q?=E7=90=86=E4=BD=8D=E7=BD=AE=E7=9B=B8=E5=85=B3=202.=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E5=BA=94=E6=80=A5=E6=B1=82=E5=8A=A9=EF=BC=8C=E5=8D=95?= =?UTF-8?q?=E4=BD=8D=E9=83=A8=E9=97=A8=E5=AD=97=E6=AE=B5=E4=BA=92=E6=8D=A2?= =?UTF-8?q?=203.=E6=9B=B4=E6=96=B0=E8=AF=B7=E6=B1=82=E5=9C=B0=E5=9D=80?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- .env.production | 2 +- src/App.vue | 6 ++++-- src/enum/pageEnum.ts | 6 ++++-- src/views/components/emergencyDialog.vue | 4 ++-- src/views/indexSun.vue | 18 ++++++++++++------ src/views/indexSun/oneRightNew.vue | 2 +- 7 files changed, 25 insertions(+), 15 deletions(-) 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 @@ >