From 58aed9ead78e6135ea37d9564565a400bfd63ac0 Mon Sep 17 00:00:00 2001 From: Vce Date: Sun, 31 Mar 2024 10:49:48 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=A4=A9=E6=B0=94?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sevenLargeScreen/headNoise/centerBottom.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/sevenLargeScreen/headNoise/centerBottom.vue b/src/views/sevenLargeScreen/headNoise/centerBottom.vue index 20dfb14..e0dc0a8 100644 --- a/src/views/sevenLargeScreen/headNoise/centerBottom.vue +++ b/src/views/sevenLargeScreen/headNoise/centerBottom.vue @@ -23,10 +23,21 @@ import Card from "@/components/card.vue"; import { reactive, onMounted, ref } from "vue"; import { getWeatherDataApi } from "@/api/modules/headNoise"; +import { getTaskTimeDetail } from "@/api/modules/schedulePlan"; +import { GlobalStore } from "@/stores"; +const store = GlobalStore(); const weatherList = ref([]); +//获取项目信息 +const projectTimeInfo = ref({} as any); +const getProjectInfo = async () => { + const res: any = await getTaskTimeDetail({ projectSn: store.sn }); + console.log("获取项目信息", res); + projectTimeInfo.value = res.result; + loadWeather(); +}; //获取天气 const loadWeather = async () => { - const res = await getWeatherDataApi({ cityid: "" }); + const res = await getWeatherDataApi({ cityid: "", areaId: projectTimeInfo.value.areaCode }); let json = JSON.parse(res.result); let list = json; console.log("获取天气", res.result); @@ -41,7 +52,7 @@ const loadWeather = async () => { }); }; onMounted(() => { - loadWeather(); + getProjectInfo(); }); const weatherIcon = ref([ { From fdc5a258793fc71e7745f4eaa6aa2631e222df23 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 1 Apr 2024 09:08:32 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sevenLargeScreen/headNoise/centerBottom.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/sevenLargeScreen/headNoise/centerBottom.vue b/src/views/sevenLargeScreen/headNoise/centerBottom.vue index 20dfb14..e0dc0a8 100644 --- a/src/views/sevenLargeScreen/headNoise/centerBottom.vue +++ b/src/views/sevenLargeScreen/headNoise/centerBottom.vue @@ -23,10 +23,21 @@ import Card from "@/components/card.vue"; import { reactive, onMounted, ref } from "vue"; import { getWeatherDataApi } from "@/api/modules/headNoise"; +import { getTaskTimeDetail } from "@/api/modules/schedulePlan"; +import { GlobalStore } from "@/stores"; +const store = GlobalStore(); const weatherList = ref([]); +//获取项目信息 +const projectTimeInfo = ref({} as any); +const getProjectInfo = async () => { + const res: any = await getTaskTimeDetail({ projectSn: store.sn }); + console.log("获取项目信息", res); + projectTimeInfo.value = res.result; + loadWeather(); +}; //获取天气 const loadWeather = async () => { - const res = await getWeatherDataApi({ cityid: "" }); + const res = await getWeatherDataApi({ cityid: "", areaId: projectTimeInfo.value.areaCode }); let json = JSON.parse(res.result); let list = json; console.log("获取天气", res.result); @@ -41,7 +52,7 @@ const loadWeather = async () => { }); }; onMounted(() => { - loadWeather(); + getProjectInfo(); }); const weatherIcon = ref([ { From c23ab05a88df0baf8036e14acc0064fb47a97044 Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Mon, 1 Apr 2024 14:13:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sevenLargeScreen/safeRisk/riskManage/work-ticket-dialog.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/sevenLargeScreen/safeRisk/riskManage/work-ticket-dialog.vue b/src/views/sevenLargeScreen/safeRisk/riskManage/work-ticket-dialog.vue index 0623b32..c4eee7f 100644 --- a/src/views/sevenLargeScreen/safeRisk/riskManage/work-ticket-dialog.vue +++ b/src/views/sevenLargeScreen/safeRisk/riskManage/work-ticket-dialog.vue @@ -212,7 +212,7 @@
Date: Mon, 1 Apr 2024 19:10:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routers/modules/staticRouter.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts index 11cd55b..031ad2c 100644 --- a/src/routers/modules/staticRouter.ts +++ b/src/routers/modules/staticRouter.ts @@ -8,6 +8,11 @@ import { HOME_URL } from "@/enums/Home/index"; * staticRouter(静态路由) */ export const staticRouter: RouteRecordRaw[] = [ + { + path: "/", + // redirect: HOME_URL[0] + redirect: LOGIN_URL + }, { path: "/login", name: "login", From 5b9b707896af25dd9e6b1ca4d03a5dee8be6ae1e Mon Sep 17 00:00:00 2001 From: kun <1422840143@qq.com> Date: Tue, 2 Apr 2024 10:11:32 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/routers/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/routers/index.ts b/src/routers/index.ts index 182d415..4fc9278 100644 --- a/src/routers/index.ts +++ b/src/routers/index.ts @@ -56,7 +56,7 @@ router.beforeEach(async (to, from, next) => { console.log("判断是访问登陆页，有:", from.fullPath); console.log("判断是访问登陆页，globalStore.token有:", globalStore.token); - if (globalStore.token) return next(from.fullPath); + if (globalStore.token && from.fullPath != '/') return next(from.fullPath); // resetRouter();//重置路由 return next(); }