diff --git a/web/src/api/gas/alarmmessage/index.ts b/web/src/api/gas/alarmmessage/index.ts index 3c9eb79..c28a3b4 100644 --- a/web/src/api/gas/alarmmessage/index.ts +++ b/web/src/api/gas/alarmmessage/index.ts @@ -1,17 +1,17 @@ -import request from '@/config/axios' -import type { Dayjs } from 'dayjs'; +import request from '@/config/axios' /** GAS手持探测器推送信息 */ export interface AlarmMessage { - id: number; // 主键ID - detectorId: number; // 手持表id - name: string; // 持有人名称 - sn: string; // 设备编号 - message: string; // 消息 - pushSnList: string; // 推送设备sn,逗号分割 - remark: string; // 备注 - deptId: number; // 部门id - } + id?: number // 主键ID + detectorId?: number // 手持表id + name?: string // 持有人名称 + sn?: string // 设备编号 + message?: string // 消息 + pushSnList?: string // 推送设备sn,逗号分割 + remark?: string // 备注 + deptId?: number // 部门id + deptName?: string // 部门名称 +} // GAS手持探测器推送 API export const AlarmMessageApi = { @@ -49,4 +49,4 @@ export const AlarmMessageApi = { 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/gas/alarmmessage/AlarmMessageForm.vue b/web/src/views/gas/alarmmessage/AlarmMessageForm.vue index f8c123e..d59cd01 100644 --- a/web/src/views/gas/alarmmessage/AlarmMessageForm.vue +++ b/web/src/views/gas/alarmmessage/AlarmMessageForm.vue @@ -52,7 +52,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示 const dialogTitle = ref('') // 弹窗的标题 const formLoading = ref(false) // 表单的加载中:1)修改时的数据加载;2)提交的按钮禁用 const formType = ref('') // 表单的类型:create - 新增;update - 修改 -const formData = ref({ +const formData = ref({ id: undefined, detectorId: undefined, name: undefined, @@ -129,7 +129,8 @@ const resetForm = () => { message: undefined, pushSnList: undefined, remark: undefined, - deptId: undefined + deptId: undefined, + deptName: undefined } formRef.value?.resetFields() } diff --git a/web/src/views/gas/alarmmessage/index.vue b/web/src/views/gas/alarmmessage/index.vue index 17bbc21..0b26f71 100644 --- a/web/src/views/gas/alarmmessage/index.vue +++ b/web/src/views/gas/alarmmessage/index.vue @@ -254,7 +254,7 @@ const handleDeleteBatch = async () => { const checkedIds = ref([]) const handleRowCheckboxChange = (records: AlarmMessage[]) => { - checkedIds.value = records.map((item) => item.id) + checkedIds.value = records.map((item) => item.id || 0) } /** 导出按钮操作 */