From 1c0191d23a9a8ef564bc5da6863bc63684c948cb Mon Sep 17 00:00:00 2001
From: xh <11675084@qq.com>
Date: Thu, 4 Dec 2025 15:34:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E8=AD=A6=E6=8E=A8=E9=80=81=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/api/gas/alarmmessage/index.ts              |  52 ++++
 .../views/HandDevice/Home/components/TopPanel.vue  |   2 +-
 .../views/gas/alarmmessage/AlarmMessageForm.vue    | 136 ++++++++++
 web/src/views/gas/alarmmessage/index.vue           | 280 +++++++++++++++++++++
 web/src/views/infra/codegen/PreviewCode.vue        |  14 +-
 5 files changed, 476 insertions(+), 8 deletions(-)
 create mode 100644 web/src/api/gas/alarmmessage/index.ts
 create mode 100644 web/src/views/gas/alarmmessage/AlarmMessageForm.vue
 create mode 100644 web/src/views/gas/alarmmessage/index.vue

diff --git a/web/src/api/gas/alarmmessage/index.ts b/web/src/api/gas/alarmmessage/index.ts
new file mode 100644
index 0000000..3c9eb79
--- /dev/null
+++ b/web/src/api/gas/alarmmessage/index.ts
@@ -0,0 +1,52 @@
+import request from '@/config/axios'
+import type { Dayjs } from 'dayjs';
+
+/** GAS手持探测器推送信息 */
+export interface AlarmMessage {
+          id: number; // 主键ID
+          detectorId: number; // 手持表id
+          name: string; // 持有人名称
+          sn: string; // 设备编号
+          message: string; // 消息
+          pushSnList: string; // 推送设备sn，逗号分割
+          remark: string; // 备注
+          deptId: number; // 部门id
+  }
+
+// GAS手持探测器推送 API
+export const AlarmMessageApi = {
+  // 查询GAS手持探测器推送分页
+  getAlarmMessagePage: async (params: any) => {
+    return await request.get({ url: `/gas/alarm-message/page`, params })
+  },
+
+  // 查询GAS手持探测器推送详情
+  getAlarmMessage: async (id: number) => {
+    return await request.get({ url: `/gas/alarm-message/get?id=` + id })
+  },
+
+  // 新增GAS手持探测器推送
+  createAlarmMessage: async (data: AlarmMessage) => {
+    return await request.post({ url: `/gas/alarm-message/create`, data })
+  },
+
+  // 修改GAS手持探测器推送
+  updateAlarmMessage: async (data: AlarmMessage) => {
+    return await request.put({ url: `/gas/alarm-message/update`, data })
+  },
+
+  // 删除GAS手持探测器推送
+  deleteAlarmMessage: async (id: number) => {
+    return await request.delete({ url: `/gas/alarm-message/delete?id=` + id })
+  },
+
+  /** 批量删除GAS手持探测器推送 */
+  deleteAlarmMessageList: async (ids: number[]) => {
+    return await request.delete({ url: `/gas/alarm-message/delete-list?ids=${ids.join(',')}` })
+  },
+
+  // 导出GAS手持探测器推送 Excel
+  exportAlarmMessage: async (params) => {
+    return await request.download({ url: `/gas/alarm-message/export-excel`, params })
+  }
+}
\ No newline at end of file
diff --git a/web/src/views/HandDevice/Home/components/TopPanel.vue b/web/src/views/HandDevice/Home/components/TopPanel.vue
index ff95954..f9275bd 100644
--- a/web/src/views/HandDevice/Home/components/TopPanel.vue
+++ b/web/src/views/HandDevice/Home/components/TopPanel.vue
@@ -27,7 +27,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, computed,defineModel } from 'vue'
+import { ref, computed } from 'vue'
 import { useAppStore } from '@/store/modules/app'
 const appStore = useAppStore()
 var props = defineProps({
diff --git a/web/src/views/gas/alarmmessage/AlarmMessageForm.vue b/web/src/views/gas/alarmmessage/AlarmMessageForm.vue
new file mode 100644
index 0000000..f8c123e
--- /dev/null
+++ b/web/src/views/gas/alarmmessage/AlarmMessageForm.vue
@@ -0,0 +1,136 @@
+<template>
+  <Dialog :title="dialogTitle" v-model="dialogVisible">
+    <el-form
+      ref="formRef"
+      :model="formData"
+      :rules="formRules"
+      label-width="100px"
+      v-loading="formLoading"
+    >
+ 
+      <el-form-item label="持有人名称" prop="name">
+        <el-input v-model="formData.name" placeholder="持有人名称" />
+      </el-form-item>
+      <el-form-item label="设备编号" prop="sn">
+        <el-input v-model="formData.sn" placeholder="设备编号" />
+      </el-form-item>
+      <el-form-item label="消息" prop="message">
+        <el-input v-model="formData.message" type="textarea" autosize placeholder="消息" />
+      </el-form-item>
+      <el-form-item label="接收设备sn" prop="pushSnList">
+        <el-input v-model="formData.pushSnList" type="textarea" autosize placeholder="推送设备sn" />
+      </el-form-item>
+      <el-form-item label="部门">
+        <el-input v-model="formData.deptName" placeholder="部门" />
+      </el-form-item>
+      <el-form-item label="备注" prop="remark">
+        <el-input v-model="formData.remark" type="textarea" autosize placeholder="备注" />
+      </el-form-item>
+    </el-form>
+    <template #footer>
+      <el-button
+        v-if="formType !== 'detail'"
+        @click="submitForm"
+        type="primary"
+        :disabled="formLoading"
+        >确 定</el-button
+      >
+      <el-button @click="dialogVisible = false">取 消</el-button>
+    </template>
+  </Dialog>
+</template>
+<script setup lang="ts">
+import { AlarmMessageApi, AlarmMessage } from '@/api/gas/alarmmessage'
+import { DeptVO, getSimpleDeptList } from '@/api/system/dept'
+/** GAS手持探测器推送 表单 */
+defineOptions({ name: 'AlarmMessageForm' })
+
+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 formData = ref({
+  id: undefined,
+  detectorId: undefined,
+  name: undefined,
+  sn: undefined,
+  message: undefined,
+  pushSnList: undefined,
+  remark: undefined,
+  deptId: undefined,
+  deptName: undefined
+})
+const formRules = reactive({})
+const formRef = ref() // 表单 Ref
+
+const deptList = ref<DeptVO[]>([]) // 部门列表
+function getDeptList() {
+  return getSimpleDeptList().then((res) => {
+    deptList.value = res
+  })
+}
+
+/** 打开弹窗 */
+const open = async (type: string, id?: number) => {
+  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.deptName = formData.value.deptId
+        ? deptList.value.find((dept) => dept.id === formData.value.deptId)?.name || '-'
+        : '-'
+    } 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 AlarmMessage
+    if (formType.value === 'create') {
+      await AlarmMessageApi.createAlarmMessage(data)
+      message.success(t('common.createSuccess'))
+    } else {
+      await AlarmMessageApi.updateAlarmMessage(data)
+      message.success(t('common.updateSuccess'))
+    }
+    dialogVisible.value = false
+    // 发送操作成功的事件
+    emit('success')
+  } finally {
+    formLoading.value = false
+  }
+}
+
+/** 重置表单 */
+const resetForm = () => {
+  formData.value = {
+    id: undefined,
+    detectorId: undefined,
+    name: undefined,
+    sn: undefined,
+    message: undefined,
+    pushSnList: undefined,
+    remark: undefined,
+    deptId: undefined
+  }
+  formRef.value?.resetFields()
+}
+</script>
diff --git a/web/src/views/gas/alarmmessage/index.vue b/web/src/views/gas/alarmmessage/index.vue
new file mode 100644
index 0000000..17bbc21
--- /dev/null
+++ b/web/src/views/gas/alarmmessage/index.vue
@@ -0,0 +1,280 @@
+<template>
+  <ContentWrap>
+    <!-- 搜索工作栏 -->
+    <el-form
+      class="-mb-15px"
+      :model="queryParams"
+      ref="queryFormRef"
+      :inline="true"
+      label-width="68px"
+    >
+      <el-form-item label="持有人" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入持有人名称"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </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="设备sn" prop="pushSnList">
+        <el-input
+          v-model="queryParams.pushSnList"
+          placeholder="请输入设备sn"
+          clearable
+          @keyup.enter="handleQuery"
+          class="!w-240px"
+        />
+      </el-form-item>
+
+
+      <el-form-item label="部门" prop="deptId">
+        <el-cascader
+          class="!w-240px"
+          v-model="queryParams.deptId"
+          :options="deptTree"
+          :props="{
+            checkStrictly: true,
+            label: 'name',
+            value: 'id',
+            children: 'children',
+            emitPath: false
+          }"
+          clearable
+        />
+      </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-220px"
+        />
+      </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:alarm-message:create']"
+        >
+          <Icon icon="ep:plus" class="mr-5px" /> 新增
+        </el-button> -->
+        <el-button
+          type="success"
+          plain
+          @click="handleExport"
+          :loading="exportLoading"
+          v-hasPermi="['gas:alarm-message:export']"
+        >
+          <Icon icon="ep:download" class="mr-5px" /> 导出
+        </el-button>
+        <el-button
+          type="danger"
+          plain
+          :disabled="isEmpty(checkedIds)"
+          @click="handleDeleteBatch"
+          v-hasPermi="['gas:alarm-message: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="主键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="sn" />
+      <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="createTime"
+        :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>
+          <el-button
+            link
+            type="danger"
+            @click="handleDelete(scope.row.id)"
+            v-hasPermi="['gas:alarm-message: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>
+
+  <!-- 表单弹窗：添加/修改 -->
+  <AlarmMessageForm ref="formRef" @success="getList" />
+</template>
+
+<script setup lang="ts">
+import { isEmpty } from '@/utils/is'
+import { dateFormatter } from '@/utils/formatTime'
+import download from '@/utils/download'
+import { AlarmMessageApi, AlarmMessage } from '@/api/gas/alarmmessage'
+import AlarmMessageForm from './AlarmMessageForm.vue'
+import { DeptVO, getSimpleDeptList } from '@/api/system/dept'
+import { handleTree } from '@/utils/tree'
+/** GAS手持探测器推送 列表 */
+defineOptions({ name: 'AlarmMessage' })
+
+const message = useMessage() // 消息弹窗
+const { t } = useI18n() // 国际化
+
+const loading = ref(true) // 列表的加载中
+const list = ref<AlarmMessage[]>([]) // 列表的数据
+const total = ref(0) // 列表的总页数
+const queryParams = reactive({
+  pageNo: 1,
+  pageSize: 10,
+  detectorId: undefined,
+  name: undefined,
+  sn: undefined,
+  message: undefined,
+  pushSnList: undefined,
+  remark: undefined,
+  deptId: undefined,
+  createTime: []
+})
+const queryFormRef = ref() // 搜索的表单
+const exportLoading = ref(false) // 导出的加载中
+
+const deptList = ref<DeptVO[]>([]) // 部门列表
+const deptTree = ref<DeptVO[]>([]) // 部门树形
+function getDeptList() {
+  return getSimpleDeptList().then((res) => {
+    deptTree.value = handleTree(res || [])
+    deptList.value = res
+  })
+}
+
+/** 查询列表 */
+const getList = async () => {
+  loading.value = true
+  try {
+    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 || '-' : '-'
+    }))
+    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)
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (id: number) => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    // 发起删除
+    await AlarmMessageApi.deleteAlarmMessage(id)
+    message.success(t('common.delSuccess'))
+    // 刷新列表
+    await getList()
+  } catch {}
+}
+
+/** 批量删除GAS手持探测器推送 */
+const handleDeleteBatch = async () => {
+  try {
+    // 删除的二次确认
+    await message.delConfirm()
+    await AlarmMessageApi.deleteAlarmMessageList(checkedIds.value)
+    message.success(t('common.delSuccess'))
+    await getList()
+  } catch {}
+}
+
+const checkedIds = ref<number[]>([])
+const handleRowCheckboxChange = (records: AlarmMessage[]) => {
+  checkedIds.value = records.map((item) => item.id)
+}
+
+/** 导出按钮操作 */
+const handleExport = async () => {
+  try {
+    // 导出的二次确认
+    await message.exportConfirm()
+    // 发起导出
+    exportLoading.value = true
+    const data = await AlarmMessageApi.exportAlarmMessage(queryParams)
+    download.excel(data, 'GAS手持探测器推送.xls')
+  } catch {
+  } finally {
+    exportLoading.value = false
+  }
+}
+
+/** 初始化 **/
+onMounted(async () => {
+  await getDeptList()
+  getList()
+})
+</script>
diff --git a/web/src/views/infra/codegen/PreviewCode.vue b/web/src/views/infra/codegen/PreviewCode.vue
index b6a307d..8f42c1d 100644
--- a/web/src/views/infra/codegen/PreviewCode.vue
+++ b/web/src/views/infra/codegen/PreviewCode.vue
@@ -4,18 +4,18 @@
     align-center
     class="app-infra-codegen-preview-container"
     title="代码预览"
-    width="80%"
+    width="90%"
   >
     <div class="flex">
       <!-- 代码目录树 -->
       <el-card
         v-loading="loading"
         :gutter="12"
-        class="w-1/3"
+        class="w-320px"
         element-loading-text="生成文件目录中..."
         shadow="hover"
       >
-        <el-scrollbar height="calc(100vh - 88px - 40px)">
+        <el-scrollbar height="450">
           <el-tree
             ref="treeRef"
             :data="preview.fileTree"
@@ -31,7 +31,7 @@
       <el-card
         v-loading="loading"
         :gutter="12"
-        class="ml-3 w-2/3"
+        class="flex-1"
         element-loading-text="加载代码中..."
         shadow="hover"
       >
@@ -45,7 +45,7 @@
             <el-button class="float-right" text type="primary" @click="copy(item.code)">
               {{ t('common.copy') }}
             </el-button>
-            <el-scrollbar height="600px">
+            <el-scrollbar height="400px">
               <pre><code v-dompurify-html="highlightedCode(item)" class="hljs"></code></pre>
             </el-scrollbar>
           </el-tab-pane>
@@ -212,11 +212,11 @@ onMounted(async () => {
   hljs.registerLanguage('typescript', typescript)
 })
 </script>
-<style lang="scss">
+<!-- <style lang="scss">
 .app-infra-codegen-preview-container {
   .el-scrollbar .el-scrollbar__wrap .el-scrollbar__view {
     display: inline-block;
     white-space: nowrap;
   }
 }
-</style>
+</style> -->