权限设置+21号需求中：5.7.10

src/mixins/JeecgListMixin.js

@@ -19,8 +19,8 @@ export const JeecgListMixin = {
       /* 分页参数 */
       ipagination:{
         current: 1,
-        pageSize: 10,
-        pageSizeOptions: ['10', '20', '30'],
+        pageSize: 500,
+        pageSizeOptions: ['10', '100', '500'],
         showTotal: (total, range) => {
           return range[0] + "-" + range[1] + " 共" + total + "条"
         },

src/views/module_interLock/InterlockSummary/InterlockSummaryList.vue

@@ -196,6 +196,16 @@
           //   dataIndex: 'interlockApparatusId'
           // },
           {
+            title:'控制系统状态',
+            align:"center",
+            dataIndex: 'controlSystemStatus_dictText',
+          },
+          {
+            title:'旁路状态',
+            align:"center",
+            dataIndex: 'bypass_dictText',
+          },
+          {
             title:'联锁状态',
             align:"center",
             dataIndex: 'interlockStatus_dictText',
@@ -204,11 +214,6 @@
             },
           },
           {
-            title:'控制系统状态',
-            align:"center",
-            dataIndex: 'controlSystemStatus_dictText',
-          },
-          {
             title:'回路健康级别',
             align:"center",
             dataIndex: 'loopHealthLevel',
@@ -216,11 +221,6 @@
               return {children: t,attrs: {rowSpan:r.rowSpan3}};
             },
           },
-          {
-            title:'旁路状态',
-            align:"center",
-            dataIndex: 'bypass_dictText',
-          },
           // {
           //   title:'逻辑关系',
           //   align:"center",

src/views/module_interLock/InterlockSummary/index.vue

@@ -106,6 +106,7 @@
 <style scoped>
 .all{
   height: calc(100vh - 1px);
+  /* height: 100%; */
   width: 100%;
   display: flex;
 }

src/views/module_interLock/interlockHistoryData/InterlockHistory/InterlockHistoryList.vue

@@ -48,7 +48,7 @@
     <!-- 操作按钮区域 -->
     <div class="table-operator">
       <!-- <a-button v-if="interlockType == '1'" @click="handleAdd" type="primary" icon="plus">新增</a-button> -->
-      <a-button type="primary" icon="download" @click="handleExportXls('历史数据')">导出</a-button>
+      <a-button type="primary" icon="download" v-has="'export:history'" @click="handleExportXls('历史数据')">导出</a-button>
       <!-- <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
         <a-button type="primary" icon="import">导入</a-button>
       </a-upload> -->

src/views/module_interLock/interlockHistoryData/InterlockReport/InterlockDataReportList.vue

@@ -136,6 +136,7 @@
   import InterlockDataReportModal from './modules/InterlockDataReportModal'
   import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
   import { downFiles_info } from '@api/api'
+  import { colAuthFilter } from "@/utils/authFilter"
 
   export default {
     name: 'InterlockDataReportList',
@@ -188,6 +189,7 @@
             dataIndex: 'action',
             align:"center",
             fixed:"right",
+            auth: 'history:action',
             width:147,
             scopedSlots: { customRender: 'action' }
           }
@@ -205,7 +207,12 @@
       }
     },
     created() {
-    this.getSuperFieldList();
+      this.disableMixinCreated=true;
+      this.columns = colAuthFilter(this.columns,'history:');
+      this.loadData();
+      this.initDictConfig();
+
+      this.getSuperFieldList();
     },
     computed: {
       importExcelUrl: function(){