From be1c7dc9cc62a7c31358dc06adaae44f51710b42 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Wed, 28 Jan 2026 14:38:12 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E9=87=87=E9=9B=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=A8=A1=E5=9E=8B/=E9=87=87=E9=9B=86=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87-=E6=B7=BB=E5=8A=A0=E5=91=8A=E8=AD=A6=E7=99=BB?=
 =?UTF-8?q?=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts                   |  1 +
 src/views/iot/device/index.vue      | 30 +++++++++++++++++++++++++++++
 src/views/iot/devicemodel/index.vue | 18 +++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index 051535cc..4c1c8ddf 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -278,6 +278,7 @@ export enum DICT_TYPE {
   IOT_ALERT_LEVEL = "iot_alert_level",
   IOT_PROTOCOL = "iot_protocol",
   IOT_DEVICE_ATTRIBUTE_UNIT = "iot_device_attribute_unit",
+  IOT_ALARM_REGISTRATION = " alarm_registration",
 
   PRIMARY_FLAG = "primary_flag"
 }
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 073f642d..edef0db8 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -273,6 +273,19 @@ link :type="isRowConnected(scope.row) ? 'warning' : 'success'"
               <el-form-item label="默认值">
                 <el-input v-model="ruleForm.defaultValue" disabled />
               </el-form-item>
+              <el-form-item
+                v-if="(ruleForm.identifier || '').toString().toUpperCase() === 'ALARM'"
+                label="告警登记"
+              >
+                <el-select v-model="ruleForm.alarmLevel" placeholder="请选择告警登记">
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.IOT_ALARM_REGISTRATION)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
 
               <div class="flex flex-col w-full">
                 <div class="border border-gray-200 dark:border-gray-600 rounded-md py-12px">
@@ -413,6 +426,16 @@ link :type="isRowConnected(scope.row) ? 'warning' : 'success'"
               <el-form-item label="默认值">
                 <el-input v-model="createRuleForm.defaultValue" disabled />
               </el-form-item>
+              <el-form-item label="告警登记">
+                <el-select v-model="createRuleForm.alarmLevel" placeholder="请选择告警登记">
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.IOT_ALARM_REGISTRATION)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
             </el-form>
             <template #footer>
               <span class="dialog-footer">
@@ -626,6 +649,7 @@ const ruleQueryParams = reactive({
   fieldName: undefined as string | undefined,
   fieldRule: undefined as string | undefined,
   defaultValue: undefined as string | undefined,
+  alarmLevel: undefined as string | undefined,
   deviceId: undefined as number | undefined,
 })
 const ruleQueryFormRef = ref()
@@ -700,6 +724,7 @@ const ruleForm = reactive<Partial<DevicePointRuleVO>>({
   ruleAttributeId: undefined,
   ruleOperator: undefined,
   ruleValue: undefined,
+   alarmLevel: '',
 })
 
 const extraPointRules = ref<
@@ -763,6 +788,7 @@ const openRuleForm = async (row: DevicePointRuleVO & { pointRulesVOList?: any[]
   ruleForm.fieldName = row.fieldName
   ruleForm.defaultValue = row.defaultValue
   ruleForm.deviceId = row.deviceId
+  ruleForm.alarmLevel = (row as any).alarmLevel
 
   extraPointRules.value = []
 
@@ -853,6 +879,7 @@ const handleRuleSubmit = async () => {
       fieldRule: ruleForm.fieldRule,
       defaultValue: ruleForm.defaultValue,
       deviceId: ruleForm.deviceId ?? attributeDeviceId.value,
+      alarmLevel: ruleForm.alarmLevel,
       pointRulesVOList,
     }
 
@@ -908,6 +935,7 @@ const createRuleForm = reactive({
   identifier: 'ALARM',
   fieldName: '',
   defaultValue: '报警',
+  alarmLevel: '',
 })
 
 const openCreateRuleForm = () => {
@@ -918,6 +946,7 @@ const openCreateRuleForm = () => {
   createRuleForm.identifier = 'ALARM'
   createRuleForm.fieldName = '报警'
   createRuleForm.defaultValue = '报警'
+  createRuleForm.alarmLevel = ''
   createRuleDialogVisible.value = true
 }
 
@@ -933,6 +962,7 @@ const handleCreateRuleSubmit = async () => {
       identifier: createRuleForm.identifier,
       fieldName: createRuleForm.fieldName,
       defaultValue: createRuleForm.defaultValue,
+      alarmLevel: createRuleForm.alarmLevel,
       deviceId: attributeDeviceId.value,
     }
     await request.post({ url: '/iot/device-point-rules/create', data: payload })
diff --git a/src/views/iot/devicemodel/index.vue b/src/views/iot/devicemodel/index.vue
index 67fd636e..eb755bd5 100644
--- a/src/views/iot/devicemodel/index.vue
+++ b/src/views/iot/devicemodel/index.vue
@@ -201,6 +201,19 @@ link type="primary" @click="openForm('update', scope.row.id)"
               <el-form-item label="默认值">
                 <el-input v-model="ruleForm.defaultValue" disabled />
               </el-form-item>
+              <el-form-item
+                v-if="(ruleForm.identifier || '').toString().toUpperCase() === 'ALARM'"
+                label="告警登记"
+              >
+                <el-select v-model="ruleForm.alarmLevel" placeholder="请选择告警登记">
+                  <el-option
+                    v-for="dict in getStrDictOptions(DICT_TYPE.IOT_ALARM_REGISTRATION)"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+              </el-form-item>
 
               <div class="flex flex-col w-full">
                 <div class="border border-gray-200 dark:border-gray-600 rounded-md py-12px">
@@ -496,6 +509,7 @@ interface DeviceModelRuleVO {
   ruleAttributeId?: number
   ruleOperator?: string
   ruleValue?: string | number
+  alarmLevel?: string
 }
 
 const ruleLoading = ref(false)
@@ -508,6 +522,7 @@ const ruleQueryParams = reactive({
   fieldName: undefined as string | undefined,
   fieldRule: undefined as string | undefined,
   defaultValue: undefined as string | undefined,
+  alarmLevel: undefined as string | undefined,
   modelId: undefined as number | undefined,
 })
 const ruleQueryFormRef = ref()
@@ -582,6 +597,7 @@ const ruleForm = reactive<Partial<DeviceModelRuleVO>>({
   ruleAttributeId: undefined,
   ruleOperator: undefined,
   ruleValue: undefined,
+   alarmLevel: '',
 })
 
 const createRuleDialogVisible = ref(false)
@@ -667,6 +683,7 @@ const openRuleForm = async (row: DeviceModelRuleVO & { pointRulesVOList?: any[]
   ruleForm.fieldName = row.fieldName
   ruleForm.defaultValue = row.defaultValue
   ruleForm.modelId = row.modelId
+  ruleForm.alarmLevel = row.alarmLevel
 
   extraPointRules.value = []
 
@@ -756,6 +773,7 @@ const handleRuleSubmit = async () => {
       fieldName: ruleForm.fieldName,
       defaultValue: ruleForm.defaultValue,
       modelId: ruleForm.modelId,
+      alarmLevel: ruleForm.alarmLevel,
       pointRulesVOList,
     }