angelo
/
web-base-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'lx-dev' of gitee.com:cabbage_qd/web-base-admin into lx-online

This commit is contained in:
woody 2025-05-13 11:14:12 +08:00
parent 81c509939e 74c2c3577e
commit d3c160f3bb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/dashboard/dashboard.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="summary-dashboard"> <div v-show="visible" class="summary-dashboard">
<topBar <topBar
v-if="topList.length > 0 && userInfo.userType != 9" v-if="topList.length > 0 && userInfo.userType != 9"
:top-list="topList" :top-list="topList"
@ -144,11 +144,13 @@ export default {
dailyPerformance: {}, dailyPerformance: {},
monthlyPerformance: {}, monthlyPerformance: {},
defaultTabItem: 'summaryDashboard', defaultTabItem: 'summaryDashboard',
userInfo: {} userInfo: {},
visible: false
} }
}, },
mounted() { mounted() {
this.getRoles().then(() => { this.getRoles().then(() => {
this.visible = true
this.getMemberSummary() this.getMemberSummary()
this.getDailyPerformance() this.getDailyPerformance()
this.getMonthlyPerformance() this.getMonthlyPerformance()

2
src/views/system/addMenuRole/index.vue
View File

@ -543,7 +543,7 @@ export default {
} else { } else {
this.menuAllList[index].changed = false this.menuAllList[index].changed = false
this.menuAllList[index].checkArr = [] this.menuAllList[index].checkArr = []
this.menuAllList[index].children.forEach((item) => { this.menuAllList[index].children && this.menuAllList[index].children.forEach((item) => {
item.changed = false item.changed = false
item.checkArr = [] item.checkArr = []
if (item.children) { if (item.children) {