fix: 告警关闭非必要的操作

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

@@ -742,6 +742,7 @@ onMounted(() => {
             type="primary"
             @click.prevent="fnCancelConfirm()"
             :disabled="state.selectedRowKeys.length <= 0"
+            v-if="false"
           >
             <template #icon>
               <CloseOutlined />
@@ -877,6 +878,7 @@ onMounted(() => {
       @ok="fnModalOk"
       :ok-text="t('views.faultManage.activeAlarm.confirm')"
       @cancel="fnModalCancel"
+      :footer="false"
     >
       <a-form
         name="modalStateFrom"
@@ -974,7 +976,10 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.alarmType')"
               name="alarmType"
             >
-              {{ modalState.from.alarmType }}
+              <DictTag
+                :options="dict.activeAlarmType"
+                :value="modalState.from.alarmType"
+              />
             </a-form-item>
           </a-col>
         </a-row>
@@ -1000,7 +1005,10 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.origLevel')"
               name="origSeverity"
             >
-              {{ modalState.from.origSeverity }}
+              <DictTag
+                :options="dict.activeAlarmSeverity"
+                :value="modalState.from.origSeverity"
+              />
             </a-form-item>
           </a-col>
         </a-row>
@@ -1027,13 +1035,24 @@ onMounted(() => {
         >
           {{ modalState.from.specificProblem }}
         </a-form-item>
+        <a-form-item
+          :label="t('views.faultManage.activeAlarm.objectName')"
+          name="objectName"
+          :label-col="{ span: 4 }"
+        >
+          {{ modalState.from.objectName }}
+        </a-form-item>
+
         <a-row>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.faultManage.activeAlarm.clearType')"
               name="clearType"
             >
-              {{ modalState.from.clearType }}
+              <DictTag
+                :options="dict.activeClearType"
+                :value="modalState.from.clearType"
+              />
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1041,12 +1060,12 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.clearTime')"
               name="clearTime"
             >
-              {{ modalState.from.clearTime }}
+              {{ parseDateToStr(modalState.from.clearTime) }}
             </a-form-item>
           </a-col>
         </a-row>
 
-        <a-row>
+        <a-row v-show="modalState.from.ackUser != ''">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.faultManage.activeAlarm.ackUser')"
@@ -1060,26 +1079,18 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.ackState')"
               name="ackState"
             >
-              {{ modalState.from.ackState }}
+              <DictTag
+                :options="dict.activeAckState"
+                :value="modalState.from.ackState"
+              />
             </a-form-item>
           </a-col>
-        </a-row>
-
-        <a-row>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.faultManage.activeAlarm.ackTime')"
               name="ackTime"
             >
-              {{ modalState.from.ackTime }}
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.objectName')"
-              name="objectName"
-            >
-              {{ modalState.from.objectName }}
+              {{ parseDateToStr(modalState.from.ackTime) }}
             </a-form-item>
           </a-col>
         </a-row>