update 告警列表

src/views/device-alarm/alarm-show/index.vue

@@ -121,71 +121,26 @@
     </el-card>
 
     <el-dialog
-      :title="add ? '增加系统' : '告警详情'"
+      title="告警详情"
       :visible.sync="dialogVisible"
-      width="700px"
+      width="800px"
     >
-      <el-form
-        v-if="dialogVisible"
-        :model="addForm"
-        label-width="90px"
-      >
-        <el-form-item
-          label="设备类型"
-        >
-          {{ detailItem.deviceTypeName }}
-        </el-form-item>
-        <el-form-item
-          label="设备名称"
-        >
-          {{ detailItem.deviceName }}
-        </el-form-item>
-        <el-form-item
-          label="模型名称"
-        >
-          {{ detailItem.dataModelName }}
-        </el-form-item>
-        <el-form-item
-          label="属性代码"
-        >
-          {{ detailItem.propertyCode }}
-        </el-form-item>
-        <el-form-item
-          label="属性名称"
-        >
-          {{ detailItem.propertyName }}
-        </el-form-item>
-        <el-form-item
-          label="判定规则"
-        >
-          {{ $_dictionaryFormat(detailItem.ruleExpression, 'expression') }}
-        </el-form-item>
-        <el-form-item
-          label="告警等级"
-        >
-          {{ $_dictionaryFormat(detailItem.alarmLevel, 'alarm_level') }}
-        </el-form-item>
-        <el-form-item
-          label="阈值"
-        >
-          {{ detailItem.threshold }}
-        </el-form-item>
-        <el-form-item
-          label="上报值"
-        >
-          {{ detailItem.reportValue }}
-        </el-form-item>
-        <el-form-item
-          label="上报时间"
-        >
-          {{ $moment(detailItem.reportTime, 'YYYY-MM-DD HH:mm:ss') }}
-        </el-form-item>
-        <el-form-item
-          label="告警时间"
+      <descriptions
+        label-position="top"
+        label-width="80px"
       >
-          {{ $moment(detailItem.alarmTime, 'YYYY-MM-DD HH:mm:ss') }}
-        </el-form-item>
-      </el-form>
+        <descriptions-item label="设备类型" :value="detailItem.deviceTypeName" />
+        <descriptions-item label="设备名称" :value="detailItem.deviceName" />
+        <descriptions-item label="模型名称" :value="detailItem.dataModelName" />
+        <descriptions-item label="属性代码" :value="detailItem.propertyCode" />
+        <descriptions-item label="属性名称" :value="detailItem.propertyName" />
+        <descriptions-item label="判定规则" :value="$_dictionaryFormat(detailItem.ruleExpression, 'expression')" />
+        <descriptions-item label="告警等级" :value="$_dictionaryFormat(detailItem.alarmLevel, 'alarm_level')" />
+        <descriptions-item label="阈值" :value="detailItem.threshold" />
+        <descriptions-item label="上报值" :value="detailItem.reportValue" />
+        <descriptions-item label="上报时间" :value="$moment(detailItem.reportTime, 'YYYY-MM-DD HH:mm:ss')" />
+        <descriptions-item label="告警时间" :value="$moment(detailItem.alarmTime, 'YYYY-MM-DD HH:mm:ss')" />
+      </descriptions>
       <span slot="footer" class="dialog-footer">
         <!--        <el-button @click="dialogVisible = false">取 消</el-button>-->
         <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
@@ -212,7 +167,19 @@ export default {
       add: true,
       dialogVisible: false,
       tableData: [],
-      detailItem: null,
+      detailItem: {
+        deviceTypeName: null,
+        deviceName: null,
+        dataModelName: null,
+        propertyCode: null,
+        propertyName: null,
+        ruleExpression: null,
+        alarmLevel: null,
+        threshold: null,
+        reportValue: null,
+        reportTime: null,
+        alarmTime: null
+      },
       pageForm: {
         pageSize: 10,
         pageNum: 1,