admin/wisdomisitezwfront-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: BUG修改

Browse Source
This commit is contained in:
kun 2023-11-23 18:50:22 +08:00
parent f54970c36f
commit 343cb6adfd
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/routers/modules/dynamicRouter.ts
View File

@ -36,7 +36,7 @@ export const initDynamicRouter = async (params?: any) => {
} }
// 3.添加动态路由 // 3.添加动态路由
authStore.flatMenuListGet.forEach((item: any) => { authStore.flatMenuListGet.forEach((item: any, index: any) => {
item.children && delete item.children; item.children && delete item.children;
if (item.component && isType(item.component) == "string") { if (item.component && isType(item.component) == "string") {
item.component = modules["/src/views" + item.component + ".vue"]; item.component = modules["/src/views" + item.component + ".vue"];
@ -55,11 +55,17 @@ export const initDynamicRouter = async (params?: any) => {
router.addRoute("layout", item); router.addRoute("layout", item);
if (globalStore.path) { if (globalStore.path) {
// console.log("exec"); // 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); // globalStore.setPath(null);
} else { } else {
// 其他处理 // 其他处理
globalStore.setPath(null);
} }
} }
}); });

24
src/views/goverment/huizhou/largeScreen/largeScreenTwo/components/RigthBottLeftView.vue
View File

@ -96,27 +96,27 @@
</div> </div>
</div> </div>
<div class="botttworigt"> <div class="botttworigt">
<div class="jts" style="top: 6%"></div> <div class="jts" style="top: 5%"></div>
<div class="jts" style="top: 31%"></div> <!-- <div class="jts" style="top: 31%"></div> -->
<div class="jts" style="top: 56%"></div> <div class="jts" style="top: 38.3%"></div>
<div class="jts" style="top: 81%"></div> <div class="jts" style="top: 71.6%"></div>
<div class="jindud" ref="jindud"></div> <div class="jindud" ref="jindud"></div>
<div class="jindue" ref="jindue"></div> <div class="jindue" ref="jindue"></div>
<div class="letcent" style="top: 6%"> <div class="letcent" style="top: 7%">
<div>请款报审</div> <div>请款报审</div>
<div>{{ dataObj.paymentTotal }}万元</div> <div>{{ dataObj.paymentTotal }}万元</div>
</div> </div>
<div class="letcent" style="top: 31%"> <!-- <div class="letcent" style="top: 31%">
<div>审定应付</div> <div>审定应付</div>
<div>{{ dataObj.applyAmountTotal }}万元</div> <div>{{ dataObj.applyAmountTotal }}万元</div>
</div> </div> -->
<div class="letcent" style="top: 56%"> <div class="letcent" style="top: 40.3%">
<div>实际支付</div> <div>实际支付</div>
<div>{{ dataObj.realPayAmountTotal }}万元</div> <div>{{ dataObj.realPayAmountTotal }}万元</div>
</div> </div>
<div class="letcent" style="top: 81%"> <div class="letcent" style="top: 73.6%">
<div>年度实际支付</div> <div>年度实际支付</div>
<div>{{ dataObj.realPayAmountByYear }}万元</div> <div>{{ dataObj.realPayAmountByYear }}万元</div>
</div> </div>
@ -723,7 +723,7 @@ const setjindue = () => {
// border: 1px solid red; // border: 1px solid red;
height: 50%; height: 50%;
font-size: 21px; font-size: 20px;
color: #f5f5f5; color: #f5f5f5;
} }
.sicentinbot { .sicentinbot {
@ -835,7 +835,7 @@ const setjindue = () => {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
width: 140px; width: 140px;
font-size: 22px; font-size: 20px;
font-weight: 500; font-weight: 500;
color: #ffffff; color: #ffffff;
white-space: nowrap; white-space: nowrap;
@ -880,7 +880,7 @@ const setjindue = () => {
white-space: nowrap; white-space: nowrap;
} }
div:nth-child(1) { div:nth-child(1) {
font-size: 22px; font-size: 20px;
} }
div:nth-child(2) { div:nth-child(2) {
font-size: 20px; font-size: 20px;

4
src/views/goverment/huizhou/userManagement/roleManage/index.vue
View File

@ -20,11 +20,11 @@
<img src="@/assets/images/tableIcon/配置权限.png" alt="" class="configureIcon" /> <img src="@/assets/images/tableIcon/配置权限.png" alt="" class="configureIcon" />
<span>配置权限</span> <span>配置权限</span>
</el-button> </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" /> <img src="@/assets/images/tableIcon/updateIcon.png" alt="" class="configureIcon" />
<span>编辑</span> <span>编辑</span>
</el-button> </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>
<template #state="{ row }"> <template #state="{ row }">
<span :class="row.state === 1 ? '' : 'redText'">{{ row.state == 1 ? "启用" : "禁用" }}</span> <span :class="row.state === 1 ? '' : 'redText'">{{ row.state == 1 ? "启用" : "禁用" }}</span>