完善首页以及告警界面

src/views/faultManage/active-alarm/index.vue

@@ -48,6 +48,8 @@ let tableColumnsDnd = ref<ColumnsType>([]);
 /**记录开始结束时间 */
 let queryRangePicker = ref<[string, string]>(['', '']);
 
+
+
 /**查询参数 */
 let queryParams = reactive({
   /**告警设备类型 */
@@ -627,8 +629,18 @@ function fnExportAll() {
       const sortData = {
         header: sortArr,
       };
+
       exportAll(queryParams).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {
+          res.data = res.data.map((objA: any) => {
+            let filteredObj: any = {};
+            sortArr.forEach((key: any) => {
+              if (objA.hasOwnProperty(key)) {
+                filteredObj[key] = objA[key];
+              }
+            });
+            return filteredObj;
+          });
           message.success({
             content: t('common.msgSuccess', { msg: t('common.export') }),
             key,
@@ -875,7 +887,12 @@ onMounted(() => {
             {{ t('views.faultManage.activeAlarm.syncMyself') }}
           </a-button>
 
-          <a-button type="primary" danger @click.prevent="fnClear()">
+          <a-button
+            type="primary"
+            danger
+            @click.prevent="fnClear()"
+            :disabled="state.selectedRowKeys.length <= 0"
+          >
             <template #icon>
               <DeleteOutlined />
             </template>
@@ -887,7 +904,11 @@ onMounted(() => {
             {{ t('views.faultManage.activeAlarm.disPlayFilfter') }}
           </a-button>
 
-          <a-button type="primary" @click.prevent="fnExportAll()">
+          <a-button
+            type="primary"
+            @click.prevent="fnExportAll()"
+            :disabled="tableState.data.length <= 0"
+          >
             <template #icon> <export-outlined /> </template>
             {{ t('views.faultManage.activeAlarm.exportAll') }}
           </a-button>
@@ -1240,12 +1261,6 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
-
-
-
-       
-
-
       </a-form>
     </a-modal>
 

src/views/faultManage/history-alarm/index.vue

@@ -651,7 +651,7 @@ onMounted(() => {
               <a-select
                 v-model:value="queryParams.alarm_type"
                 :placeholder="t('common.selectPlease')"
-                :options="dict.activeAlarmSeverity"
+                :options="dict.activeAlarmType"
               />
             </a-form-item>
           </a-col>