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

src/views/dashboard/dashboard.vue

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

src/views/system/addMenuRole/index.vue

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