From 343cb6adfdb3aa894f9d1578caf0f31a91983f6d Mon Sep 17 00:00:00 2001
From: kun <1422840143@qq.com>
Date: Thu, 23 Nov 2023 18:50:22 +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/routers/modules/dynamicRouter.ts          | 12 +++++++---
 .../components/RigthBottLeftView.vue          | 24 +++++++++----------
 .../userManagement/roleManage/index.vue       |  4 ++--
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/src/routers/modules/dynamicRouter.ts b/src/routers/modules/dynamicRouter.ts
index 5875a54..1150b18 100644
--- a/src/routers/modules/dynamicRouter.ts
+++ b/src/routers/modules/dynamicRouter.ts
@@ -36,7 +36,7 @@ export const initDynamicRouter = async (params?: any) => {
 		}
 
 		// 3.添加动态路由
-		authStore.flatMenuListGet.forEach((item: any) => {
+		authStore.flatMenuListGet.forEach((item: any, index: any) => {
 			item.children && delete item.children;
 			if (item.component && isType(item.component) == "string") {
 				item.component = modules["/src/views" + item.component + ".vue"];
@@ -55,11 +55,17 @@ export const initDynamicRouter = async (params?: any) => {
 				router.addRoute("layout", item);
 				if (globalStore.path) {
 					// console.log("exec");
-					router.push(globalStore.path);
-
+					if (globalStore.path == item.path) {
+						router.push(globalStore.path);
+					} else {
+						if (item.path != "/" && index == 1) {
+							router.push(item.path);
+						}
+					}
 					// globalStore.setPath(null);
 				} else {
 					// 其他处理
+					globalStore.setPath(null);
 				}
 			}
 		});
diff --git a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
index 6b1a374..e6b0cc3 100644
--- a/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
+++ b/src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
@@ -96,27 +96,27 @@
 				</div>
 			</div>
 			<div class="botttworigt">
-				<div class="jts" style="top: 6%"></div>
-				<div class="jts" style="top: 31%"></div>
-				<div class="jts" style="top: 56%"></div>
-				<div class="jts" style="top: 81%"></div>
+				<div class="jts" style="top: 5%"></div>
+				<!-- <div class="jts" style="top: 31%"></div> -->
+				<div class="jts" style="top: 38.3%"></div>
+				<div class="jts" style="top: 71.6%"></div>
 
 				<div class="jindud" ref="jindud"></div>
 				<div class="jindue" ref="jindue"></div>
 
-				<div class="letcent" style="top: 6%">
+				<div class="letcent" style="top: 7%">
 					<div>请款报审</div>
 					<div>{{ dataObj.paymentTotal }}万元</div>
 				</div>
-				<div class="letcent" style="top: 31%">
+				<!-- <div class="letcent" style="top: 31%">
 					<div>审定应付</div>
 					<div>{{ dataObj.applyAmountTotal }}万元</div>
-				</div>
-				<div class="letcent" style="top: 56%">
+				</div> -->
+				<div class="letcent" style="top: 40.3%">
 					<div>实际支付</div>
 					<div>{{ dataObj.realPayAmountTotal }}万元</div>
 				</div>
-				<div class="letcent" style="top: 81%">
+				<div class="letcent" style="top: 73.6%">
 					<div>年度实际支付</div>
 					<div>{{ dataObj.realPayAmountByYear }}万元</div>
 				</div>
@@ -723,7 +723,7 @@ const setjindue = () => {
 
 				// border: 1px solid red;
 				height: 50%;
-				font-size: 21px;
+				font-size: 20px;
 				color: #f5f5f5;
 			}
 			.sicentinbot {
@@ -835,7 +835,7 @@ const setjindue = () => {
 				display: flex;
 				flex-direction: column;
 				width: 140px;
-				font-size: 22px;
+				font-size: 20px;
 				font-weight: 500;
 				color: #ffffff;
 				white-space: nowrap;
@@ -880,7 +880,7 @@ const setjindue = () => {
 					white-space: nowrap;
 				}
 				div:nth-child(1) {
-					font-size: 22px;
+					font-size: 20px;
 				}
 				div:nth-child(2) {
 					font-size: 20px;
diff --git a/src/views/goverment/huizhou/userManagement/roleManage/index.vue b/src/views/goverment/huizhou/userManagement/roleManage/index.vue
index 076feaa..3ebe20e 100644
--- a/src/views/goverment/huizhou/userManagement/roleManage/index.vue
+++ b/src/views/goverment/huizhou/userManagement/roleManage/index.vue
@@ -20,11 +20,11 @@
 					<img src="@/assets/images/tableIcon/配置权限.png" alt="" class="configureIcon" />
 					<span>配置权限</span>
 				</el-button>
-				<el-button type="primary" link @click="handleAddItem(2, row)">
+				<el-button type="primary" link @click="handleAddItem(2, row)" v-if="row.sysDefault != 1">
 					<img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
 					<span>编辑</span>
 				</el-button>
-				<el-button type="danger" link :icon="Delete" @click="deleteAccount(row)">删除</el-button>
+				<el-button type="danger" link :icon="Delete" @click="deleteAccount(row)" v-if="row.sysDefault != 1">删除</el-button>
 			</template>
 			<template #state="{ row }">
 				<span :class="row.state === 1 ? '' : 'redText'">{{ row.state == 1 ? "启用" : "禁用" }}</span>