From 02159e16b3b92602b3212411e3b8af721bd30950 Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Wed, 11 Oct 2023 09:02:18 +0800
Subject: [PATCH] =?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                            |  5 +++-
 src/views/jxjview/government/index.vue | 40 ++++++++++++++++----------
 2 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 3a623ec..5c11e08 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -143,11 +143,14 @@ onMounted(async () => {
 	if (res4.result && res4.result.length > 0) {
 		globalStore.systemConfigSubBg = res4.result[0].configValue;
 	}
-	await getengineering();
 });
 watch(
 	() => route.path,
 	n => {
+		console.log(route.path);
+		if (n != "/login" && globalStore.token && engList.value.length == 0) {
+			getengineering();
+		}
 		tabsShow.value = route.meta.showSidebar;
 	}
 );
diff --git a/src/views/jxjview/government/index.vue b/src/views/jxjview/government/index.vue
index 6478498..f454efe 100644
--- a/src/views/jxjview/government/index.vue
+++ b/src/views/jxjview/government/index.vue
@@ -269,6 +269,8 @@ import {
 	queryConfigOperate
 } from "@/api/modules/jxjview";
 import { checkPhoneNumber } from "@/utils/eleValidate";
+const selectRowType = ref();
+const selectRowObj = ref();
 const requestParams = ref();
 const configMenu = ref([
 	{ label: "政务配置", value: 6 },
@@ -555,9 +557,13 @@ const getAllModule = async (val: any, row: any) => {
 	}
 	requestParams.value = requestData; // 保存修改的参数
 	// 获取全部数据
-	const { result = [] } = await queryAll({ styleType: form.value.moduleStyle, moduleType: requestData.moduleType });
+	const { result } = await queryAll({ styleType: form.value.moduleStyle, moduleType: requestData.moduleType });
 	// console.log("test", result);
-	datas.push(...result);
+	if (result) {
+		datas.push(...result);
+	} else {
+		datas.length = 0;
+	}
 	// 获取选中数据
 	const res = await queryCheckedAll(requestData);
 	// 打开弹窗时调用上面的接口勾选
@@ -609,6 +615,8 @@ const handleParamsCommand = (command: string | number | object, obj: any) => {
 const handleCommand = (command: string | number | object, obj: any) => {
 	console.log(command);
 	console.log(obj);
+	selectRowType.value = command;
+	selectRowObj.value = obj;
 	form.value.moduleStyle = obj.moduleStyle;
 	getAllModule(command, obj);
 	checkAll.value = false;
@@ -774,19 +782,21 @@ const saveItem = async (form: any) => {
 
 const onRadio = async (val: number) => {
 	// console.log(val);
-	const res1 = await getGoverType({ styleType: val });
-	governmentSelectList.value = res1.result.government;
-	projectSelectList.value = res1.result.project;
-	companySelectList.value = res1.result.enterprise;
-	const res2 = await getGoverForm({ governmentSn: governmentSn.value });
-	governmentSelectList.value.concat(projectSelectList.value, companySelectList.value).forEach((itemA, indexA) => {
-		res2.result.forEach((itemB, indexB) => {
-			if (itemA.moduleId == itemB) {
-				// governmentSelectList.value[indexA].select = true;
-				itemA.select = true;
-			}
-		});
-	});
+	// const res1 = await getGoverType({ styleType: val });
+	// governmentSelectList.value = res1.result.government;
+	// projectSelectList.value = res1.result.project;
+	// companySelectList.value = res1.result.enterprise;
+	// const res2 = await getGoverForm({ governmentSn: governmentSn.value });
+	// governmentSelectList.value.concat(projectSelectList.value, companySelectList.value).forEach((itemA, indexA) => {
+	// 	res2.result.forEach((itemB, indexB) => {
+	// 		if (itemA.moduleId == itemB) {
+	// 			// governmentSelectList.value[indexA].select = true;
+	// 			itemA.select = true;
+	// 		}
+	// 	});
+	// });
+	form.value.moduleStyle = val;
+	getAllModule(selectRowType.value, selectRowObj.value);
 };
 
 watch(