From 972847aa6b1e3517dde56aec02ce17c5f9fe1b7c Mon Sep 17 00:00:00 2001
From: xh <11675084@qq.com>
Date: Wed, 10 Dec 2025 15:24:15 +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/api/gas/alarmmessage/index.ts    |  6 ++--
 web/src/views/gas/alarmmessage/index.vue | 48 +++++++++++++++++++++++---------
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/web/src/api/gas/alarmmessage/index.ts b/web/src/api/gas/alarmmessage/index.ts
index c28a3b4..4190aaa 100644
--- a/web/src/api/gas/alarmmessage/index.ts
+++ b/web/src/api/gas/alarmmessage/index.ts
@@ -4,7 +4,7 @@ import request from '@/config/axios'
 export interface AlarmMessage {
   id?: number // 主键ID
   detectorId?: number // 手持表id
-  name?: string // 持有人名称
+  holderName?: string // 持有人名称
   sn?: string // 设备编号
   message?: string // 消息
   pushSnList?: string // 推送设备sn，逗号分割
@@ -17,7 +17,9 @@ export interface AlarmMessage {
 export const AlarmMessageApi = {
   // 查询GAS手持探测器推送分页
   getAlarmMessagePage: async (params: any) => {
-    return await request.get({ url: `/gas/alarm-message/page`, params })
+    
+    return await request.get({ url: `/gas/tdengine/alarmMessagePage`, params })
+    // return await request.get({ url: `/gas/alarm-message/page`, params })
   },
 
   // 查询GAS手持探测器推送详情
diff --git a/web/src/views/gas/alarmmessage/index.vue b/web/src/views/gas/alarmmessage/index.vue
index 35844f3..61bdf22 100644
--- a/web/src/views/gas/alarmmessage/index.vue
+++ b/web/src/views/gas/alarmmessage/index.vue
@@ -8,9 +8,9 @@
       :inline="true"
       label-width="68px"
     >
-      <el-form-item label="持有人" prop="name">
+      <el-form-item label="持有人" prop="holderName">
         <el-input
-          v-model="queryParams.name"
+          v-model="queryParams.holderName"
           placeholder="请输入持有人名称"
           clearable
           @keyup.enter="handleQuery"
@@ -37,7 +37,6 @@
         />
       </el-form-item> -->
 
-
       <el-form-item label="部门" prop="deptId">
         <el-cascader
           class="!w-240px"
@@ -54,7 +53,7 @@
         />
       </el-form-item>
 
-      <el-form-item label="创建时间" prop="createTime">
+      <!-- <el-form-item label="创建时间" prop="createTime">
         <el-date-picker
           v-model="queryParams.createTime"
           value-format="YYYY-MM-DD HH:mm:ss"
@@ -64,7 +63,28 @@
           :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
           class="!w-240px"
         />
+      </el-form-item> -->
+      <el-form-item label="开始时间" prop="startTime">
+        <el-date-picker
+          v-model="queryParams.startTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="datetime"
+          placeholder="选择开始时间"
+          clearable
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="结束时间" prop="endTime">
+        <el-date-picker
+          v-model="queryParams.endTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="datetime"
+          placeholder="选择结束时间"
+          clearable
+          class="!w-240px"
+        />
       </el-form-item>
+
       <el-form-item>
         <el-button @click="handleQuery"><Icon icon="ep:search" class="mr-5px" /> 搜索</el-button>
         <el-button @click="resetQuery"><Icon icon="ep:refresh" class="mr-5px" /> 重置</el-button>
@@ -85,7 +105,7 @@
         >
           <Icon icon="ep:download" class="mr-5px" /> 导出
         </el-button>
-        <el-button
+        <!-- <el-button
           type="danger"
           plain
           :disabled="isEmpty(checkedIds)"
@@ -93,7 +113,7 @@
           v-hasPermi="['gas:alarm-message:delete']"
         >
           <Icon icon="ep:delete" class="mr-5px" /> 批量删除
-        </el-button>
+        </el-button> -->
       </el-form-item>
     </el-form>
   </ContentWrap>
@@ -116,8 +136,7 @@
       <el-table-column label="消息" align="center" prop="message" />
       <el-table-column label="接收设备sn" align="center" prop="pushSnList" />
       <el-table-column label="备注" align="center" prop="remark" />
-      <el-table-column label="部门" align="center" prop="deptName">
-      </el-table-column>
+      <el-table-column label="部门" align="center" prop="deptName"> </el-table-column>
       <el-table-column
         label="创建时间"
         align="center"
@@ -130,14 +149,14 @@
           <el-button link type="primary" @click="openForm('detail', scope.row.id)">
             详情
           </el-button>
-          <el-button
+          <!-- <el-button
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
             v-hasPermi="['gas:alarm-message:delete']"
           >
             删除
-          </el-button>
+          </el-button> -->
         </template>
       </el-table-column>
     </el-table>
@@ -175,13 +194,14 @@ const queryParams = reactive({
   pageNo: 1,
   pageSize: 10,
   detectorId: undefined,
-  name: undefined,
+  holderName: undefined,
   sn: undefined,
   message: undefined,
   pushSnList: undefined,
   remark: undefined,
   deptId: undefined,
-  createTime: []
+  startTime: undefined,
+  endTime: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -202,7 +222,9 @@ const getList = async () => {
     const data = await AlarmMessageApi.getAlarmMessagePage(queryParams)
     list.value = data.list.map((item) => ({
       ...item,
-      deptName: item.deptId ? deptList.value.find((dept) => dept.id === item.deptId)?.name || '-' : '-'
+      deptName: item.deptId
+        ? deptList.value.find((dept) => dept.id === item.deptId)?.name || '-'
+        : '-'
     }))
     total.value = data.total
   } finally {