1. 优化预警历史系统页面

src/views/vent/monitorManager/warningMonitor/index-mine.vue

@@ -22,12 +22,12 @@
     <a-tab-pane tab="联动预警历史" key="manageAuto" />
   </a-tabs>
   <div class="alarm-history-table">
-    <BasicTable v-if="activeKey == 'device'" ref="alarmHistory" @register="registerTable" :scroll="{ x: 0, y: 340 }">
+    <BasicTable v-if="activeKey == 'device'" ref="alarmHistory" @register="registerTable" :scroll="{ x: 0, y: 350 }">
       <template #form-onExportXls>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()"> 导出</a-button>
       </template>
     </BasicTable>
-    <BasicTable v-if="activeKey == 'manageAuto'" ref="alarmHistory" @register="registerTable" :scroll="{ x: 0, y: 340 }">
+    <BasicTable v-if="activeKey == 'manageAuto'" ref="alarmHistory" @register="registerTable" :scroll="{ x: 0, y: 350 }">
       <template #form-onExportXls>
         <a-button type="primary" preIcon="ant-design:export-outlined" @click="onExportXls()"> 导出</a-button>
       </template>
@@ -85,6 +85,7 @@
             label: '是否解决',
             // field: 'isok',
             field: 'isOk',
+            defaultValue: false,
             component: 'Select',
             componentProps: {
               options: [
@@ -127,31 +128,18 @@
             },
             colProps: { span: 4 },
           },
-          // {
-          //   label: '设备类型',
-          //   field: 'deviceKind',
-          //   component: 'MTreeSelect',
-          //   componentProps: {
-          //     virtual: false,
-          //   },
-          //   colProps: { span: 4 },
-          // },
           {
-            field: 'starttime',
-            label: '开始时间',
-            component: 'DatePicker',
+            label: '设备类型',
+            field: 'deviceKind',
+            component: 'MTreeSelect',
             componentProps: {
-              showTime: true,
-              valueFormat: 'YYYY-MM-DD HH:mm:ss',
-              getPopupContainer: getAutoScrollContainer,
-            },
-            colProps: {
-              span: 4,
+              virtual: false,
             },
+            colProps: { span: 4 },
           },
           {
-            field: 'endtime',
-            label: '结束时间',
+            field: 'starttime',
+            label: '开始报警时间',
             component: 'DatePicker',
             componentProps: {
               showTime: true,
@@ -162,6 +150,19 @@
               span: 4,
             },
           },
+          // {
+          //   field: 'endtime',
+          //   label: '结束时间',
+          //   component: 'DatePicker',
+          //   componentProps: {
+          //     showTime: true,
+          //     valueFormat: 'YYYY-MM-DD HH:mm:ss',
+          //     getPopupContainer: getAutoScrollContainer,
+          //   },
+          //   colProps: {
+          //     span: 4,
+          //   },
+          // },
         ],
       },
       fetchSetting: {
@@ -173,9 +174,9 @@
         pageSizeOptions: ['10', '30', '50', '100'],
       },
       beforeFetch(params) {
-        // if (!params['deviceKind']) {
-        //   params['deviceKind'] = null;
-        // }
+        if (!params['deviceKind']) {
+          params['deviceKind'] = null;
+        }
         return params;
       },
     },