From 1bd62d87d505416a82a44676d74773f08db0c533 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Sun, 31 Mar 2024 10:20:46 +0800
Subject: [PATCH 1/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  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/views/sevenLargeScreen/headNoise/centerBottom.vue b/src/views/sevenLargeScreen/headNoise/centerBottom.vue
index f79900b..b8cf6cf 100644
--- a/src/views/sevenLargeScreen/headNoise/centerBottom.vue
+++ b/src/views/sevenLargeScreen/headNoise/centerBottom.vue
@@ -28,6 +28,14 @@ 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: "", areaId: projectTimeInfo.value.areaCode});
@@ -44,14 +52,6 @@ const loadWeather = async () => {
 		weatherList.value.push(element);
 	});
 };
-//获取项目信息
-const projectTimeInfo = ref({} as any);
-const getProjectInfo = async () => {
-	const res: any = await getTaskTimeDetail({ projectSn: store.sn });
-	console.log("获取项目信息", res);
-	projectTimeInfo.value = res.result;
-	loadWeather();
-};
 onMounted(() => {
 	getProjectInfo();
 });

From 5c4b8c40686c3374e27f71b0863ab08cdd69af52 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 1 Apr 2024 16:28:40 +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

---
 src/views/sevenLargeScreen/indexL.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue
index 819f113..44122d6 100644
--- a/src/views/sevenLargeScreen/indexL.vue
+++ b/src/views/sevenLargeScreen/indexL.vue
@@ -544,10 +544,10 @@ function loginOut() {
 function jumpBgd() {
 	// 标准版——跳转演示平台项目后台
 	if (COMPANY == "") {
-		window.location.replace("http://jxj.zhgdyun.com:100/#/projectIndex");
+		window.location.replace("http://jxj.zhgdyun.com:100/#/login?token=" + store.token);
 	} else {
 		// 新项目通用(百色服务器)
-		window.location.replace("http://101.43.164.214:11111/#/projectIndex");
+		window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token);
 	}
 }
 </script>

From dc64b625205eb35d8efc496eaa145309af4f2600 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 1 Apr 2024 18:54:18 +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

---
 src/App.vue                                   | 16 ++++++------
 src/enums/project/projectTypeEnum.ts          |  1 +
 src/routers/index.ts                          |  2 --
 src/routers/modules/staticRouter.ts           |  5 ++++
 .../projectOverview/leftTop.vue               | 25 ++++++++++++++++---
 src/views/sevenLargeScreen/indexL.vue         |  3 ++-
 6 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index eee1560..ebbdca4 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -56,14 +56,14 @@ onMounted(() => {
 	// 	window.sessionStorage["login"] = true;
 	// };
 	// 监听 beforeunload 事件
-	window.addEventListener("beforeunload", function () {
-		if (window.performance.navigation.type === window.performance.navigation.TYPE_RELOAD) {
-			// 如果是刷新页面操作，不清除 token
-			return;
-		}
-		globalStore.setToken("");
-		globalStore.setUserInfo("");
-	});
+	// window.addEventListener("beforeunload", function () {
+	// 	if (window.performance.navigation.type === window.performance.navigation.TYPE_RELOAD) {
+	// 		// 如果是刷新页面操作，不清除 token
+	// 		return;
+	// 	}
+	// 	// globalStore.setToken("");
+	// 	// globalStore.setUserInfo("");
+	// });
 });
 </script>
 <style lang="scss">
diff --git a/src/enums/project/projectTypeEnum.ts b/src/enums/project/projectTypeEnum.ts
index 153cfbd..24bf13b 100644
--- a/src/enums/project/projectTypeEnum.ts
+++ b/src/enums/project/projectTypeEnum.ts
@@ -1,3 +1,4 @@
+
 export const projectTypeEnum = [
 	{ id: 1, name: "房建" },
 	{ id: 2, name: "市政" },
diff --git a/src/routers/index.ts b/src/routers/index.ts
index e973142..93f27c1 100644
--- a/src/routers/index.ts
+++ b/src/routers/index.ts
@@ -36,8 +36,6 @@ const router = createRouter({
  * */
 router.beforeEach(async (to, from, next) => {
 	const globalStore = GlobalStore();
-	console.log("路由拦截 beforeEach:", to);
-	console.log("路由拦截 to.path:", to.path);
 	// 解决首次跳转失败
 	let freeToken = window.location.href.indexOf("token") != -1;
 	if (freeToken) {
diff --git a/src/routers/modules/staticRouter.ts b/src/routers/modules/staticRouter.ts
index 89fd816..32ec275 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",
diff --git a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue
index 4c7cb07..30be5e8 100644
--- a/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue
+++ b/src/views/sevenLargeScreen/comprehensiveManage/projectOverview/leftTop.vue
@@ -9,7 +9,7 @@
 				<div><span>建筑面积：</span> {{ projectData.projectAcreage || "" }} ㎡</div>
 				<div><span>开工日期：</span> {{ projectData.startWorkDate || "" }}</div>
 				<div><span>项目编号：</span> {{ projectData.projectNumber || "" }}</div>
-				<div><span>工程类别：</span> {{ projectData.projectType ? projectTypeEnum[projectData.projectType - 1].name : "" }}</div>
+				<div><span>工程类别：</span> {{ projectData.projectType ? projectTypeEnumList[projectData.projectType - 1].name : "" }}</div>
 			</div>
 			<!-- <div class="projectInfo">
 				<div><span>建设地点：</span> 南平市建阳区</div>
@@ -28,7 +28,7 @@
 import Card from "@/components/card.vue";
 import { GlobalStore } from "@/stores";
 import { ref, onMounted, watch } from "vue";
-import { projectTypeEnum } from "@/enums/project/projectTypeEnum";
+import { getStageOption } from "@/api/modules/projectOverview";
 // ts
 type Props = {
 	projectData?: any; // 传入项目信息
@@ -41,7 +41,26 @@ const props = withDefaults(defineProps<Props>(), {
 const projectData = ref({} as any);
 
 const projectLocal = ref("" as any);
-
+const store = GlobalStore();
+const projectTypeEnumList:any = ref([]); //工程类别
+// 工程类别字典数据
+const projectTypeEnum = async () => {
+	const res: any = await getStageOption({ dictionaryEncoding: "project_type", projectSn: store.sn });
+	if (res.result.length > 0) {
+		let newArray = res.result.map((item: any) => {
+			return {
+				name: item.name,
+				id: Number(item.data)
+			};
+		});
+		projectTypeEnumList.value = newArray
+	} else {
+		projectTypeEnumList.value = []
+	}
+};
+onMounted(() => {
+	projectTypeEnum();
+})
 watch(
 	() => props.projectData,
 	newVal => {
diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue
index 44122d6..24e898b 100644
--- a/src/views/sevenLargeScreen/indexL.vue
+++ b/src/views/sevenLargeScreen/indexL.vue
@@ -547,7 +547,8 @@ function jumpBgd() {
 		window.location.replace("http://jxj.zhgdyun.com:100/#/login?token=" + store.token);
 	} else {
 		// 新项目通用(百色服务器)
-		window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token);
+		// window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token);
+		window.location.replace("http://192.168.34.138:8080/#/login?token=" + store.token);
 	}
 }
 </script>

From b6357fd0059e1ad083376f7fa800ca1d3c029b68 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Mon, 1 Apr 2024 19:00:31 +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/views/sevenLargeScreen/indexL.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue
index 24e898b..3afc27f 100644
--- a/src/views/sevenLargeScreen/indexL.vue
+++ b/src/views/sevenLargeScreen/indexL.vue
@@ -547,8 +547,8 @@ function jumpBgd() {
 		window.location.replace("http://jxj.zhgdyun.com:100/#/login?token=" + store.token);
 	} else {
 		// 新项目通用(百色服务器)
-		// window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token);
-		window.location.replace("http://192.168.34.138:8080/#/login?token=" + store.token);
+		window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token);
+		// window.location.replace("http://192.168.34.138:8080/#/login?token=" + store.token);
 	}
 }
 </script>

From ebae47d39cbc35436b95974a0f314b37a1c5d01d Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Tue, 2 Apr 2024 10:07:31 +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 +-
 src/views/sevenLargeScreen/indexL.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/routers/index.ts b/src/routers/index.ts
index 93f27c1..c0d3f36 100644
--- a/src/routers/index.ts
+++ b/src/routers/index.ts
@@ -55,7 +55,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();
 	}
diff --git a/src/views/sevenLargeScreen/indexL.vue b/src/views/sevenLargeScreen/indexL.vue
index 3afc27f..3687093 100644
--- a/src/views/sevenLargeScreen/indexL.vue
+++ b/src/views/sevenLargeScreen/indexL.vue
@@ -549,6 +549,7 @@ function jumpBgd() {
 		// 新项目通用(百色服务器)
 		window.location.replace("http://101.43.164.214:11111/#/login?token=" + store.token);
 		// window.location.replace("http://192.168.34.138:8080/#/login?token=" + store.token);
+		// window.open("http://192.168.34.138:8080/#/login?token=" + store.token);
 	}
 }
 </script>