From 9a36eb81d75eac9b30fdd854c04a003a5171ce06 Mon Sep 17 00:00:00 2001
From: lai <371757574@qq.com>
Date: Tue, 23 Jan 2024 10:40:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E5=91=8A=E8=AD=A6=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E5=B1=95=E7=A4=BA=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/faultManage/active-alarm/index.vue  | 65 ++++++++-----------
 src/views/faultManage/history-alarm/index.vue |  8 ++-
 2 files changed, 35 insertions(+), 38 deletions(-)

diff --git a/src/views/faultManage/active-alarm/index.vue b/src/views/faultManage/active-alarm/index.vue
index 2e8e6184..7e79d1d1 100644
--- a/src/views/faultManage/active-alarm/index.vue
+++ b/src/views/faultManage/active-alarm/index.vue
@@ -203,13 +203,6 @@ let tableColumns: ColumnsType = [
     align: 'center',
     width: 5,
   },
-  {
-    title: t('views.faultManage.activeAlarm.clearUser'),
-    dataIndex: 'clearUser',
-    align: 'left',
-    width: 5,
-  },
-
   {
     title: t('views.faultManage.activeAlarm.ackState'),
     dataIndex: 'ackState',
@@ -689,17 +682,20 @@ function fnGetList(pageNum?: number) {
     listAct(toRaw(queryParams), filterState.sql).then((res: any) => {
       console.log(res);
       if (res.code === RESULT_CODE_SUCCESS && Array.isArray(res.rows)) {
-
         // 取消勾选
         if (state.selectedRowKeys.length > 0) {
           state.selectedRowKeys = [];
         }
-////
+        ////
         tablePagination.total = res.total;
         tableState.data = res.rows;
-        if(tablePagination.total<=(queryParams.pageNum-1)*tablePagination.pageSize&&queryParams.pageNum!==1) {
+        if (
+          tablePagination.total <=
+            (queryParams.pageNum - 1) * tablePagination.pageSize &&
+          queryParams.pageNum !== 1
+        ) {
           tableState.loading = false;
-          fnGetList(queryParams.pageNum-1) 
+          fnGetList(queryParams.pageNum - 1);
         }
       } else {
         tablePagination.total = 0;
@@ -879,11 +875,7 @@ onMounted(() => {
             {{ t('views.faultManage.activeAlarm.syncMyself') }}
           </a-button>
 
-          <a-button
-            type="primary"
-            danger
-            @click.prevent="fnClear()"
-          >
+          <a-button type="primary" danger @click.prevent="fnClear()">
             <template #icon>
               <DeleteOutlined />
             </template>
@@ -1057,7 +1049,12 @@ onMounted(() => {
       :ok-text="t('views.faultManage.activeAlarm.confirm')"
       @cancel="fnModalCancel"
     >
-      <a-form name="modalStateFrom" layout="horizontal">
+      <a-form
+        name="modalStateFrom"
+        layout="horizontal"
+        :label-col="{ span: 8 }"
+        :label-wrap="true"
+      >
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -1153,14 +1150,16 @@ onMounted(() => {
           </a-col>
         </a-row>
 
-        <a-row :gutter="16"> </a-row>
-
         <a-form-item
           :label="t('views.faultManage.activeAlarm.locationInfo')"
           name="locationInfo"
+          :label-col="{ span: 4 }"
         >
           {{ modalState.from.locationInfo }}
         </a-form-item>
+
+        <a-row :gutter="16"> </a-row>
+
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -1183,12 +1182,15 @@ onMounted(() => {
         <a-form-item
           :label="t('views.faultManage.activeAlarm.addInfo')"
           name="addInfo"
+          :label-col="{ span: 4 }"
         >
           {{ modalState.from.addInfo }}
         </a-form-item>
+
         <a-form-item
           :label="t('views.faultManage.activeAlarm.specificProblemId')"
           name="specificProblemId"
+          :label-col="{ span: 4 }"
         >
           {{ modalState.from.specificProblemId }}
         </a-form-item>
@@ -1196,27 +1198,10 @@ onMounted(() => {
         <a-form-item
           :label="t('views.faultManage.activeAlarm.specificProblem')"
           name="specificProblem"
+          :label-col="{ span: 4 }"
         >
           {{ modalState.from.specificProblem }}
         </a-form-item>
-        <a-row :gutter="16">
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.clearType')"
-              name="clearType"
-            >
-              {{ modalState.from.clearType }}
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.clearTime')"
-              name="clearTime"
-            >
-              {{ modalState.from.clearTime }}
-            </a-form-item>
-          </a-col>
-        </a-row>
 
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
@@ -1255,6 +1240,12 @@ onMounted(() => {
             </a-form-item>
           </a-col>
         </a-row>
+
+
+
+       
+
+
       </a-form>
     </a-modal>
 
diff --git a/src/views/faultManage/history-alarm/index.vue b/src/views/faultManage/history-alarm/index.vue
index b9049f0f..9d6a7e5c 100644
--- a/src/views/faultManage/history-alarm/index.vue
+++ b/src/views/faultManage/history-alarm/index.vue
@@ -797,7 +797,7 @@ onMounted(() => {
       :ok-text="t('views.faultManage.activeAlarm.confirm')"
       @cancel="fnModalCancel"
     >
-      <a-form name="modalStateFrom" layout="horizontal">
+      <a-form name="modalStateFrom" layout="horizontal" :label-col="{span:8}">
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
@@ -897,6 +897,7 @@ onMounted(() => {
         <a-form-item
           :label="t('views.faultManage.activeAlarm.locationInfo')"
           name="locationInfo"
+          :label-col="{span:4}"
         >
           {{ modalState.from.locationInfo }}
         </a-form-item>
@@ -922,12 +923,15 @@ onMounted(() => {
         <a-form-item
           :label="t('views.faultManage.activeAlarm.addInfo')"
           name="addInfo"
+          :label-col="{span:4}"
         >
           {{ modalState.from.addInfo }}
         </a-form-item>
         <a-form-item
           :label="t('views.faultManage.activeAlarm.specificProblemId')"
           name="specificProblemId"
+          :label-col="{span:4}"
+
         >
           {{ modalState.from.specificProblemId }}
         </a-form-item>
@@ -935,6 +939,8 @@ onMounted(() => {
         <a-form-item
           :label="t('views.faultManage.activeAlarm.specificProblem')"
           name="specificProblem"
+          :label-col="{span:4}"
+
         >
           {{ modalState.from.specificProblem }}
         </a-form-item>