Merge branch 'master' of http://120.26.64.82:3000/BFFE/Foshan4A4.0

src/App.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 17:17:53
- * @LastEditTime: 2022-02-28 18:06:18
+ * @LastEditTime: 2022-03-02 10:48:32
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \Foshan4A\src\App.vue
@@ -64,11 +64,7 @@ export default {
     "$store.state.user.token": {
       handler (val) {
         if (val) {
-          if (this.roles && this.roles.length) {
-            this.handleInit();
-          } else {
-            this.clearAll();
-          }
+          this.handleInit();
         } else {
           this.clearAll();
         }

src/router/routes/routes-file-two.js

@@ -1,7 +1,7 @@
 /*
  * @Author: zk
  * @Date: 2022-01-06 13:45:09
- * @LastEditTime: 2022-02-28 21:33:09
+ * @LastEditTime: 2022-03-02 10:05:16
  * @LastEditors: Please set LastEditors
  * @Description: 组织管理路由
  * @FilePath: \Foshan4A3.0\src\router\routes\routes-file-two.js
@@ -43,18 +43,18 @@ const organizationRoutes = {
 }
 
 const staffRoutes = {
-  path: 'staff',
+  path: '/staff',
   component: Layout,
   meta: { roles: ['officer_menu'], title: '职员管理' },
   children: [
     {
-      path: 'staff',
+      path: '/staff',
       name: 'Staff',
       component: () => import('@/views/staffManagement/index'),
       meta: { title: '职员管理' },
       children: [
         {
-          path: 'staff',
+          path: '/staff',
           name: 'StaffHome',
           component: () => import('@/views/staffManagement/compontents/staffHome'),
           meta: { title: '职员管理', roles: ['officer_page'], icon: 'authority', imgstyle: 'ic_home_nav_defaul.png', imgstyleup: 'ic_home_nav_check.png' }

src/views/dashboard/components/analysis.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-11-25 10:40:42
- * @LastEditTime: 2022-01-05 16:49:55
+ * @LastEditTime: 2022-03-02 10:37:43
  * @LastEditors: Please set LastEditors
  * @Description: 数据分析
  * @FilePath: \Foshan4A2.0\src\views\dashboard\components\analysis.vue
@@ -22,7 +22,7 @@
         </div>
       </div>
       <!--角色概览-->
-      <div v-if="roleFlag" class="tu-user box-public-shadow l22">
+      <div v-if="OpenRole" class="tu-user box-public-shadow l22">
         <div class="tu-user-content h100 flex">
           <div class="tu-user-content-left relative">
             <commonChartsPie :option="userOption" id="tu-user-content" />
@@ -130,17 +130,13 @@ import commonProgress from '@/layout/components/Echarts/commonProgress.vue'
 import commonChartsNum from '@/layout/components/EchartsNum/index.vue'
 import dateType from '@/layout/components/dateType/index.vue'
 import { GetUserAna, GetOfficerAna, GetRoleAna, GetAuthAna } from '@/api/apiHome'
+import { mapGetters } from 'vuex'
 export default {
   name: 'Analysis',
-  props: {
-    roleFlag: {
-      type: Boolean,
-      default: true
-    }
-  },
   components: { commonChartsPie, commonChartsBar, commonChartsNum, commonChartsLine, commonProgress, dateType },
   data () {
     return {
+      OpenRole: 1,
       // 账号信息分析饼图数据
       accountOption: {
         color: ['#94C6E0', '#F4C23A', '#8969BE', '#E752A3'],
@@ -691,7 +687,12 @@ export default {
       ]
     }
   },
+  computed: {
+    ...mapGetters(['systemSet']),
+  },
   created () {
+    const { OpenRole } = typeof this.systemSet === "string" ? JSON.parse(this.systemSet) : this.systemSet; //1是请求角色 0是请求用户
+    this.OpenRole = OpenRole
     this.pageInit()
   },
   methods: {

src/views/dashboard/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2021-10-14 17:17:53
- * @LastEditTime: 2022-03-01 10:19:50
+ * @LastEditTime: 2022-03-02 10:37:20
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  * @FilePath: \Foshan4A\src\views\dashboard\index.vue
@@ -42,7 +42,7 @@
       </div>
     </div>
     <!--数据分析-->
-    <Analysis :roleFlag="roleFlag" v-show="radio == 1" />
+    <Analysis v-show="radio == 1" />
     <!--个人日志-->
     <Journal v-show="radio == 2" />
   </div>
@@ -166,7 +166,6 @@ export default {
       if (!OpenRole) {
         this.routes.forEach((item, index) => {
           if (item.path === '/role') {
-            this.roleFlag = false
             this.routes.splice(index, 1)
           }
         })
@@ -174,7 +173,6 @@ export default {
       if (!UserOfficerMulti) {
         this.routes.forEach((item, index) => {
           if (item.path === '/account') {
-            this.roleFlag = false
             this.routes.splice(index, 1)
           }
         })