From 5ceeba89f3e6947fdcd71ae7815977c2b6c48c4a Mon Sep 17 00:00:00 2001
From: xh <11675084@qq.com>
Date: Thu, 23 Oct 2025 12:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/gas/alarmrule/AlarmRuleForm.vue |  5 +++--
 web/src/views/gas/alarmrule/index.vue         | 16 ++++++++++++----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/web/src/views/gas/alarmrule/AlarmRuleForm.vue b/web/src/views/gas/alarmrule/AlarmRuleForm.vue
index 62ab4b8..b62bda4 100644
--- a/web/src/views/gas/alarmrule/AlarmRuleForm.vue
+++ b/web/src/views/gas/alarmrule/AlarmRuleForm.vue
@@ -79,7 +79,7 @@
         </el-select>
       </el-form-item>
       <el-form-item label="排序" prop="sortOrder">
-        <el-input v-model="formData.sortOrder" placeholder="请输入排序" />
+        <el-input-number v-model="formData.sortOrder" :controls="false" placeholder="请输入排序" />
       </el-form-item>
       <el-form-item label="备注" prop="remark">
         <el-input v-model="formData.remark" placeholder="请输入备注" />
@@ -124,7 +124,7 @@ const formData = ref({
   min: undefined,
   max: undefined,
   direction: undefined,
-  sortOrder: undefined,
+  sortOrder: 0,
   remark: undefined
 })
 const formRules = reactive({
@@ -162,6 +162,7 @@ const submitForm = async () => {
   formLoading.value = true
   try {
     const data = formData.value as unknown as AlarmRule
+
     if (formType.value === 'create') {
       const res=await AlarmRuleApi.createAlarmRule(data)
       if(res.code===0){
diff --git a/web/src/views/gas/alarmrule/index.vue b/web/src/views/gas/alarmrule/index.vue
index d7e7da8..23c7139 100644
--- a/web/src/views/gas/alarmrule/index.vue
+++ b/web/src/views/gas/alarmrule/index.vue
@@ -98,11 +98,19 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="警报名称" align="center" prop="alarmName" />
-      <el-table-column label="警报方式/级别" align="center" prop="alarmLevel" />
+      <!-- <el-table-column label="警报名称" align="center" prop="alarmName" />
+      <el-table-column label="警报方式/级别" align="center" prop="alarmLevel" >
+        <template #default="scope">
+          {{getDictLabel(DICT_TYPE.HAND_DETECTOR_ALARM_LEVEL, scope.row.alarmLevel)}}
+        </template>
+      </el-table-column> -->
       <el-table-column label="触发值（小）" align="center" prop="min" />
       <el-table-column label="触发值（大）" align="center" prop="max" />
-      <el-table-column label="最值方向" align="center" prop="direction" />
+      <el-table-column label="最值方向" align="center" prop="direction" >
+        <template #default="scope">
+          {{getDictLabel(DICT_TYPE.HAND_DETECTOR_VALUE_DIRECTION, scope.row.direction)}}
+        </template>
+      </el-table-column>
       <el-table-column label="排序" align="center" prop="sortOrder" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column
@@ -158,7 +166,7 @@ import download from '@/utils/download'
 import { AlarmRuleApi, AlarmRule } from '@/api/gas/alarmrule'
 import AlarmRuleForm from './AlarmRuleForm.vue'
 import { useHandDetectorStore } from '@/store/modules/handDetector'
-
+import { DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict'
 /** GAS警报规则 列表 */
 defineOptions({ name: 'AlarmRule' })