更改告警详细信息展示方式

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

@@ -48,7 +48,6 @@ let tableColumnsDnd = ref<ColumnsType>([]);
 /**记录开始结束时间 */
 let queryRangePicker = ref<[string, string]>(['', '']);
 
-
 /**查询参数 */
 let queryParams = reactive({
   /**告警设备类型 */
@@ -169,7 +168,7 @@ let tableColumns: ColumnsType = [
     title: t('views.faultManage.activeAlarm.origLevel'),
     align: 'center',
     key: 'origSeverity',
-    dataIndex:'origSeverity',
+    dataIndex: 'origSeverity',
     width: 5,
   },
   {
@@ -632,14 +631,14 @@ function fnExportAll() {
     onOk() {
       const key = 'exportAlarm';
       message.loading({ content: t('common.loading'), key });
-      let sortArr:any=[];
+      let sortArr: any = [];
       tableColumnsDnd.value.forEach((item: any) => {
-        if(item.dataIndex) sortArr.push(item.dataIndex);
+        if (item.dataIndex) sortArr.push(item.dataIndex);
-      })
+      });
 
       // 排序字段
       const sortData = {
-        header:sortArr,
+        header: sortArr,
       };
       exportAll(queryParams).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {
@@ -1065,12 +1064,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.alarmId')"
               name="alarmId"
             >
-              <a-input
+              {{ modalState.from.alarmId }}
-                v-model:value="modalState.from.alarmId"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1078,12 +1072,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.alarmSeq')"
               name="alarmSeq"
             >
-              <a-input
+              {{ modalState.from.alarmSeq }}
-                v-model:value="modalState.from.alarmSeq"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -1094,12 +1083,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.neId')"
               name="neId"
             >
-              <a-input
+              {{ modalState.from.neId }}
-                v-model:value="modalState.from.neId"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1107,12 +1091,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.neName')"
               name="neName"
             >
-              <a-input
+              {{ modalState.from.neName }}
-                v-model:value="modalState.from.neName"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -1123,12 +1102,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.neType')"
               name="neType"
             >
-              <a-input
+              {{ modalState.from.neType }}
-                v-model:value="modalState.from.neType"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1136,12 +1110,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.alarmCode')"
               name="alarmCode"
             >
-              <a-input
+              {{ modalState.from.alarmCode }}
-                v-model:value="modalState.from.alarmCode"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -1152,12 +1121,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.alarmTitle')"
               name="alarmTitle"
             >
-              <a-input
+              {{ modalState.from.alarmTitle }}
-                v-model:value="modalState.from.alarmTitle"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1165,85 +1129,37 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.eventTime')"
               name="eventTime"
             >
-              <a-input
+              {{ modalState.from.eventTime }}
-                v-model:value="modalState.from.eventTime"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
 
         <a-row :gutter="16">
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmTitle')"
-              name="alarmTitle"
-            >
-              <a-input
-                v-model:value="modalState.from.alarmTitle"
-                disabled
-                allow-clear
-              >
-              </a-input>
-            </a-form-item>
-          </a-col>
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.faultManage.activeAlarm.alarmType')"
               name="alarmType"
             >
-              <a-select
+              {{ modalState.from.alarmType }}
-                v-model:value="modalState.from.alarmType"
-                style="width: 100%"
-                :options="dict.activeAlarmType"
-                disabled
-              >
-              </a-select>
             </a-form-item>
           </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
               :label="t('views.faultManage.activeAlarm.pvFlag')"
               name="pvFlag"
             >
-              <a-input
+              {{ modalState.from.pvFlag }}
-                v-model:value="modalState.from.pvFlag"
-                disabled
-                allow-clear
-              >
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.objectName')"
-              name="objectName"
-            >
-              <a-input
-                v-model:value="modalState.from.objectName"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
 
+        <a-row :gutter="16"> </a-row>
+
         <a-form-item
           :label="t('views.faultManage.activeAlarm.locationInfo')"
           name="locationInfo"
         >
-          <a-textarea
+          {{ modalState.from.locationInfo }}
-            v-model:value="modalState.from.locationInfo"
-            placeholder="Autosize height with minimum and maximum number of lines"
-            :auto-size="{ minRows: 1, maxRows: 5 }"
-            disabled
-          />
         </a-form-item>
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
@@ -1251,12 +1167,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.province')"
               name="province"
             >
-              <a-input
+              {{ modalState.from.province }}
-                v-model:value="modalState.from.province"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1264,13 +1175,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.origLevel')"
               name="origSeverity"
             >
-              <a-select
+              {{ modalState.from.origSeverity }}
-                v-model:value="modalState.from.origSeverity"
-                style="width: 100%"
-                :options="dict.activeAlarmSeverity"
-                disabled
-              >
-              </a-select>
             </a-form-item>
           </a-col>
         </a-row>
@@ -1279,33 +1184,20 @@ onMounted(() => {
           :label="t('views.faultManage.activeAlarm.addInfo')"
           name="addInfo"
         >
-          <a-textarea
+          {{ modalState.from.addInfo }}
-            v-model:value="modalState.from.addInfo"
-            :auto-size="{ minRows: 1, maxRows: 5 }"
-            disabled
-          />
         </a-form-item>
         <a-form-item
           :label="t('views.faultManage.activeAlarm.specificProblemId')"
           name="specificProblemId"
         >
-          <a-input
+          {{ modalState.from.specificProblemId }}
-            v-model:value="modalState.from.specificProblemId"
-            disabled
-            allow-clear
-          >
-          </a-input>
         </a-form-item>
 
         <a-form-item
           :label="t('views.faultManage.activeAlarm.specificProblem')"
           name="specificProblem"
         >
-          <a-textarea
+          {{ modalState.from.specificProblem }}
-            v-model:value="modalState.from.specificProblem"
-            :auto-size="{ minRows: 1, maxRows: 5 }"
-            disabled
-          />
         </a-form-item>
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
@@ -1313,13 +1205,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.clearType')"
               name="clearType"
             >
-              <a-select
+              {{ modalState.from.clearType }}
-                v-model:value="modalState.from.clearType"
-                style="width: 100%"
-                :options="dict.activeClearType"
-                disabled
-              >
-              </a-select>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1327,12 +1213,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.clearTime')"
               name="clearTime"
             >
-              <a-input
+              {{ modalState.from.clearTime }}
-                v-model:value="modalState.from.clearTime"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -1343,12 +1224,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.ackUser')"
               name="ackUser"
             >
-              <a-input
+              {{ modalState.from.ackUser }}
-                v-model:value="modalState.from.ackUser"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1356,12 +1232,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.ackState')"
               name="ackState"
             >
-              <a-select
+              {{ modalState.from.ackState }}
-                v-model:value="modalState.from.ackState"
-                style="width: 100%"
-                :options="dict.activeAckState"
-                disabled
-              />
             </a-form-item>
           </a-col>
         </a-row>
@@ -1372,12 +1243,15 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.ackTime')"
               name="ackTime"
             >
-              <a-input
+              {{ modalState.from.ackTime }}
-                v-model:value="modalState.from.ackTime"
+            </a-form-item>
-                disabled
+          </a-col>
-                allow-clear
+          <a-col :lg="12" :md="12" :xs="24">
-              >
+            <a-form-item
-              </a-input>
+              :label="t('views.faultManage.activeAlarm.objectName')"
+              name="objectName"
+            >
+              {{ modalState.from.objectName }}
             </a-form-item>
           </a-col>
         </a-row>

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

@@ -343,7 +343,7 @@ function fnModalVisibleByVive(row: Record<string, any>) {
 function fnModalOk() {
   modalState.confirmLoading = true;
   const from = toRaw(modalState.from);
-  if (from.ackState==='1') {
+  if (from.ackState === '1') {
     message.error({
       content: t('views.faultManage.activeAlarm.ackError'),
       duration: 3,
@@ -434,13 +434,13 @@ function fnExportAll() {
     onOk() {
       const key = 'exportAlarmHis';
       message.loading({ content: t('common.loading'), key });
-      let sortArr:any=[];
+      let sortArr: any = [];
       tableColumnsDnd.value.forEach((item: any) => {
-        if(item.dataIndex) sortArr.push(item.dataIndex);
+        if (item.dataIndex) sortArr.push(item.dataIndex);
-      })
+      });
       // 排序字段
       const sortData = {
-        header:sortArr,
+        header: sortArr,
       };
       exportAll(queryParams).then(res => {
         if (res.code === RESULT_CODE_SUCCESS) {
@@ -449,7 +449,7 @@ function fnExportAll() {
             key,
             duration: 3,
           });
-          writeSheet(res.data, 'alarm',sortData).then(fileBlob =>
+          writeSheet(res.data, 'alarm', sortData).then(fileBlob =>
             saveAs(fileBlob, `history-alarm_${Date.now()}.xlsx`)
           );
         } else {
@@ -800,12 +800,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.alarmId')"
               name="alarmId"
             >
-              <a-input
+              {{ modalState.from.alarmId }}
-                v-model:value="modalState.from.alarmId"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -813,12 +808,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.alarmSeq')"
               name="alarmSeq"
             >
-              <a-input
+              {{ modalState.from.alarmSeq }}
-                v-model:value="modalState.from.alarmSeq"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -829,12 +819,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.neId')"
               name="neId"
             >
-              <a-input
+              {{ modalState.from.neId }}
-                v-model:value="modalState.from.neId"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -842,12 +827,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.neName')"
               name="neName"
             >
-              <a-input
+              {{ modalState.from.neName }}
-                v-model:value="modalState.from.neName"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -858,12 +838,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.neType')"
               name="neType"
             >
-              <a-input
+              {{ modalState.from.neType }}
-                v-model:value="modalState.from.neType"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -871,12 +846,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.alarmCode')"
               name="alarmCode"
             >
-              <a-input
+              {{ modalState.from.alarmCode }}
-                v-model:value="modalState.from.alarmCode"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -887,12 +857,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.alarmTitle')"
               name="alarmTitle"
             >
-              <a-input
+              {{ modalState.from.alarmTitle }}
-                v-model:value="modalState.from.alarmTitle"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -900,42 +865,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.eventTime')"
               name="eventTime"
             >
-              <a-input
+              {{ modalState.from.eventTime }}
-                v-model:value="modalState.from.eventTime"
-                disabled
-                allow-clear
-              >
-              </a-input>
-            </a-form-item>
-          </a-col>
-        </a-row>
-
-        <a-row :gutter="16">
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmTitle')"
-              name="alarmTitle"
-            >
-              <a-input
-                v-model:value="modalState.from.alarmTitle"
-                disabled
-                allow-clear
-              >
-              </a-input>
-            </a-form-item>
-          </a-col>
-          <a-col :lg="12" :md="12" :xs="24">
-            <a-form-item
-              :label="t('views.faultManage.activeAlarm.alarmType')"
-              name="alarmType"
-            >
-              <a-select
-                v-model:value="modalState.from.alarmType"
-                style="width: 100%"
-                :options="dict.activeAlarmType"
-                disabled
-              >
-              </a-select>
             </a-form-item>
           </a-col>
         </a-row>
@@ -946,25 +876,16 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.pvFlag')"
               name="pvFlag"
             >
-              <a-input
+              {{ modalState.from.pvFlag }}
-                v-model:value="modalState.from.pvFlag"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
+
           <a-col :lg="12" :md="12" :xs="24">
             <a-form-item
-              :label="t('views.faultManage.activeAlarm.objectName')"
+              :label="t('views.faultManage.activeAlarm.alarmType')"
-              name="objectName"
+              name="alarmType"
             >
-              <a-input
+              {{ modalState.from.alarmType }}
-                v-model:value="modalState.from.objectName"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -973,12 +894,7 @@ onMounted(() => {
           :label="t('views.faultManage.activeAlarm.locationInfo')"
           name="locationInfo"
         >
-          <a-textarea
+          {{ modalState.from.locationInfo }}
-            v-model:value="modalState.from.locationInfo"
-            placeholder="Autosize height with minimum and maximum number of lines"
-            :auto-size="{ minRows: 1, maxRows: 5 }"
-            disabled
-          />
         </a-form-item>
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
@@ -986,12 +902,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.province')"
               name="province"
             >
-              <a-input
+              {{ modalState.from.province }}
-                v-model:value="modalState.from.province"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -999,13 +910,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.origLevel')"
               name="origSeverity"
             >
-              <a-select
+              {{ modalState.from.origSeverity }}
-                v-model:value="modalState.from.origSeverity"
-                style="width: 100%"
-                :options="dict.activeAlarmSeverity"
-                disabled
-              >
-              </a-select>
             </a-form-item>
           </a-col>
         </a-row>
@@ -1014,33 +919,20 @@ onMounted(() => {
           :label="t('views.faultManage.activeAlarm.addInfo')"
           name="addInfo"
         >
-          <a-textarea
+          {{ modalState.from.addInfo }}
-            v-model:value="modalState.from.addInfo"
-            :auto-size="{ minRows: 1, maxRows: 5 }"
-            disabled
-          />
         </a-form-item>
         <a-form-item
           :label="t('views.faultManage.activeAlarm.specificProblemId')"
           name="specificProblemId"
         >
-          <a-input
+          {{ modalState.from.specificProblemId }}
-            v-model:value="modalState.from.specificProblemId"
-            disabled
-            allow-clear
-          >
-          </a-input>
         </a-form-item>
 
         <a-form-item
           :label="t('views.faultManage.activeAlarm.specificProblem')"
           name="specificProblem"
         >
-          <a-textarea
+          {{ modalState.from.specificProblem }}
-            v-model:value="modalState.from.specificProblem"
-            :auto-size="{ minRows: 1, maxRows: 5 }"
-            disabled
-          />
         </a-form-item>
         <a-row :gutter="16">
           <a-col :lg="12" :md="12" :xs="24">
@@ -1048,13 +940,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.clearType')"
               name="clearType"
             >
-              <a-select
+              {{ modalState.from.clearType }}
-                v-model:value="modalState.from.clearType"
-                style="width: 100%"
-                :options="dict.activeClearType"
-                disabled
-              >
-              </a-select>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1062,12 +948,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.clearTime')"
               name="clearTime"
             >
-              <a-input
+              {{ modalState.from.clearTime }}
-                v-model:value="modalState.from.clearTime"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
         </a-row>
@@ -1078,12 +959,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.ackUser')"
               name="ackUser"
             >
-              <a-input
+              {{ modalState.from.ackUser }}
-                v-model:value="modalState.from.ackUser"
-                disabled
-                allow-clear
-              >
-              </a-input>
             </a-form-item>
           </a-col>
           <a-col :lg="12" :md="12" :xs="24">
@@ -1091,12 +967,7 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.ackState')"
               name="ackState"
             >
-              <a-select
+              {{ modalState.from.ackState }}
-                v-model:value="modalState.from.ackState"
-                style="width: 100%"
-                :options="dict.activeAckState"
-                disabled
-              />
             </a-form-item>
           </a-col>
         </a-row>
@@ -1107,12 +978,15 @@ onMounted(() => {
               :label="t('views.faultManage.activeAlarm.ackTime')"
               name="ackTime"
             >
-              <a-input
+              {{ modalState.from.ackTime }}
-                v-model:value="modalState.from.ackTime"
+            </a-form-item>
-                disabled
+          </a-col>
-                allow-clear
+          <a-col :lg="12" :md="12" :xs="24">
-              >
+            <a-form-item
-              </a-input>
+              :label="t('views.faultManage.activeAlarm.objectName')"
+              name="objectName"
+            >
+              {{ modalState.from.objectName }}
             </a-form-item>
           </a-col>
         </a-row>