fix(*):报表，权限

src/router/modules/leftMenu.js

@@ -242,18 +242,6 @@ export default [
       auth: 'G',
     },
   },
-  // {
-  //   path: '/tjbb',
-  //   name: 'tjbb',
-  //   hidden: false,
-  //   icon_d: '/img/baobiao_d.png',
-  //   icon_a: '/img/baobiao_a.png',
-  //   meta: {
-  //     title: '统计报表',
-  //     auth: 'I'
-  //   },
-  //   component: () => import('@/views/tjbb/tjbb.vue')
-  // },
   {
     path: '/SystemManage',
     name: 'SystemManage',
@@ -385,19 +373,19 @@ export default [
     component: () =>
       import('@/views/xtfkgl/XtfkglMain.vue'),
   },
-  // {
-  //   path: '/tjbb',
-  //   name: 'tjbb',
-  //   hidden: true,  // 现在是通过权限控制
-  //   icon_d: '/img/baobiao_d.png',
-  //   icon_a: '/img/baobiao_a.png',
-  //   meta: {
-  //     title: i18n.tc('Menu.tjbb'),
-  //     auth: 'I',
-  //     parentId: 'SystemManage',
-  //   },
-  //   component: () => import('@/views/tjbb/tjbb.vue')
-  // },
+  {
+    path: '/tjbb',
+    name: 'tjbb',
+    hidden: false,
+    icon_d: '/img/baobiao_d.png',
+    icon_a: '/img/baobiao_a.png',
+    meta: {
+      title: i18n.tc('Menu.tjbb'),
+      auth: 'H-8',
+      parentId: 'SystemManage'
+    },
+    component: () => import('@/views/tjbb/tjbb.vue')
+  },
   {
     path: '/systemLog',
     name: 'systemLog',

src/views/SystemManage/GroupPermission.vue

@@ -101,7 +101,7 @@
       </div>
 
       <!-- 功能权限 -->
-      <el-checkbox-group v-model="checkList" :disabled="disabled">
+      <el-checkbox-group v-show="funFlag" v-model="checkList" :disabled="disabled">
         <div class="role-info">
           <!--            角色权限菜单列-->
           <div class="menus">
@@ -213,7 +213,7 @@
                 barInLine: index == 2,
                 w600: index == 8,
               }" v-for="(item, index) in permissionDataList[2] &&
-permissionDataList[2].children" :key="item.code">
+              permissionDataList[2].children" :key="item.code">
                 <el-checkbox :label="item.id" :class="getClass(item.id).class" :disabled="getClass(item.id).disable">
                   {{ item.name }}</el-checkbox>
               </div>
@@ -372,7 +372,7 @@ permissionDataList[2].children" :key="item.code">
                 barInLine: index == 2,
                 w600: index == 8,
               }" v-for="(item, index) in dataPermissionList[2] &&
-dataPermissionList[2].children" :key="item.code">
+              dataPermissionList[2].children" :key="item.code">
                 <el-checkbox :label="item.id" :class="getClass(item.id).class" :disabled="getClass(item.id).disable">
                   {{ item.name }}
                 </el-checkbox>
@@ -452,11 +452,11 @@ dataPermissionList[2].children" :key="item.code">
                 <div v-if="scope.row.status === 0" class="circle-red"></div>
                 <div v-if="scope.row.status === 1" class="circle-blue"></div>
                 {{
-                    scope.row.status === 0
-                      ? "停用"
-                      : scope.row.status === 1
-                        ? "启用"
-                        : "无状态"
+                scope.row.status === 0
+                ? "停用"
+                : scope.row.status === 1
+                ? "启用"
+                : "无状态"
                 }}
               </template>
             </el-table-column>
@@ -488,7 +488,7 @@ export default {
         rolePermissions: "",
         roleNames: "",
       },
-      funFlag: false,
+      funFlag: true,
       dataFlag: false,
       // 保存的角色选项
       permissionDataListSelection: [],
@@ -498,6 +498,7 @@ export default {
       disabled: false,
       //权限页面数组
       permissionDataList: [],
+      dataPermissionList: [],
       //是否保存
       isSave: false,
       //用户id

src/views/SystemManage/RoleManage.vue

@@ -87,7 +87,7 @@
         </div>
       </div>
       <!-- 功能权限 -->
-      <el-checkbox-group v-model="checkList" :disabled="menuDisableState()">
+      <el-checkbox-group v-show="funFlag" v-model="checkList" :disabled="menuDisableState()">
         <div class="role-info">
           <!--            角色权限菜单列-->
           <div class="menus">
@@ -432,6 +432,7 @@ export default {
       defaultRoleBtns: [],
       // 所有权限的列表
       permissionDataList: [],
+      dataPermissionList: [],
       // 自定义的角色组
       diyRoleList: [],
       // 自定义的角色组 -- 原始的（用于修改后失去焦点恢复原态）

src/views/SystemManage/UserPermission.vue

@@ -113,7 +113,7 @@
         </div>
       </div>
       <!-- 功能权限 -->
-      <el-checkbox-group v-model="checkList" :disabled="disabled">
+      <el-checkbox-group v-show="funFlag" v-model="checkList" :disabled="disabled">
         <div class="role-info">
           <!--            角色权限菜单列-->
           <div class="menus">
@@ -455,7 +455,7 @@ export default {
         unitName: "",
         roleNames: "",
       },
-      funFlag: false,
+      funFlag: true,
       dataFlag: false,
       // 保存的角色选项
       permissionDataListSelection: [],
@@ -465,6 +465,7 @@ export default {
       disabled: false,
       //权限页面数组
       permissionDataList: [],
+      dataPermissionList: [],
       //是否保存
       isSave: false,
       //用户id

src/views/cxyrd/QueryConfirm.vue

@@ -541,7 +541,7 @@ export default {
       if (e) {
         this.reqParam.contrastCustomSearchReq.userid = null
       }
-      this.searchQuery('yes')
+      this.search('yes')
     },
   },
   computed: {