From 3f0cd9e1efa1e435311bdecebf7e91f0dab5d2a4 Mon Sep 17 00:00:00 2001
From: xh <11675084@qq.com>
Date: Fri, 17 Oct 2025 18:29:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96-=E5=BE=85=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BD=8D=E7=BD=AE=EF=BC=8C=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/gas/fencealarm/index.vue | 17 +++++++++--------
 web/src/views/gas/handalarm/index.vue  | 12 ++++++++----
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/web/src/views/gas/fencealarm/index.vue b/web/src/views/gas/fencealarm/index.vue
index bf82a99..9c8f1d5 100644
--- a/web/src/views/gas/fencealarm/index.vue
+++ b/web/src/views/gas/fencealarm/index.vue
@@ -8,9 +8,9 @@
       :inline="true"
       label-width="120px"
     >
-      <el-form-item label="持有人" prop="detectorId">
+      <el-form-item label="持有人" prop="name">
         <el-select
-          v-model="queryParams.detectorId"
+          v-model="queryParams.name"
           placeholder="请选择持有人"
           clearable
           @keyup.enter="handleQuery"
@@ -24,7 +24,7 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item label="围栏" prop="fenceId">
+      <!-- <el-form-item label="围栏" prop="fenceId">
         <el-select
           v-model="queryParams.fenceId"
           placeholder="请选择围栏"
@@ -39,7 +39,7 @@
             :value="item.id"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
       <el-form-item label="报警类型" prop="type">
         <el-select
           v-model="queryParams.type"
@@ -129,7 +129,7 @@
       @selection-change="handleRowCheckboxChange"
     >
       <el-table-column type="selection" width="55" />
-      <el-table-column label="持有人" align="center" prop="detectorId">
+      <el-table-column label="持有人" align="center" prop="name">
         <template #default="scope">
           {{
             handDetectorStore.getHandDetectorList.find((item) => item.id === scope.row.detectorId)
@@ -137,14 +137,15 @@
           }}
         </template>
       </el-table-column>
-      <el-table-column label="围栏" align="center" prop="fenceId">
+      <!-- <el-table-column label="围栏" align="center" prop="fenceId">
         <template #default="scope">
           {{ handDetectorStore.getFences.find((item) => item.id === scope.row.fenceId)?.name }}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column label="报警类型" align="center" prop="type">
         <template #default="scope">
-          {{ handDetectorStore.getAlarmTypes.find((item) => item.id === scope.row.type)?.name }}
+          <!-- {{ handDetectorStore.getAlarmTypes }} -->
+          {{ handDetectorStore.getAlarmTypes.find((item) => item.level === scope.row.type)?.name }}
         </template>
       </el-table-column>
       <el-table-column label="超出围栏米数" align="center" prop="distance" />
diff --git a/web/src/views/gas/handalarm/index.vue b/web/src/views/gas/handalarm/index.vue
index be2b359..5bc9ca5 100644
--- a/web/src/views/gas/handalarm/index.vue
+++ b/web/src/views/gas/handalarm/index.vue
@@ -112,14 +112,14 @@
       <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>
-        <el-button
+        <!-- <el-button
           type="primary"
           plain
           @click="openForm('create')"
           v-hasPermi="['gas:hand-alarm:create']"
         >
           <Icon icon="ep:plus" class="mr-5px" /> 新增
-        </el-button>
+        </el-button> -->
         <el-button
           type="success"
           plain
@@ -206,6 +206,10 @@
       />
       <el-table-column label="操作" align="center" min-width="120px">
         <template #default="scope">
+          <el-button link type="primary" @click="openForm('update', scope.row.id)">
+            查看位置
+          </el-button>
+
           <el-button
             link
             type="primary"
@@ -214,14 +218,14 @@
           >
             编辑
           </el-button>
-          <el-button
+          <!-- <el-button
             link
             type="danger"
             @click="handleDelete(scope.row.id)"
             v-hasPermi="['gas:hand-alarm:delete']"
           >
             删除
-          </el-button>
+          </el-button> -->
         </template>
       </el-table-column>
     </el-table>