diff --git a/web/src/views/gas/batteryAlarm/HandAlarmForm.vue b/web/src/views/gas/batteryAlarm/HandAlarmForm.vue
new file mode 100644
index 0000000..ce69a60
--- /dev/null
+++ b/web/src/views/gas/batteryAlarm/HandAlarmForm.vue
@@ -0,0 +1,249 @@
+<template>
+  <Dialog :title="dialogTitle" :scroll="true" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="120px"
+      v-loading="formLoading"
+    >
+      <el-form-item label="持有人" prop="detectorId">
+        <el-select
+          v-model="formData.detectorId"
+          placeholder="请选择持有人"
+          @change="handleDetectorIdChange"
+        >
+          <el-option
+            v-for="item in props.handDetector"
+            :key="item.id"
+            :label="item.name"
+            :value="Number(item.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="设备编号" prop="sn">
+        <el-input v-model="formData.sn" placeholder="请输入设备编号" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="报警类型" prop="alarmType">
+        <el-select
+          v-model="formData.alarmType"
+          @change="handleAlarmTypeChange"
+          placeholder="请选择报警类型"
+        >
+          <el-option
+            v-for="item in props.alarmTypes"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="警报方式/级别" prop="alarmLevel">
+        <el-select v-model="formData.alarmLevel" placeholder="请选择警报方式/级别" :disabled="true">
+          <el-option
+            v-for="item in getIntDictOptions(DICT_TYPE.HAND_DETECTOR_ALARM_LEVEL)"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="气体类型" prop="gasType">
+        <el-select
+          v-model="formData.gasType"
+          placeholder="请选择气体类型"
+          @change="handleGasTypeChange"
+        >
+          <el-option
+            v-for="item in props.gasTypes"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="单位" prop="unit">
+        <el-input v-model="formData.unit" placeholder="请输入单位" :disabled="true" />
+      </el-form-item>
+      <el-form-item label="首报值" prop="vAlarmFirst">
+        <el-input-number v-model="formData.vAlarmFirst" />
+      </el-form-item>
+      <el-form-item label="最值" prop="vAlarmMaximum">
+        <el-input-number v-model="formData.vAlarmMaximum" />
+      </el-form-item>
+      <el-form-item label="开始时间" prop="tAlarmStart">
+        <el-date-picker
+          v-model="formData.tAlarmStart"
+          type="date"
+          value-format="x"
+          placeholder="选择开始时间"
+        />
+      </el-form-item>
+      <el-form-item label="结束时间" prop="tAlarmEnd">
+        <el-date-picker
+          v-model="formData.tAlarmEnd"
+          type="date"
+          value-format="x"
+          placeholder="选择结束时间"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-radio-group v-model="formData.status">
+          <el-radio
+            v-for="item in getIntDictOptions(DICT_TYPE.HAND_DETECTOR_HANDLE_STATUS)"
+            :key="item.value"
+            :value="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" placeholder="请输入备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button @click="submitForm" type="primary" :disabled="formLoading">确 定</el-button>
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { HandAlarmApi, HandAlarm } from '@/api/gas/handalarm'
+import { getIntDictOptions, DICT_TYPE } from '@/utils/dict'
+import { HandDetector } from '@/api/gas/handdetector'
+import { AlarmType } from '@/api/gas/alarmtype'
+import { Type } from '@/api/gas/gastype'
+/** GAS手持探测器警报 表单 */
+defineOptions({ name: 'HandAlarmForm' })
+
+const { t } = useI18n() // 国际化
+const message = useMessage() // 消息弹窗
+
+const dialogVisible = ref(false) // 弹窗的是否展示
+const dialogTitle = ref('') // 弹窗的标题
+const formLoading = ref(false) // 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formType = ref('') // 表单的类型：create - 新增；update - 修改
+const props = defineProps({
+  handDetector: {
+    type: Array as PropType<HandDetector[]>,
+    required: true
+  },
+  alarmTypes: {
+    type: Array as PropType<AlarmType[]>,
+    required: true
+  },
+  gasTypes: {
+    type: Array as PropType<Type[]>,
+    required: true
+  }
+})
+const formData = ref({
+  id: undefined,
+  detectorId: undefined,
+  sn: '',
+  alarmType: undefined,
+  alarmLevel: 0,
+  gasType: '',
+  unit: '',
+  location: undefined,
+  picX: undefined,
+  picY: undefined,
+  vAlarmFirst: undefined,
+  vAlarmMaximum: undefined,
+  tAlarmStart: undefined,
+  tAlarmEnd: undefined,
+  status: 0,
+  remark: undefined
+})
+const formRules = reactive({
+  detectorId: [{ required: true, message: '持有人不能为空', trigger: 'change' }],
+  alarmType: [{ required: true, message: '报警类型不能为空', trigger: 'change' }],
+  gasType: [{ required: true, message: '气体类型不能为空', trigger: 'change' }],
+  unit: [{ required: true, message: '单位不能为空', trigger: 'blur' }],
+  remark: [{ required: true, message: '备注不能为空', trigger: 'blur' }]
+})
+const formRef = ref() // 表单 Ref
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  dialogVisible.value = true
+  dialogTitle.value = t('action.' + type)
+  formType.value = type
+  resetForm()
+  // 修改时，设置数据
+  if (id) {
+    formLoading.value = true
+    try {
+      formData.value = await HandAlarmApi.getHandAlarm(id)
+    } finally {
+      formLoading.value = false
+    }
+  }
+}
+defineExpose({ open }) // 提供 open 方法，用于打开弹窗
+
+/** 提交表单 */
+const emit = defineEmits(['success']) // 定义 success 事件，用于操作成功后的回调
+const submitForm = async () => {
+  // 校验表单
+  await formRef.value.validate()
+  // 提交请求
+  formLoading.value = true
+  try {
+    const data = formData.value as unknown as HandAlarm
+    if (formType.value === 'create') {
+      await HandAlarmApi.createHandAlarm(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await HandAlarmApi.updateHandAlarm(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    detectorId: undefined,
+    sn: '',
+    alarmType: undefined,
+    alarmLevel: 0,
+    gasType: '',
+    unit: '',
+    location: undefined,
+    picX: undefined,
+    picY: undefined,
+    vAlarmFirst: undefined,
+    vAlarmMaximum: undefined,
+    tAlarmStart: undefined,
+    tAlarmEnd: undefined,
+    status: 0,
+    remark: undefined
+  }
+  formRef.value?.resetFields()
+}
+
+/** 气体类型改变 */
+const handleGasTypeChange = (value: number) => {
+  formData.value.unit = props.gasTypes.find((item) => item.id === value)?.unit || ''
+}
+
+/** 手持表id改变 */
+const handleDetectorIdChange = (value: number) => {
+  formData.value.sn = props.handDetector.find((item) => item.id === value)?.sn || ''
+}
+
+/** 报警类型改变 */
+const handleAlarmTypeChange = (value: number) => {
+  formData.value.alarmLevel = props.alarmTypes.find((item) => item.id === value)?.level || 0
+  formData.value.gasType = props.gasTypes.find((item) => item.id === value)?.name || ''
+  formData.value.unit = props.gasTypes.find((item) => item.id === value)?.unit || ''
+}
+</script>
diff --git a/web/src/views/gas/batteryAlarm/index.vue b/web/src/views/gas/batteryAlarm/index.vue
new file mode 100644
index 0000000..23c6671
--- /dev/null
+++ b/web/src/views/gas/batteryAlarm/index.vue
@@ -0,0 +1,359 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="120px"
+    >
+      <el-form-item label="持有人" prop="detectorId">
+        <el-select
+          v-model="queryParams.detectorId"
+          placeholder="请选择持有人"
+          clearable
+          filterable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        >
+          <el-option
+            v-for="item in handDetectorStore.getHandDetectorList"
+            :key="item.id"
+            :label="item.name"
+            :value="String(item.id)"
+          />
+        </el-select>
+      </el-form-item>
+      <!-- <el-form-item label="持有人name" prop="name">
+        <el-select
+          v-model="queryParams.name"
+          placeholder="请选择持有人"
+          clearable
+          filterable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        >
+          <el-option
+            v-for="item in handDetectorStore.getHandDetectorList"
+            :key="item.id"
+            :label="item.name"
+            :value="String(item.name)"
+          />
+        </el-select>
+      </el-form-item> -->
+
+      <el-form-item label="设备编号" prop="sn">
+        <el-input
+          v-model="queryParams.sn"
+          placeholder="请输入设备编号"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+
+      <!-- 气体类型 -->
+      <el-form-item label="气体类型" prop="gasType">
+        <el-select
+          v-model="queryParams.gasType"
+          placeholder="请选择气体类型"
+          clearable
+          class="!w-240px"
+        >
+          <el-option
+            v-for="item in handDetectorStore.getGasTypes"
+            :key="item.id"
+            :label="item.chemical"
+            :value="String(item.chemical)"
+          />
+        </el-select>
+      </el-form-item>
+
+      <!-- <el-form-item label="开始时间" prop="tAlarmStart">
+        <el-date-picker
+          v-model="queryParams.tAlarmStart"
+          value-format="YYYY-MM-DD"
+          type="date"
+          placeholder="选择开始时间"
+          clearable
+          class="!w-240px"
+        />
+      </el-form-item>
+      <el-form-item label="结束时间" prop="tAlarmEnd">
+        <el-date-picker
+          v-model="queryParams.tAlarmEnd"
+          value-format="YYYY-MM-DD"
+          type="date"
+          placeholder="选择结束时间"
+          clearable
+          class="!w-240px"
+        />
+      </el-form-item> -->
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择状态" clearable class="!w-240px">
+          <el-option
+            v-for="item in getIntDictOptions(DICT_TYPE.HAND_DETECTOR_HANDLE_STATUS)"
+            :key="item.value"
+            :label="item.label"
+            :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker
+          v-model="queryParams.createTime"
+          value-format="YYYY-MM-DD HH:mm:ss"
+          type="daterange"
+          start-placeholder="开始日期"
+          end-placeholder="结束日期"
+          :default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]"
+          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>
+        <!-- <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
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['gas:hand-alarm:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+        <el-button
+          type="danger"
+          plain
+          :disabled="isEmpty(checkedIds)"
+          @click="handleDeleteBatch"
+          v-hasPermi="['gas:hand-alarm:delete']"
+        >
+          <Icon icon="ep:delete" class="mr-5px" /> 批量删除
+        </el-button>
+      </el-form-item>
+    </el-form>
+  </ContentWrap>
+
+  <!-- 列表 -->
+  <ContentWrap>
+    <el-table
+      row-key="id"
+      v-loading="loading"
+      :data="list"
+      :stripe="true"
+      :show-overflow-tooltip="true"
+      @selection-change="handleRowCheckboxChange"
+    >
+      <el-table-column type="selection" width="55" />
+      <el-table-column label="持有人" align="center" prop="name">
+        <!-- <template #default="scope">
+          {{
+            handDetectorStore.getHandDetectorList.find((item) => item.id === scope.row.detectorId)
+              ?.name
+          }}
+        </template> -->
+      </el-table-column>
+      <el-table-column label="设备编号" align="center" prop="sn" />
+      <el-table-column label="报警类型" align="center" prop="alarmLevel" width="90px">
+        <template #default="">
+          低电量预警
+        </template>
+      </el-table-column>
+      <el-table-column
+        label="气体类型"
+        align="center"
+        prop="gasType"
+        width="80px"
+      ></el-table-column>
+ 
+      <el-table-column
+        label="开始时间"
+        align="center"
+        prop="talarmStart"
+        :formatter="dateFormatter"
+        width="160px"
+      />
+      <el-table-column
+        label="结束时间"
+        align="center"
+        prop="talarmEnd"
+        :formatter="dateFormatter"
+        width="160px"
+      />
+      <el-table-column label="状态" align="center" prop="status" width="80px">
+        <template #default="scope">
+          {{ getDictLabel(DICT_TYPE.HAND_DETECTOR_HANDLE_STATUS, scope.row.status) }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column label="备注" align="center" prop="remark" /> -->
+      <!-- <el-table-column
+        label="创建时间"
+        align="center"
+        prop="createTime"
+        :formatter="dateFormatter"
+        width="180px"
+      /> -->
+      <el-table-column label="操作" align="center" width="140px">
+        <template #default="scope">
+
+          <el-button
+            link
+            type="primary"
+            @click="openForm('update', scope.row.id)"
+            v-hasPermi="['gas:hand-alarm:update']"
+          >
+            编辑
+          </el-button> 
+          <!-- <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['gas:hand-alarm:delete']"
+          >
+            删除
+          </el-button> -->
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页 -->
+    <Pagination
+      :total="total"
+      v-model:page="queryParams.pageNo"
+      v-model:limit="queryParams.pageSize"
+      @pagination="getList"
+    />
+  </ContentWrap>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <HandAlarmForm
+    ref="formRef"
+    @success="getList"
+    :handDetector="handDetectorStore.getHandDetectorList"
+    :gasTypes="handDetectorStore.getGasTypes"
+    :alarmTypes="handDetectorStore.getAlarmTypes"
+  />
+</template>
+
+<script setup lang="ts">
+import { isEmpty } from '@/utils/is'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { HandAlarmApi, HandAlarm } from '@/api/gas/handalarm'
+import HandAlarmForm from './HandAlarmForm.vue'
+import { useHandDetectorStore } from '@/store/modules/handDetector'
+import { DICT_TYPE, getIntDictOptions, getDictLabel } from '@/utils/dict'
+/** 手持探测器警报 列表 */
+defineOptions({ name: 'HandAlarm' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+const handDetectorStore = useHandDetectorStore()
+const loading = ref(true) // 列表的加载中
+const list = ref<HandAlarm[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  alarmType:2,// 报警类型 1：气体报警 2：电量报警 3：离线报警
+  detectorId: undefined,
+  name: undefined,
+  sn: undefined,
+
+  alarmLevel: undefined,
+  gasType: undefined,
+  unit: undefined,
+  location: undefined,
+  picX: undefined,
+  picY: undefined,
+  vAlarmFirst: undefined,
+  vAlarmMaximum: undefined,
+  tAlarmStart: undefined,
+  tAlarmEnd: undefined,
+  status: undefined,
+  remark: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    const data = await HandAlarmApi.getHandAlarmPage(queryParams)
+    list.value = data.list
+    total.value = data.total
+  } finally {
+    loading.value = false
+  }
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNo = 1
+  getList()
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value.resetFields()
+  handleQuery()
+}
+
+/** 添加/修改操作 */
+const formRef = ref()
+const openForm = (type: string, id?: number) => {
+  formRef.value.open(type, id)
+}
+
+/** 批量删除GAS手持探测器警报 */
+const handleDeleteBatch = async () => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    await HandAlarmApi.deleteHandAlarmList(checkedIds.value)
+    message.success(t('common.delSuccess'))
+    await getList()
+  } catch {}
+}
+
+const checkedIds = ref<number[]>([])
+const handleRowCheckboxChange = (records: HandAlarm[]) => {
+  checkedIds.value = records.map((item) => item.id)
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await HandAlarmApi.exportHandAlarm(queryParams)
+    download.excel(data, '手持探测器警报.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(() => {
+  getList()
+  handDetectorStore.getAllHandDetector()
+  handDetectorStore.getAllAlarmTypes()
+  handDetectorStore.getAllGasTypes()
+})
+</script>