From b0174bd52b7c91f8b737ce841afc11f4b79ca5a5 Mon Sep 17 00:00:00 2001
From: xh <11675084@qq.com>
Date: Wed, 10 Dec 2025 17:54:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/gas/alarmmessage/AlarmMessageForm.vue | 14 +++++++-------
 web/src/views/gas/alarmmessage/index.vue            | 10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/web/src/views/gas/alarmmessage/AlarmMessageForm.vue b/web/src/views/gas/alarmmessage/AlarmMessageForm.vue
index d59cd01..c6e1f33 100644
--- a/web/src/views/gas/alarmmessage/AlarmMessageForm.vue
+++ b/web/src/views/gas/alarmmessage/AlarmMessageForm.vue
@@ -9,7 +9,7 @@
     >
  
       <el-form-item label="持有人名称" prop="name">
-        <el-input v-model="formData.name" placeholder="持有人名称" />
+        <el-input v-model="formData.holderName" placeholder="持有人名称" />
       </el-form-item>
       <el-form-item label="设备编号" prop="sn">
         <el-input v-model="formData.sn" placeholder="设备编号" />
@@ -55,7 +55,7 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
 const formData = ref<AlarmMessage>({
   id: undefined,
   detectorId: undefined,
-  name: undefined,
+  holderName: undefined,
   sn: undefined,
   message: undefined,
   pushSnList: undefined,
@@ -74,24 +74,24 @@ function getDeptList() {
 }
 
 /** 打开弹窗 */
-const open = async (type: string, id?: number) => {
+const open = async (type: string, row: AlarmMessage) => {
   dialogVisible.value = true
   dialogTitle.value = t('action.' + type)
   formType.value = type
   resetForm()
   await getDeptList()
   // 修改时，设置数据
-  if (id) {
+
     formLoading.value = true
     try {
-      formData.value = await AlarmMessageApi.getAlarmMessage(id)
+      formData.value = row
       formData.value.deptName = formData.value.deptId
         ? deptList.value.find((dept) => dept.id === formData.value.deptId)?.name || '-'
         : '-'
     } finally {
       formLoading.value = false
     }
-  }
+  
 }
 defineExpose({ open }) // 提供 open 方法，用于打开弹窗
 
@@ -124,7 +124,7 @@ const resetForm = () => {
   formData.value = {
     id: undefined,
     detectorId: undefined,
-    name: undefined,
+    holderName: undefined,
     sn: undefined,
     message: undefined,
     pushSnList: undefined,
diff --git a/web/src/views/gas/alarmmessage/index.vue b/web/src/views/gas/alarmmessage/index.vue
index 61bdf22..4c81692 100644
--- a/web/src/views/gas/alarmmessage/index.vue
+++ b/web/src/views/gas/alarmmessage/index.vue
@@ -131,7 +131,7 @@
       <el-table-column type="selection" width="55" />
       <!-- <el-table-column label="主键ID" align="center" prop="id" /> -->
       <!-- <el-table-column label="手持表id" align="center" prop="detectorId" /> -->
-      <el-table-column label="持有人名称" align="center" prop="name" />
+      <el-table-column label="持有人名称" align="center" prop="holderName" />
       <el-table-column label="设备编号" align="center" prop="sn" />
       <el-table-column label="消息" align="center" prop="message" />
       <el-table-column label="接收设备sn" align="center" prop="pushSnList" />
@@ -140,13 +140,13 @@
       <el-table-column
         label="创建时间"
         align="center"
-        prop="createTime"
+        prop="ts"
         :formatter="dateFormatter"
         width="160px"
       />
       <el-table-column label="操作" align="center" width="120px">
         <template #default="scope">
-          <el-button link type="primary" @click="openForm('detail', scope.row.id)">
+          <el-button link type="primary" @click="openForm('detail', scope.row)">
             详情
           </el-button>
           <!-- <el-button
@@ -246,8 +246,8 @@ const resetQuery = () => {
 
 /** 添加/修改操作 */
 const formRef = ref()
-const openForm = (type: string, id?: number) => {
-  formRef.value.open(type, id)
+const openForm = (type: string, row) => {
+  formRef.value.open(type, row)
 }
 
 /** 删除按钮操作 */