From 40472a6fa4c2007e4b8c2974894fe335707d622a Mon Sep 17 00:00:00 2001
From: chenshuichuan <1154693969@qq.com>
Date: Fri, 13 Sep 2024 10:39:15 +0800
Subject: [PATCH] fix alert record

---
 src/utils/dict.ts                               |  1 +
 src/views/iot/alert/AlertForm.vue               | 11 +++++++++--
 .../iot/alert/components/AlertRecordForm.vue    | 11 +++++++++--
 src/views/iot/alert/index.vue                   |  4 ++--
 .../device/components/DeviceAttributeList.vue   | 15 +++++++--------
 src/views/iot/device/index.vue                  | 17 ++++++++---------
 6 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 136f477b..5e464d0a 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -274,4 +274,5 @@ export enum DICT_TYPE {
   IOT_DEVICE_USE_TYPE = "iot_device_use_type",
   IOT_ATTRIBUTE_IO_TYPE = "iot_attribute_io_type",
   IOT_ALERT_TYPE = "iot_alert_type",
+  IOT_ALERT_LEVEL = "iot_alert_level",
 }
diff --git a/src/views/iot/alert/AlertForm.vue b/src/views/iot/alert/AlertForm.vue
index e04f3560..d8d8b984 100644
--- a/src/views/iot/alert/AlertForm.vue
+++ b/src/views/iot/alert/AlertForm.vue
@@ -24,7 +24,14 @@
         </el-select>
       </el-form-item>
       <el-form-item label="告警等级" prop="alertLevel">
-        <el-input v-model="formData.alertLevel" placeholder="请输入告警等级" />
+        <el-select v-model="formData.alertLevel" placeholder="请输入告警等级">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.IOT_ALERT_LEVEL)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="告警内容" prop="content">
         <Editor v-model="formData.content" height="150px" />
@@ -168,4 +175,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/iot/alert/components/AlertRecordForm.vue b/src/views/iot/alert/components/AlertRecordForm.vue
index 4ebcb72a..bce9bfb8 100644
--- a/src/views/iot/alert/components/AlertRecordForm.vue
+++ b/src/views/iot/alert/components/AlertRecordForm.vue
@@ -24,7 +24,14 @@
         </el-select>
       </el-form-item>
       <el-form-item label="告警等级" prop="alertLevel">
-        <el-input v-model="formData.alertLevel" placeholder="请输入告警等级" />
+        <el-select v-model="formData.alertLevel" placeholder="请输入告警等级">
+          <el-option
+            v-for="dict in getStrDictOptions(DICT_TYPE.IOT_ALERT_LEVEL)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="告警内容" prop="content">
         <Editor v-model="formData.content" height="150px" />
@@ -193,4 +200,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/iot/alert/index.vue b/src/views/iot/alert/index.vue
index 2ec44baa..4f06ce10 100644
--- a/src/views/iot/alert/index.vue
+++ b/src/views/iot/alert/index.vue
@@ -71,8 +71,8 @@
       highlight-current-row
       @current-change="handleCurrentChange"
     >
-      <el-table-column label="编码" align="center" prop="alertCode" />
-      <el-table-column label="名称" align="center" prop="alertName" />
+      <el-table-column label="编码" align="left" prop="alertCode" width="150px"/>
+      <el-table-column label="名称" align="left" prop="alertName" width="150px"/>
       <el-table-column label="告警类型" align="center" prop="alertType">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.IOT_ALERT_TYPE" :value="scope.row.alertType" />
diff --git a/src/views/iot/device/components/DeviceAttributeList.vue b/src/views/iot/device/components/DeviceAttributeList.vue
index 8b1e23ea..874a2b4b 100644
--- a/src/views/iot/device/components/DeviceAttributeList.vue
+++ b/src/views/iot/device/components/DeviceAttributeList.vue
@@ -10,8 +10,8 @@
       <Icon icon="ep:plus" class="mr-5px" /> 新增
     </el-button>
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true">
-      <el-table-column label="属性编码" align="center" prop="attributeCode" />
-      <el-table-column label="属性名称" align="center" prop="attributeName" />
+      <el-table-column label="属性编码" align="left" prop="attributeCode" width="150px"/>
+      <el-table-column label="属性名称" align="left" prop="attributeName" width="150px"/>
       <el-table-column label="PLC点位地址" align="center" prop="address" />
       <el-table-column label="地址描述" align="center" prop="description" />
       <el-table-column label="地址类型" align="center" prop="attributeType">
@@ -34,19 +34,18 @@
       <el-table-column label="计算公式" align="center" prop="dataFormula" />
       <el-table-column label="告警" align="center" prop="alertId" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="是否启用" align="center" prop="isEnable">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
-        </template>
-      </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
         prop="createTime"
         :formatter="dateFormatter"
         width="170px"
-        fixed="right"
       />
+      <el-table-column label="是否启用" align="center" prop="isEnable"  fixed="right">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" width="150px" fixed="right">
         <template #default="scope">
           <el-button
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 97b6073f..d2c03fa0 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -98,9 +98,9 @@
       highlight-current-row
       @current-change="handleCurrentChange"
     >
-      <el-table-column label="设备编号" align="center" prop="deviceCode" />
-      <el-table-column label="设备名称" align="center" prop="deviceName" />
-      <el-table-column label="设备类型" align="center" prop="deviceType">
+      <el-table-column label="设备编号" align="left" prop="deviceCode" width="150px"/>
+      <el-table-column label="设备名称" align="left" prop="deviceName" width="150px"/>
+      <el-table-column label="设备类型" align="left" prop="deviceType" width="150px">
         <template #default="scope">
           <dict-tag :type="DICT_TYPE.IOT_DEVICE_TYPE" :value="scope.row.deviceType" />
         </template>
@@ -123,19 +123,18 @@
         width="180px"
       />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="是否启用" align="center" prop="isEnable">
-        <template #default="scope">
-          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
-        </template>
-      </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
         prop="createTime"
         :formatter="dateFormatter"
         width="170px"
-        fixed="right"
       />
+      <el-table-column label="是否启用" align="center" prop="isEnable"  fixed="right">
+        <template #default="scope">
+          <dict-tag :type="DICT_TYPE.INFRA_BOOLEAN_STRING" :value="scope.row.isEnable" />
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" fixed="right"  width="150px">
         <template #default="scope">
           <el-button