From c4a73f1c93ad3beb3d2c619be496fc43fc8b0b0d Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 24 Oct 2025 20:41:11 +0800
Subject: [PATCH 1/6] =?UTF-8?q?feat:=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E5=A4=87=E6=8A=A5=E8=AD=A6=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E3=80=81=E5=BE=AE=E4=BF=A1=E7=BC=93=E5=AD=98=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=EF=BC=8C=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=EF=BC=8C=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.production                               |   2 +-
 src/api/fishery/deviceWarnCombine/index.ts    |  63 +++
 src/api/fishery/deviceWarnCombine/types.ts    | 143 +++++
 src/api/fishery/deviceWarnOne/index.ts        |  63 +++
 src/api/fishery/deviceWarnOne/types.ts        | 143 +++++
 src/api/fishery/messageOpRecord/index.ts      |  63 +++
 src/api/fishery/messageOpRecord/types.ts      | 108 ++++
 src/api/fishery/tecentUserCache/index.ts      |  63 +++
 src/api/fishery/tecentUserCache/types.ts      |  53 ++
 src/types/components.d.ts                     |   3 +
 src/views/fishery/aquUser/index.vue           |   2 +-
 .../fishery/deviceCorrectRecord/index.vue     | 126 ++---
 src/views/fishery/deviceErrorCode/index.vue   |  80 +--
 src/views/fishery/deviceSwitch/index.vue      | 100 ++--
 src/views/fishery/deviceThreshold/index.vue   |   2 +-
 src/views/fishery/deviceWarnCombine/index.vue | 521 ++++++++++++++++++
 src/views/fishery/deviceWarnOne/index.vue     | 310 +++++++++++
 src/views/fishery/linkedCtrl/index.vue        |   2 +-
 src/views/fishery/messageOpRecord/index.vue   | 274 +++++++++
 src/views/fishery/payDevice/index.vue         | 134 ++---
 src/views/fishery/pond/index.vue              |   2 +-
 src/views/fishery/tecentUserCache/index.vue   | 224 ++++++++
 src/views/fishery/userRelation/index.vue      |   2 +-
 src/views/system/config/index.vue             |   2 +-
 src/views/system/dict/data.vue                |   2 +-
 src/views/system/dict/index.vue               |   2 +-
 src/views/system/oss/config.vue               |   2 +-
 src/views/system/post/index.vue               |   2 +-
 src/views/system/role/index.vue               |   2 +-
 src/views/system/user/index.vue               |   2 +-
 30 files changed, 2264 insertions(+), 233 deletions(-)
 create mode 100644 src/api/fishery/deviceWarnCombine/index.ts
 create mode 100644 src/api/fishery/deviceWarnCombine/types.ts
 create mode 100644 src/api/fishery/deviceWarnOne/index.ts
 create mode 100644 src/api/fishery/deviceWarnOne/types.ts
 create mode 100644 src/api/fishery/messageOpRecord/index.ts
 create mode 100644 src/api/fishery/messageOpRecord/types.ts
 create mode 100644 src/api/fishery/tecentUserCache/index.ts
 create mode 100644 src/api/fishery/tecentUserCache/types.ts
 create mode 100644 src/views/fishery/deviceWarnCombine/index.vue
 create mode 100644 src/views/fishery/deviceWarnOne/index.vue
 create mode 100644 src/views/fishery/messageOpRecord/index.vue
 create mode 100644 src/views/fishery/tecentUserCache/index.vue

diff --git a/.env.production b/.env.production
index 1109bc6..172b8bf 100644
--- a/.env.production
+++ b/.env.production
@@ -1,5 +1,5 @@
 # 页面标题
-VITE_APP_TITLE = RuoYi-Vue-Plus多租户管理系统
+VITE_APP_TITLE = 水产养殖监测平台
 
 # 生产环境配置
 VITE_APP_ENV = 'production'
diff --git a/src/api/fishery/deviceWarnCombine/index.ts b/src/api/fishery/deviceWarnCombine/index.ts
new file mode 100644
index 0000000..ccd5748
--- /dev/null
+++ b/src/api/fishery/deviceWarnCombine/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceWarnCombineVO, DeviceWarnCombineForm, DeviceWarnCombineQuery } from '@/api/fishery/deviceWarnCombine/types';
+
+/**
+ * 查询设备告警信息列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDeviceWarnCombine = (query?: DeviceWarnCombineQuery): AxiosPromise<DeviceWarnCombineVO[]> => {
+  return request({
+    url: '/fishery/deviceWarnCombine/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备告警信息详细
+ * @param id
+ */
+export const getDeviceWarnCombine = (id: string | number): AxiosPromise<DeviceWarnCombineVO> => {
+  return request({
+    url: '/fishery/deviceWarnCombine/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备告警信息
+ * @param data
+ */
+export const addDeviceWarnCombine = (data: DeviceWarnCombineForm) => {
+  return request({
+    url: '/fishery/deviceWarnCombine',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备告警信息
+ * @param data
+ */
+export const updateDeviceWarnCombine = (data: DeviceWarnCombineForm) => {
+  return request({
+    url: '/fishery/deviceWarnCombine',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备告警信息
+ * @param id
+ */
+export const delDeviceWarnCombine = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/deviceWarnCombine/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/deviceWarnCombine/types.ts b/src/api/fishery/deviceWarnCombine/types.ts
new file mode 100644
index 0000000..3a67870
--- /dev/null
+++ b/src/api/fishery/deviceWarnCombine/types.ts
@@ -0,0 +1,143 @@
+export interface DeviceWarnCombineVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 设备编号
+   */
+  deviceSerialNum: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType: number;
+
+  /**
+   * 参数类型
+   */
+  thresholdType: number;
+
+  /**
+   * 进展状态
+   */
+  processStatus: number;
+
+  /**
+   * 故障类型
+   */
+  warnType: number;
+
+  /**
+   * 告警总数量
+   */
+  totalCount: number;
+
+  /**
+   * 处理人
+   */
+  handlerName: string;
+
+  /**
+   * 处理时间
+   */
+  processTime: string;
+
+  /**
+   * 创建时间
+   */
+  createTime: string;
+
+}
+
+export interface DeviceWarnCombineForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 设备编号
+   */
+  deviceSerialNum?: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType?: number;
+
+  /**
+   * 参数类型
+   */
+  thresholdType?: number;
+
+  /**
+   * 进展状态
+   */
+  processStatus?: number;
+
+  /**
+   * 故障类型
+   */
+  warnType?: number;
+
+  /**
+   * 告警总数量
+   */
+  totalCount?: number;
+
+  /**
+   * 备注
+   */
+  remarkContent?: string;
+
+  /**
+   * 处理人
+   */
+  handlerName?: string;
+
+  /**
+   * 处理时间
+   */
+  processTime?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface DeviceWarnCombineQuery extends PageQuery {
+
+  /**
+   * 设备编号
+   */
+  deviceSerialNum?: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType?: number;
+
+  /**
+   * 参数类型
+   */
+  thresholdType?: number;
+
+  /**
+   * 进展状态
+   */
+  processStatus?: number;
+
+  /**
+   * 故障类型
+   */
+  warnType?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/fishery/deviceWarnOne/index.ts b/src/api/fishery/deviceWarnOne/index.ts
new file mode 100644
index 0000000..b2e635d
--- /dev/null
+++ b/src/api/fishery/deviceWarnOne/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceWarnOneVO, DeviceWarnOneForm, DeviceWarnOneQuery } from '@/api/fishery/deviceWarnOne/types';
+
+/**
+ * 查询设备报警明细列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDeviceWarnOne = (query?: DeviceWarnOneQuery): AxiosPromise<DeviceWarnOneVO[]> => {
+  return request({
+    url: '/fishery/deviceWarnOne/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备报警明细详细
+ * @param id
+ */
+export const getDeviceWarnOne = (id: string | number): AxiosPromise<DeviceWarnOneVO> => {
+  return request({
+    url: '/fishery/deviceWarnOne/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备报警明细
+ * @param data
+ */
+export const addDeviceWarnOne = (data: DeviceWarnOneForm) => {
+  return request({
+    url: '/fishery/deviceWarnOne',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备报警明细
+ * @param data
+ */
+export const updateDeviceWarnOne = (data: DeviceWarnOneForm) => {
+  return request({
+    url: '/fishery/deviceWarnOne',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备报警明细
+ * @param id
+ */
+export const delDeviceWarnOne = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/deviceWarnOne/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/deviceWarnOne/types.ts b/src/api/fishery/deviceWarnOne/types.ts
new file mode 100644
index 0000000..8d129ad
--- /dev/null
+++ b/src/api/fishery/deviceWarnOne/types.ts
@@ -0,0 +1,143 @@
+export interface DeviceWarnOneVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 报警主表id
+   */
+  warnCombineId: string | number;
+
+  /**
+   * 用户id
+   */
+  userId: string | number;
+
+  /**
+   * 告警最大值
+   */
+  limitUpper: number;
+
+  /**
+   * 告警最小值
+   */
+  limitLower: number;
+
+  /**
+   * 告警当前值
+   */
+  curValue: number;
+
+  /**
+   * 进展状态
+   */
+  processStatus: number;
+
+  /**
+   * 故障类型
+   */
+  warnType: number;
+
+  /**
+   * 处理人
+   */
+  handlerName: string;
+
+  /**
+   * 处理时间
+   */
+  processTime: string;
+
+}
+
+export interface DeviceWarnOneForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 报警主表id
+   */
+  warnCombineId?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 告警最大值
+   */
+  limitUpper?: number;
+
+  /**
+   * 告警最小值
+   */
+  limitLower?: number;
+
+  /**
+   * 告警当前值
+   */
+  curValue?: number;
+
+  /**
+   * 进展状态
+   */
+  processStatus?: number;
+
+  /**
+   * 故障类型
+   */
+  warnType?: number;
+
+  /**
+   * 处理人
+   */
+  handlerName?: string;
+
+  /**
+   * 处理时间
+   */
+  processTime?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface DeviceWarnOneQuery extends PageQuery {
+
+  /**
+   * 报警主表id
+   */
+  warnCombineId?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 进展状态
+   */
+  processStatus?: number;
+
+  /**
+   * 故障类型
+   */
+  warnType?: number;
+
+  /**
+   * 处理人
+   */
+  handlerName?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/fishery/messageOpRecord/index.ts b/src/api/fishery/messageOpRecord/index.ts
new file mode 100644
index 0000000..06bcb42
--- /dev/null
+++ b/src/api/fishery/messageOpRecord/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MessageOpRecordVO, MessageOpRecordForm, MessageOpRecordQuery } from '@/api/fishery/messageOpRecord/types';
+
+/**
+ * 查询用户操作记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMessageOpRecord = (query?: MessageOpRecordQuery): AxiosPromise<MessageOpRecordVO[]> => {
+  return request({
+    url: '/fishery/messageOpRecord/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询用户操作记录详细
+ * @param id
+ */
+export const getMessageOpRecord = (id: string | number): AxiosPromise<MessageOpRecordVO> => {
+  return request({
+    url: '/fishery/messageOpRecord/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增用户操作记录
+ * @param data
+ */
+export const addMessageOpRecord = (data: MessageOpRecordForm) => {
+  return request({
+    url: '/fishery/messageOpRecord',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改用户操作记录
+ * @param data
+ */
+export const updateMessageOpRecord = (data: MessageOpRecordForm) => {
+  return request({
+    url: '/fishery/messageOpRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除用户操作记录
+ * @param id
+ */
+export const delMessageOpRecord = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/messageOpRecord/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/messageOpRecord/types.ts b/src/api/fishery/messageOpRecord/types.ts
new file mode 100644
index 0000000..07dc88f
--- /dev/null
+++ b/src/api/fishery/messageOpRecord/types.ts
@@ -0,0 +1,108 @@
+export interface MessageOpRecordVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 用户id
+   */
+  userId: string | number;
+
+  /**
+   * 操作用户id
+   */
+  opUserId: string | number;
+
+  /**
+   * 操作标题
+   */
+  title: string;
+
+  /**
+   * 操作内容
+   */
+  message: string;
+
+  /**
+   * 操作方式
+   */
+  opType: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface MessageOpRecordForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 操作用户id
+   */
+  opUserId?: string | number;
+
+  /**
+   * 操作标题
+   */
+  title?: string;
+
+  /**
+   * 操作内容
+   */
+  message?: string;
+
+  /**
+   * 操作方式
+   */
+  opType?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface MessageOpRecordQuery extends PageQuery {
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 操作用户id
+   */
+  opUserId?: string | number;
+
+  /**
+   * 操作标题
+   */
+  title?: string;
+
+  /**
+   * 操作内容
+   */
+  message?: string;
+
+  /**
+   * 操作方式
+   */
+  opType?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/fishery/tecentUserCache/index.ts b/src/api/fishery/tecentUserCache/index.ts
new file mode 100644
index 0000000..8bb1c23
--- /dev/null
+++ b/src/api/fishery/tecentUserCache/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { TecentUserCacheVO, TecentUserCacheForm, TecentUserCacheQuery } from '@/api/fishery/tecentUserCache/types';
+
+/**
+ * 查询公众号用户缓存列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listTecentUserCache = (query?: TecentUserCacheQuery): AxiosPromise<TecentUserCacheVO[]> => {
+  return request({
+    url: '/fishery/tecentUserCache/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询公众号用户缓存详细
+ * @param id
+ */
+export const getTecentUserCache = (id: string | number): AxiosPromise<TecentUserCacheVO> => {
+  return request({
+    url: '/fishery/tecentUserCache/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增公众号用户缓存
+ * @param data
+ */
+export const addTecentUserCache = (data: TecentUserCacheForm) => {
+  return request({
+    url: '/fishery/tecentUserCache',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改公众号用户缓存
+ * @param data
+ */
+export const updateTecentUserCache = (data: TecentUserCacheForm) => {
+  return request({
+    url: '/fishery/tecentUserCache',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除公众号用户缓存
+ * @param id
+ */
+export const delTecentUserCache = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/tecentUserCache/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/tecentUserCache/types.ts b/src/api/fishery/tecentUserCache/types.ts
new file mode 100644
index 0000000..13759c8
--- /dev/null
+++ b/src/api/fishery/tecentUserCache/types.ts
@@ -0,0 +1,53 @@
+export interface TecentUserCacheVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * openId
+   */
+  openId: string | number;
+
+  /**
+   * unionId
+   */
+  unionId: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface TecentUserCacheForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * openId
+   */
+  openId?: string | number;
+
+  /**
+   * unionId
+   */
+  unionId?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface TecentUserCacheQuery extends PageQuery {
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index 137fb4d..a8d3273 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -19,6 +19,7 @@ declare module 'vue' {
     ElButton: typeof import('element-plus/es')['ElButton']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -35,6 +36,7 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
@@ -55,6 +57,7 @@ declare module 'vue' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
+    ElText: typeof import('element-plus/es')['ElText']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
diff --git a/src/views/fishery/aquUser/index.vue b/src/views/fishery/aquUser/index.vue
index 3b74234..c14c4e8 100644
--- a/src/views/fishery/aquUser/index.vue
+++ b/src/views/fishery/aquUser/index.vue
@@ -64,7 +64,7 @@
         <el-table-column label="区县" align="center" prop="district" /> -->
         <!-- <el-table-column label="展示标题" align="center" prop="title" /> -->
         <el-table-column label="创建时间" align="center" prop="createTime" />
-        <el-table-column label="修改时间" align="center" prop="updateTime" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" />
         <el-table-column label="操作" align="center" fixed="right" width="240" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="子账号" placement="top">
diff --git a/src/views/fishery/deviceCorrectRecord/index.vue b/src/views/fishery/deviceCorrectRecord/index.vue
index 483bf84..3482ff6 100644
--- a/src/views/fishery/deviceCorrectRecord/index.vue
+++ b/src/views/fishery/deviceCorrectRecord/index.vue
@@ -86,10 +86,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="设备编号" prop="serialNum">
-          <el-input 
-            :value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''" 
-            placeholder="请选择设备" 
-            readonly 
+          <el-input
+            :value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''"
+            placeholder="请选择设备"
+            readonly
             @click="openDeviceSelect"
             style="cursor: pointer;"
             :disabled="!form.deviceType"
@@ -100,10 +100,10 @@
           </el-input>
         </el-form-item>
         <el-form-item label="用户" prop="userId">
-          <el-input 
-            :value="selectedUser ? `${selectedUser.userName} (${selectedUser.mobilePhone})` : ''" 
-            placeholder="请选择用户" 
-            readonly 
+          <el-input
+            :value="selectedUser ? `${selectedUser.userName} (${selectedUser.mobilePhone})` : ''"
+            placeholder="请选择用户"
+            readonly
             @click="openUserSelect"
             style="cursor: pointer;"
           >
@@ -122,7 +122,7 @@
           <el-input v-model="form.valueSaturability" placeholder="请输入饱和度" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -132,42 +132,42 @@
         </div>
       </template>
     </el-dialog>
-    
+
     <!-- 设备选择对话框 -->
     <el-dialog title="选择设备" v-model="deviceSelectVisible" width="1200px" append-to-body>
       <!-- 搜索条件 -->
       <el-form :model="deviceQueryParams" :inline="true" class="mb-4">
         <el-form-item label="用户信息">
-          <el-input 
-            v-model="deviceQueryParams.params.userKeyword" 
-            placeholder="请输入用户名或手机号" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.params.userKeyword"
+            placeholder="请输入用户名或手机号"
+            clearable
             style="width: 200px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <el-form-item label="设备编号">
-          <el-input 
-            v-model="deviceQueryParams.serialNum" 
-            placeholder="请输入设备编号" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.serialNum"
+            placeholder="请输入设备编号"
+            clearable
             style="width: 180px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <el-form-item label="设备名称">
-          <el-input 
-            v-model="deviceQueryParams.deviceName" 
-            placeholder="请输入设备名称" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.deviceName"
+            placeholder="请输入设备名称"
+            clearable
             style="width: 180px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <el-form-item label="设备类型">
-          <el-select 
-            v-model="deviceQueryParams.deviceType" 
-            placeholder="请选择设备类型" 
+          <el-select
+            v-model="deviceQueryParams.deviceType"
+            placeholder="请选择设备类型"
             disabled
             style="width: 150px"
           >
@@ -184,10 +184,10 @@
           <el-button icon="Refresh" @click="resetDeviceQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      
+
       <!-- 设备表格 -->
-      <el-table 
-        :data="deviceList" 
+      <el-table
+        :data="deviceList"
         highlight-current-row
         height="400px"
         border
@@ -213,9 +213,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
-            <el-button 
-              type="primary" 
-              size="small" 
+            <el-button
+              type="primary"
+              size="small"
               @click="handleDeviceSelect(scope.row)"
             >
               选择
@@ -223,42 +223,42 @@
           </template>
         </el-table-column>
       </el-table>
-      
+
       <!-- 分页 -->
-      <pagination 
-        v-show="deviceTotal > 0" 
-        :total="deviceTotal" 
-        v-model:page="deviceQueryParams.pageNum" 
-        v-model:limit="deviceQueryParams.pageSize" 
+      <pagination
+        v-show="deviceTotal > 0"
+        :total="deviceTotal"
+        v-model:page="deviceQueryParams.pageNum"
+        v-model:limit="deviceQueryParams.pageSize"
         @pagination="handleDevicePaginationChange"
         class="mt-4"
       />
-      
+
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="cancelDeviceSelect">取 消</el-button>
         </div>
       </template>
     </el-dialog>
-    
+
     <!-- 用户选择对话框 -->
     <el-dialog title="选择用户" v-model="userSelectVisible" width="900px" append-to-body>
       <!-- 搜索条件 -->
       <el-form :model="userQueryParams" :inline="true" class="mb-4">
         <el-form-item label="用户名">
-          <el-input 
-            v-model="userQueryParams.userName" 
-            placeholder="请输入用户名" 
-            clearable 
+          <el-input
+            v-model="userQueryParams.userName"
+            placeholder="请输入用户名"
+            clearable
             style="width: 180px"
             @keyup.enter="handleUserQuery"
           />
         </el-form-item>
         <el-form-item label="手机号">
-          <el-input 
-            v-model="userQueryParams.mobilePhone" 
-            placeholder="请输入手机号" 
-            clearable 
+          <el-input
+            v-model="userQueryParams.mobilePhone"
+            placeholder="请输入手机号"
+            clearable
             style="width: 180px"
             @keyup.enter="handleUserQuery"
           />
@@ -268,10 +268,10 @@
           <el-button icon="Refresh" @click="resetUserQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      
+
       <!-- 用户表格 -->
-      <el-table 
-        :data="aquUserList" 
+      <el-table
+        :data="aquUserList"
         highlight-current-row
         height="400px"
         border
@@ -283,9 +283,9 @@
         <el-table-column label="区县" align="center" prop="district" />
         <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
-            <el-button 
-              type="primary" 
-              size="small" 
+            <el-button
+              type="primary"
+              size="small"
               @click="handleUserSelect(scope.row)"
             >
               选择
@@ -293,17 +293,17 @@
           </template>
         </el-table-column>
       </el-table>
-      
+
       <!-- 分页 -->
-      <pagination 
-        v-show="userTotal > 0" 
-        :total="userTotal" 
-        v-model:page="userQueryParams.pageNum" 
-        v-model:limit="userQueryParams.pageSize" 
+      <pagination
+        v-show="userTotal > 0"
+        :total="userTotal"
+        v-model:page="userQueryParams.pageNum"
+        v-model:limit="userQueryParams.pageSize"
         @pagination="handleUserPaginationChange"
         class="mt-4"
       />
-      
+
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="cancelUserSelect">取 消</el-button>
@@ -636,7 +636,7 @@ const handleUpdate = async (row?: DeviceCorrectRecordVO) => {
   const _id = row?.id || ids.value[0]
   const res = await getDeviceCorrectRecord(_id);
   Object.assign(form.value, res.data);
-  
+
   // 回显用户信息
   if (form.value.userId) {
     try {
@@ -657,7 +657,7 @@ const handleUpdate = async (row?: DeviceCorrectRecordVO) => {
   } else {
     selectedUser.value = null;
   }
-  
+
   // 回显设备信息
   if (form.value.serialNum) {
     try {
@@ -680,7 +680,7 @@ const handleUpdate = async (row?: DeviceCorrectRecordVO) => {
   } else {
     selectedDevice.value = null;
   }
-  
+
   dialog.visible = true;
   dialog.title = "修改设备校准记录";
 }
diff --git a/src/views/fishery/deviceErrorCode/index.vue b/src/views/fishery/deviceErrorCode/index.vue
index 8ee0aa5..4e5ec22 100644
--- a/src/views/fishery/deviceErrorCode/index.vue
+++ b/src/views/fishery/deviceErrorCode/index.vue
@@ -72,10 +72,10 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="deviceErrorCodeFormRef" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="设备" prop="deviceId">
-          <el-input 
-            :value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''" 
-            placeholder="请选择设备" 
-            readonly 
+          <el-input
+            :value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''"
+            placeholder="请选择设备"
+            readonly
             @click="openDeviceSelect"
             style="cursor: pointer;"
           >
@@ -87,10 +87,10 @@
         <el-form-item label="开关序号" prop="switchIndex">
           <el-select v-model="form.switchIndex" placeholder="请选择开关序号" clearable :disabled="!form.deviceId">
             <el-option label="设备自身" :value="0" />
-            <el-option 
-              v-for="switchItem in deviceSwitchList" 
-              :key="switchItem.index" 
-              :label="`${switchItem.index} - ${switchItem.switchName}`" 
+            <el-option
+              v-for="switchItem in deviceSwitchList"
+              :key="switchItem.index"
+              :label="`${switchItem.index} - ${switchItem.switchName}`"
               :value="switchItem.index"
             />
           </el-select>
@@ -99,7 +99,7 @@
           <el-input v-model="form.errorCode" placeholder="请输入故障码" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -109,42 +109,42 @@
         </div>
       </template>
     </el-dialog>
-    
+
     <!-- 设备选择对话框 -->
     <el-dialog title="选择设备" v-model="deviceSelectVisible" width="1200px" append-to-body>
       <!-- 搜索条件 -->
       <el-form :model="deviceQueryParams" :inline="true" class="mb-4">
         <el-form-item label="用户信息">
-          <el-input 
-            v-model="deviceQueryParams.params.userKeyword" 
-            placeholder="请输入用户名或手机号" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.params.userKeyword"
+            placeholder="请输入用户名或手机号"
+            clearable
             style="width: 200px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <el-form-item label="设备编号">
-          <el-input 
-            v-model="deviceQueryParams.serialNum" 
-            placeholder="请输入设备编号" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.serialNum"
+            placeholder="请输入设备编号"
+            clearable
             style="width: 180px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <!-- <el-form-item label="设备名称">
-          <el-input 
-            v-model="deviceQueryParams.deviceName" 
-            placeholder="请输入设备名称" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.deviceName"
+            placeholder="请输入设备名称"
+            clearable
             style="width: 180px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item> -->
         <el-form-item label="设备类型">
-          <el-select 
-            v-model="deviceQueryParams.deviceType" 
-            placeholder="请选择设备类型" 
+          <el-select
+            v-model="deviceQueryParams.deviceType"
+            placeholder="请选择设备类型"
             clearable
             style="width: 150px"
           >
@@ -161,10 +161,10 @@
           <el-button icon="Refresh" @click="resetDeviceQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      
+
       <!-- 设备表格 -->
-      <el-table 
-        :data="deviceList" 
+      <el-table
+        :data="deviceList"
         highlight-current-row
         height="400px"
         border
@@ -190,9 +190,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
-            <el-button 
-              type="primary" 
-              size="small" 
+            <el-button
+              type="primary"
+              size="small"
               @click="handleDeviceSelect(scope.row)"
             >
               选择
@@ -200,17 +200,17 @@
           </template>
         </el-table-column>
       </el-table>
-      
+
       <!-- 分页 -->
-      <pagination 
-        v-show="deviceTotal > 0" 
-        :total="deviceTotal" 
-        v-model:page="deviceQueryParams.pageNum" 
-        v-model:limit="deviceQueryParams.pageSize" 
+      <pagination
+        v-show="deviceTotal > 0"
+        :total="deviceTotal"
+        v-model:page="deviceQueryParams.pageNum"
+        v-model:limit="deviceQueryParams.pageSize"
         @pagination="handleDevicePaginationChange"
         class="mt-4"
       />
-      
+
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="cancelDeviceSelect">取 消</el-button>
@@ -446,7 +446,7 @@ const handleUpdate = async (row?: DeviceErrorCodeVO) => {
   const _id = row?.id || ids.value[0]
   const res = await getDeviceErrorCode(_id);
   Object.assign(form.value, res.data);
-  
+
   // 回显设备信息
   if (form.value.deviceId) {
     try {
@@ -472,7 +472,7 @@ const handleUpdate = async (row?: DeviceErrorCodeVO) => {
     selectedDevice.value = null;
     deviceSwitchList.value = [];
   }
-  
+
   dialog.visible = true;
   dialog.title = "修改设备故障码";
 }
diff --git a/src/views/fishery/deviceSwitch/index.vue b/src/views/fishery/deviceSwitch/index.vue
index bb74e5f..1ab2a73 100644
--- a/src/views/fishery/deviceSwitch/index.vue
+++ b/src/views/fishery/deviceSwitch/index.vue
@@ -62,7 +62,7 @@
           </template>
         </el-table-column>
         <el-table-column label="额定电流设置" align="center" prop="rateElectricValue" />
-       
+
         <el-table-column label="电流告警开关" align="center" prop="electricWarnOpen">
           <template #default="scope">
             <dict-tag :options="open_close" :value="scope.row.electricWarnOpen"/>
@@ -75,7 +75,7 @@
         </el-table-column>
         <el-table-column label="上次操作开关时间" align="center" prop="lastTurnTime" width="160"> </el-table-column>
           <el-table-column label="定时控制数量" align="center" prop="timingCtrlCount" width="110"/>
-       
+
         <el-table-column label="操作" align="center" fixed="right" width="160" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="定时控制" placement="top">
@@ -97,10 +97,10 @@
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="deviceSwitchFormRef" :model="form" :rules="rules" label-width="120px">
         <el-form-item label="设备" prop="deviceId">
-          <el-input 
-            :value="selectedDevice ? `${selectedDevice.deviceName} (${selectedDevice.serialNum})` : ''" 
-            placeholder="请选择设备" 
-            readonly 
+          <el-input
+            :value="selectedDevice ? `${selectedDevice.deviceName} (${selectedDevice.serialNum})` : ''"
+            placeholder="请选择设备"
+            readonly
             @click="openDeviceSelect"
             style="cursor: pointer;"
           >
@@ -127,10 +127,10 @@
           </el-select>
         </el-form-item>
         <el-form-item label="塘口" prop="pondId">
-          <el-input 
-            :value="selectedPondName" 
-            placeholder="请选择设备（塘口将自动关联）" 
-            readonly 
+          <el-input
+            :value="selectedPondName"
+            placeholder="请选择设备（塘口将自动关联）"
+            readonly
             disabled
           />
         </el-form-item>
@@ -148,7 +148,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -158,42 +158,42 @@
         </div>
       </template>
     </el-dialog>
-    
+
     <!-- 设备选择对话框 -->
     <el-dialog title="选择设备" v-model="deviceSelectVisible" width="1200px" append-to-body>
       <!-- 搜索条件 -->
       <el-form :model="deviceQueryParams" :inline="true" class="mb-4">
         <el-form-item label="用户信息">
-          <el-input 
-            v-model="deviceQueryParams.params.userKeyword" 
-            placeholder="请输入用户名或手机号" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.params.userKeyword"
+            placeholder="请输入用户名或手机号"
+            clearable
             style="width: 200px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <el-form-item label="设备编号">
-          <el-input 
-            v-model="deviceQueryParams.serialNum" 
-            placeholder="请输入设备编号" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.serialNum"
+            placeholder="请输入设备编号"
+            clearable
             style="width: 180px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <el-form-item label="设备名称">
-          <el-input 
-            v-model="deviceQueryParams.deviceName" 
-            placeholder="请输入设备名称" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.deviceName"
+            placeholder="请输入设备名称"
+            clearable
             style="width: 180px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <el-form-item label="设备类型">
-          <el-select 
-            v-model="deviceQueryParams.deviceType" 
-            placeholder="请选择设备类型" 
+          <el-select
+            v-model="deviceQueryParams.deviceType"
+            placeholder="请选择设备类型"
             disabled
             style="width: 150px"
           >
@@ -210,10 +210,10 @@
           <el-button icon="Refresh" @click="resetDeviceQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      
+
       <!-- 设备表格 -->
-      <el-table 
-        :data="deviceList" 
+      <el-table
+        :data="deviceList"
         highlight-current-row
         height="400px"
         border
@@ -240,9 +240,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
-            <el-button 
-              type="primary" 
-              size="small" 
+            <el-button
+              type="primary"
+              size="small"
               @click="handleDeviceSelect(scope.row)"
             >
               选择
@@ -250,17 +250,17 @@
           </template>
         </el-table-column>
       </el-table>
-      
+
       <!-- 分页 -->
-      <pagination 
-        v-show="deviceTotal > 0" 
-        :total="deviceTotal" 
-        v-model:page="deviceQueryParams.pageNum" 
-        v-model:limit="deviceQueryParams.pageSize" 
+      <pagination
+        v-show="deviceTotal > 0"
+        :total="deviceTotal"
+        v-model:page="deviceQueryParams.pageNum"
+        v-model:limit="deviceQueryParams.pageSize"
         @pagination="handleDevicePaginationChange"
         class="mt-4"
       />
-      
+
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="cancelDeviceSelect">取 消</el-button>
@@ -268,16 +268,16 @@
       </template>
     </el-dialog>
     <!-- 定时控制对话框 -->
-    <el-dialog 
-      :title="`定时控制 - ${currentSwitch?.switchName || ''} (序号:${currentSwitch?.index || ''})`" 
-      v-model="timingCtrlDialogVisible" 
-      width="800px" 
+    <el-dialog
+      :title="`定时控制 - ${currentSwitch?.switchName || ''} (序号:${currentSwitch?.index || ''})`"
+      v-model="timingCtrlDialogVisible"
+      width="800px"
       append-to-body
       @close="closeTimingCtrlDialog"
     >
-      <el-table 
-        v-loading="timingCtrlLoading" 
-        :data="timingCtrlList" 
+      <el-table
+        v-loading="timingCtrlLoading"
+        :data="timingCtrlList"
         border
         height="400px"
       >
@@ -294,7 +294,7 @@
           </template>
         </el-table-column>
       </el-table>
-      
+
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="closeTimingCtrlDialog">关 闭</el-button>
@@ -480,7 +480,7 @@ const handleUpdate = async (row?: DeviceSwitchVO) => {
   const _id = row?.id || ids.value[0]
   const res = await getDeviceSwitch(_id);
   Object.assign(form.value, res.data);
-  
+
   // 回显设备信息
   if (form.value.deviceId) {
     try {
@@ -510,7 +510,7 @@ const handleUpdate = async (row?: DeviceSwitchVO) => {
     selectedDevice.value = null;
     selectedPondName.value = '';
   }
-  
+
   dialog.visible = true;
   dialog.title = "修改测控一体机开关";
 }
diff --git a/src/views/fishery/deviceThreshold/index.vue b/src/views/fishery/deviceThreshold/index.vue
index b9637d7..cea7121 100644
--- a/src/views/fishery/deviceThreshold/index.vue
+++ b/src/views/fishery/deviceThreshold/index.vue
@@ -49,7 +49,7 @@
         <el-table-column label="最大值" align="center" prop="limitUpper" />
         <el-table-column label="最小值" align="center" prop="limitLower" />
         <el-table-column label="创建时间" align="center" prop="createTime" />
-        <el-table-column label="修改时间" align="center" prop="updateTime" />
+        <el-table-column label="更新时间" align="center" prop="updateTime" />
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
diff --git a/src/views/fishery/deviceWarnCombine/index.vue b/src/views/fishery/deviceWarnCombine/index.vue
new file mode 100644
index 0000000..19ba840
--- /dev/null
+++ b/src/views/fishery/deviceWarnCombine/index.vue
@@ -0,0 +1,521 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="设备编号" prop="deviceSerialNum">
+              <el-input v-model="queryParams.deviceSerialNum" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备类型" prop="deviceType">
+              <el-select v-model="queryParams.deviceType" placeholder="请选择设备类型" clearable >
+                <el-option v-for="dict in aqu_device_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="参数类型" prop="thresholdType">
+              <el-select v-model="queryParams.thresholdType" placeholder="请选择参数类型" clearable >
+                <el-option v-for="dict in threshold_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="进展状态" prop="processStatus">
+              <el-select v-model="queryParams.processStatus" placeholder="请选择进展状态" clearable >
+                <el-option v-for="dict in process_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="故障类型" prop="warnType">
+              <el-select v-model="queryParams.warnType" placeholder="请选择故障类型" clearable >
+                <el-option v-for="dict in risk_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['fishery:deviceWarnCombine:add']">新增</el-button>-->
+<!--          </el-col>-->
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleProcess()" v-hasPermi="['fishery:deviceWarnCombine:edit']">处理</el-button>-->
+<!--          </el-col>-->
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:deviceWarnCombine:remove']">删除</el-button>
+          </el-col>
+<!--          <el-col :span="1.5">-->
+<!--            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:deviceWarnCombine:export']">导出</el-button>-->
+<!--          </el-col>-->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="deviceWarnCombineList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="设备编号" align="center" prop="deviceSerialNum" />
+        <el-table-column label="设备类型" align="center" prop="deviceType">
+          <template #default="scope">
+            <dict-tag :options="aqu_device_type" :value="scope.row.deviceType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="参数类型" align="center" prop="thresholdType">
+          <template #default="scope">
+            <dict-tag :options="threshold_type" :value="scope.row.thresholdType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="进展状态" align="center" prop="processStatus">
+          <template #default="scope">
+            <dict-tag :options="process_status" :value="scope.row.processStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="故障类型" align="center" prop="warnType">
+          <template #default="scope">
+            <dict-tag :options="risk_type" :value="scope.row.warnType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="告警总数量" align="center" prop="totalCount" />
+        <el-table-column label="处理人" align="center" prop="handlerName" />
+        <el-table-column label="处理时间" align="center" prop="processTime" width="160">
+        </el-table-column>
+        <el-table-column label="更新时间" align="center" prop="updateTime" width="160">
+        </el-table-column>
+        <el-table-column label="操作" align="center" fixed="right" width="150" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="报警明细" placement="top">
+              <el-button link type="primary" icon="Document" @click="handleViewDetails(scope.row)" v-hasPermi="['fishery:deviceWarnOne:list']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="批量处理" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleProcess(scope.row)" v-hasPermi="['fishery:deviceWarnCombine:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:deviceWarnCombine:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改设备告警信息对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="deviceWarnCombineFormRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="进展状态" prop="processStatus">
+          <el-select v-model="form.processStatus" placeholder="请选择进展状态">
+            <el-option
+                v-for="dict in process_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="故障类型" prop="warnType">
+          <el-select v-model="form.warnType" placeholder="请选择故障类型">
+            <el-option
+                v-for="dict in risk_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remarkContent">
+          <el-input v-model="form.remarkContent" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 报警明细对话框 -->
+    <el-dialog title="报警明细" v-model="detailDialog.visible" width="1200px" append-to-body>
+      <el-table v-loading="detailDialog.loading" border :data="detailList" max-height="500">
+        <el-table-column label="设备编号" align="center" prop="deviceSerialNum" width="150"/>
+        <el-table-column label="设备类型" align="center" prop="deviceType" width="100">
+          <template #default="scope">
+            <dict-tag :options="aqu_device_type" :value="scope.row.deviceType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="参数类型" align="center" prop="thresholdType">
+          <template #default="scope">
+            <dict-tag :options="threshold_type" :value="scope.row.thresholdType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="告警最大值" align="center" prop="limitUpper" />
+        <el-table-column label="告警最小值" align="center" prop="limitLower" />
+        <el-table-column label="告警当前值" align="center" prop="curValue" />
+        <el-table-column label="进展状态" align="center" prop="processStatus">
+          <template #default="scope">
+            <dict-tag :options="process_status" :value="scope.row.processStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="故障类型" align="center" prop="warnType">
+          <template #default="scope">
+            <dict-tag :options="risk_type" :value="scope.row.warnType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="处理人" align="center" prop="handlerName" />
+        <el-table-column label="处理时间" align="center" prop="processTime" width="160" />
+        <el-table-column label="操作" align="center" fixed="right" width="60">
+          <template #default="scope">
+            <el-tooltip content="处理" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleProcessDetail(scope.row)" v-hasPermi="['fishery:deviceWarnOne:edit']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <pagination 
+        v-show="detailTotal > 0" 
+        :total="detailTotal" 
+        v-model:page="detailQueryParams.pageNum" 
+        v-model:limit="detailQueryParams.pageSize" 
+        @pagination="getDetailList" 
+      />
+      
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="detailDialog.visible = false">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 明细处理对话框 -->
+    <el-dialog :title="detailProcessDialog.title" v-model="detailProcessDialog.visible" width="500px" append-to-body>
+      <el-form ref="detailFormRef" :model="detailForm" :rules="detailRules" label-width="100px">
+        <el-form-item label="进展状态" prop="processStatus">
+          <el-select v-model="detailForm.processStatus" placeholder="请选择进展状态">
+            <el-option
+                v-for="dict in process_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="故障类型" prop="warnType">
+          <el-select v-model="detailForm.warnType" placeholder="请选择故障类型">
+            <el-option
+                v-for="dict in risk_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="detailForm.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="detailButtonLoading" type="primary" @click="submitDetailForm">确 定</el-button>
+          <el-button @click="cancelDetailProcess">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DeviceWarnCombine" lang="ts">
+import { listDeviceWarnCombine, getDeviceWarnCombine, delDeviceWarnCombine, addDeviceWarnCombine, updateDeviceWarnCombine } from '@/api/fishery/deviceWarnCombine';
+import { DeviceWarnCombineVO, DeviceWarnCombineQuery, DeviceWarnCombineForm } from '@/api/fishery/deviceWarnCombine/types';
+import { listDeviceWarnOne, getDeviceWarnOne, updateDeviceWarnOne } from '@/api/fishery/deviceWarnOne';
+import { DeviceWarnOneVO, DeviceWarnOneForm } from '@/api/fishery/deviceWarnOne/types';
+import { useUserStore } from '@/store/modules/user';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const userStore = useUserStore();
+const { threshold_type, process_status, risk_type, aqu_device_type } = toRefs<any>(proxy?.useDict('threshold_type', 'process_status', 'risk_type', 'aqu_device_type'));
+
+const deviceWarnCombineList = ref<DeviceWarnCombineVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const deviceWarnCombineFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const detailDialog = reactive({
+  visible: false,
+  loading: false
+});
+
+const detailList = ref<DeviceWarnOneVO[]>([]);
+const detailTotal = ref(0);
+const detailQueryParams = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  warnCombineId: undefined as string | number | undefined
+});
+
+// 明细处理对话框
+const detailProcessDialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const detailFormRef = ref<ElFormInstance>();
+const detailButtonLoading = ref(false);
+
+const initDetailFormData: DeviceWarnOneForm = {
+  id: undefined,
+  processStatus: undefined,
+  warnType: undefined,
+  remark: undefined
+}
+
+const detailForm = ref<DeviceWarnOneForm>({...initDetailFormData});
+
+const detailRules = ref({
+  processStatus: [
+    { required: true, message: "进展状态不能为空", trigger: "change" }
+  ],
+  warnType: [
+    { required: true, message: "故障类型不能为空", trigger: "change" }
+  ]
+});
+
+const initFormData: DeviceWarnCombineForm = {
+  id: undefined,
+  deviceSerialNum: undefined,
+  deviceType: undefined,
+  thresholdType: undefined,
+  processStatus: undefined,
+  warnType: undefined,
+  totalCount: undefined,
+  remarkContent: undefined,
+  handlerName: undefined,
+  processTime: undefined,
+  remark: undefined
+}
+const data = reactive<PageData<DeviceWarnCombineForm, DeviceWarnCombineQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceSerialNum: undefined,
+    deviceType: undefined,
+    thresholdType: undefined,
+    processStatus: undefined,
+    warnType: undefined,
+    params: {
+    }
+  },
+  rules: {
+    deviceSerialNum: [
+      { required: true, message: "设备编号不能为空", trigger: "blur" }
+    ],
+    deviceType: [
+      { required: true, message: "设备类型不能为空", trigger: "change" }
+    ],
+    thresholdType: [
+      { required: true, message: "参数类型不能为空", trigger: "change" }
+    ],
+    processStatus: [
+      { required: true, message: "进展状态不能为空", trigger: "change" }
+    ],
+    warnType: [
+      { required: true, message: "故障类型不能为空", trigger: "change" }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备告警信息列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDeviceWarnCombine(queryParams.value);
+  deviceWarnCombineList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  deviceWarnCombineFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceWarnCombineVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加设备告警信息";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DeviceWarnCombineVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDeviceWarnCombine(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备告警信息";
+}
+
+/** 处理按钮操作 */
+const handleProcess = async (row?: DeviceWarnCombineVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDeviceWarnCombine(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "处理设备报警信息";
+}
+
+/** 查看报警明细 */
+const handleViewDetails = async (row: DeviceWarnCombineVO) => {
+  detailQueryParams.warnCombineId = row.id;
+  detailQueryParams.pageNum = 1;
+  detailDialog.visible = true;
+  await getDetailList();
+}
+
+/** 获取明细列表 */
+const getDetailList = async () => {
+  detailDialog.loading = true;
+  try {
+    const res = await listDeviceWarnOne(detailQueryParams);
+    detailList.value = res.rows;
+    detailTotal.value = res.total;
+  } finally {
+    detailDialog.loading = false;
+  }
+}
+
+/** 处理明细按钮操作 */
+const handleProcessDetail = async (row: DeviceWarnOneVO) => {
+  detailForm.value = {...initDetailFormData};
+  const res = await getDeviceWarnOne(row.id);
+  Object.assign(detailForm.value, res.data);
+  detailProcessDialog.visible = true;
+  detailProcessDialog.title = "处理报警明细";
+}
+
+/** 取消明细处理 */
+const cancelDetailProcess = () => {
+  detailForm.value = {...initDetailFormData};
+  detailFormRef.value?.resetFields();
+  detailProcessDialog.visible = false;
+}
+
+/** 提交明细处理 */
+const submitDetailForm = () => {
+  detailFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      try {
+        await proxy?.$modal.confirm('确认要处理此报警明细吗?');
+      } catch {
+        return;
+      }
+      
+      detailButtonLoading.value = true;
+      try {
+        // 设置处理人和处理时间
+        detailForm.value.handlerName = userStore.nickname;
+        detailForm.value.processTime = new Date().toISOString().slice(0, 19).replace('T', ' ');
+        await updateDeviceWarnOne(detailForm.value);
+        proxy?.$modal.msgSuccess("处理成功");
+        detailProcessDialog.visible = false;
+        await getDetailList(); // 刷新明细列表
+      } finally {
+        detailButtonLoading.value = false;
+      }
+    }
+  });
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceWarnCombineFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      // 如果是处理操作,给出二次确认提示
+      if (form.value.id) {
+        try {
+          await proxy?.$modal.confirm('是否确认批量处理该报警下的所有明细数据？');
+        } catch {
+          return; // 用户取消操作
+        }
+      }
+      
+      buttonLoading.value = true;
+      if (form.value.id) {
+        // 设置处理人和处理时间
+        form.value.handlerName = userStore.nickname;
+        form.value.processTime = new Date().toISOString().slice(0, 19).replace('T', ' ');
+        await updateDeviceWarnCombine(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDeviceWarnCombine(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceWarnCombineVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除该设备报警及其所有明细的数据？').finally(() => loading.value = false);
+  await delDeviceWarnCombine(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/deviceWarnCombine/export', {
+    ...queryParams.value
+  }, `deviceWarnCombine_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/deviceWarnOne/index.vue b/src/views/fishery/deviceWarnOne/index.vue
new file mode 100644
index 0000000..15f9b70
--- /dev/null
+++ b/src/views/fishery/deviceWarnOne/index.vue
@@ -0,0 +1,310 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+           
+           <el-form-item label="设备编号" prop="params.deviceSerialNum">
+              <el-input v-model="queryParams.params.deviceSerialNum" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备类型" prop="params.deviceType">
+              <el-select v-model="queryParams.params.deviceType" placeholder="请选择设备类型" clearable >
+                <el-option v-for="dict in aqu_device_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="参数类型" prop="thresholdType">
+              <el-select v-model="queryParams.params.thresholdType" placeholder="请选择参数类型" clearable >
+                <el-option v-for="dict in threshold_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="进展状态" prop="processStatus">
+              <el-select v-model="queryParams.processStatus" placeholder="请选择进展状态" clearable >
+                <el-option v-for="dict in process_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="故障类型" prop="warnType">
+              <el-select v-model="queryParams.warnType" placeholder="请选择故障类型" clearable >
+                <el-option v-for="dict in risk_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+             <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <!-- <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['fishery:deviceWarnOne:add']">新增</el-button>
+          </el-col> -->
+          <!-- <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleProcess()" v-hasPermi="['fishery:deviceWarnOne:edit']">处理</el-button>
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:deviceWarnOne:remove']">删除</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:deviceWarnOne:export']">导出</el-button>
+          </el-col> -->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="deviceWarnOneList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+          <el-table-column label="设备编号" align="center" prop="deviceSerialNum" width="150"/>
+        <el-table-column label="设备类型" align="center" prop="deviceType">
+          <template #default="scope">
+            <dict-tag :options="aqu_device_type" :value="scope.row.deviceType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="参数类型" align="center" prop="thresholdType">
+          <template #default="scope">
+            <dict-tag :options="threshold_type" :value="scope.row.thresholdType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="告警最大值" align="center" prop="limitUpper" />
+        <el-table-column label="告警最小值" align="center" prop="limitLower" />
+        <el-table-column label="告警当前值" align="center" prop="curValue" />
+        <el-table-column label="进展状态" align="center" prop="processStatus">
+          <template #default="scope">
+            <dict-tag :options="process_status" :value="scope.row.processStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="故障类型" align="center" prop="warnType">
+          <template #default="scope">
+            <dict-tag :options="risk_type" :value="scope.row.warnType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="处理人" align="center" prop="handlerName" />
+        <el-table-column label="处理时间" align="center" prop="processTime" width="160">
+        </el-table-column>
+         <el-table-column label="更新时间" align="center" prop="updateTime" width="160"></el-table-column>
+        <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="处理" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleProcess(scope.row)" v-hasPermi="['fishery:deviceWarnOne:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:deviceWarnOne:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改设备报警明细对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="deviceWarnOneFormRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="进展状态" prop="processStatus">
+          <el-select v-model="form.processStatus" placeholder="请选择进展状态">
+            <el-option
+                v-for="dict in process_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="故障类型" prop="warnType">
+          <el-select v-model="form.warnType" placeholder="请选择故障类型">
+            <el-option
+                v-for="dict in risk_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="DeviceWarnOne" lang="ts">
+import { listDeviceWarnOne, getDeviceWarnOne, delDeviceWarnOne, addDeviceWarnOne, updateDeviceWarnOne } from '@/api/fishery/deviceWarnOne';
+import { DeviceWarnOneVO, DeviceWarnOneQuery, DeviceWarnOneForm } from '@/api/fishery/deviceWarnOne/types';
+import { useUserStore } from '@/store/modules/user';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const userStore = useUserStore();
+const { threshold_type, process_status, risk_type, aqu_device_type } = toRefs<any>(proxy?.useDict('threshold_type', 'process_status', 'risk_type', 'aqu_device_type'));
+
+const deviceWarnOneList = ref<DeviceWarnOneVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const deviceWarnOneFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DeviceWarnOneForm = {
+  id: undefined,
+  warnCombineId: undefined,
+  userId: undefined,
+  limitUpper: undefined,
+  limitLower: undefined,
+  curValue: undefined,
+  processStatus: undefined,
+  warnType: undefined,
+  handlerName: undefined,
+  processTime: undefined,
+  remark: undefined
+}
+const data = reactive<PageData<DeviceWarnOneForm, DeviceWarnOneQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    warnCombineId: undefined,
+    userId: undefined,
+    processStatus: undefined,
+    warnType: undefined,
+    handlerName: undefined,
+    params: {
+    }
+  },
+  rules: {
+    processStatus: [
+      { required: true, message: "进展状态不能为空", trigger: "change" }
+    ],
+    warnType: [
+      { required: true, message: "故障类型不能为空", trigger: "change" }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备报警明细列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDeviceWarnOne(queryParams.value);
+  deviceWarnOneList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  deviceWarnOneFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceWarnOneVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加设备报警明细";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DeviceWarnOneVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDeviceWarnOne(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改设备报警明细";
+}
+
+/** 处理按钮操作 */
+const handleProcess = async (row?: DeviceWarnOneVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDeviceWarnOne(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "处理设备报警明细";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceWarnOneFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        // 设置处理人和处理时间
+        form.value.handlerName = userStore.nickname;
+        form.value.processTime = new Date().toISOString().slice(0, 19).replace('T', ' ');
+        await updateDeviceWarnOne(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDeviceWarnOne(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceWarnOneVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备报警明细编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delDeviceWarnOne(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/deviceWarnOne/export', {
+    ...queryParams.value
+  }, `deviceWarnOne_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/linkedCtrl/index.vue b/src/views/fishery/linkedCtrl/index.vue
index 74e13b6..3ec297e 100644
--- a/src/views/fishery/linkedCtrl/index.vue
+++ b/src/views/fishery/linkedCtrl/index.vue
@@ -150,7 +150,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
diff --git a/src/views/fishery/messageOpRecord/index.vue b/src/views/fishery/messageOpRecord/index.vue
new file mode 100644
index 0000000..4f19048
--- /dev/null
+++ b/src/views/fishery/messageOpRecord/index.vue
@@ -0,0 +1,274 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="用户信息" prop="params.userKeyword">
+              <el-input v-model="queryParams.params.userKeyword" placeholder="请输入用户名或手机号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="操作标题" prop="title">
+              <el-input v-model="queryParams.title" placeholder="请输入操作标题" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="操作内容" prop="message">
+              <el-input v-model="queryParams.message" placeholder="请输入操作内容" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="操作方式" prop="opType">
+              <el-select v-model="queryParams.opType" placeholder="请选择操作方式" clearable >
+                <el-option v-for="dict in op_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <!-- <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['fishery:messageOpRecord:add']">新增</el-button>
+          </el-col> -->
+          <!-- <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['fishery:messageOpRecord:edit']">修改</el-button>
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:messageOpRecord:remove']">删除</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:messageOpRecord:export']">导出</el-button>
+          </el-col> -->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="messageOpRecordList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="用户名" align="center" prop="userName" fixed="left" width="150"/>
+        <el-table-column label="手机号" align="center" prop="userPhonenumber" fixed="left" width="150"/>
+        <el-table-column label="操作标题" align="center" prop="title" width="150"/>
+         <el-table-column label="操作方式" align="center" prop="opType" width="150">
+          <template #default="scope">
+            <dict-tag :options="op_type" :value="scope.row.opType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作内容" align="center" prop="message" />
+        <el-table-column label="操作时间" align="center" prop="createTime" width="180"/>
+        <el-table-column label="操作" align="center" fixed="right"  width="100" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!-- <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['fishery:messageOpRecord:edit']"></el-button>
+            </el-tooltip> -->
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:messageOpRecord:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改用户操作记录对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="messageOpRecordFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id" />
+        </el-form-item>
+        <el-form-item label="操作用户id" prop="opUserId">
+          <el-input v-model="form.opUserId" placeholder="请输入操作用户id" />
+        </el-form-item>
+        <el-form-item label="操作标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入操作标题" />
+        </el-form-item>
+        <el-form-item label="操作内容" prop="message">
+          <el-input v-model="form.message" placeholder="请输入操作内容" />
+        </el-form-item>
+        <el-form-item label="操作方式" prop="opType">
+          <el-select v-model="form.opType" placeholder="请选择操作方式">
+            <el-option
+                v-for="dict in op_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MessageOpRecord" lang="ts">
+import { listMessageOpRecord, getMessageOpRecord, delMessageOpRecord, addMessageOpRecord, updateMessageOpRecord } from '@/api/fishery/messageOpRecord';
+import { MessageOpRecordVO, MessageOpRecordQuery, MessageOpRecordForm } from '@/api/fishery/messageOpRecord/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { op_type } = toRefs<any>(proxy?.useDict('op_type'));
+
+const messageOpRecordList = ref<MessageOpRecordVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const messageOpRecordFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: MessageOpRecordForm = {
+  id: undefined,
+  userId: undefined,
+  opUserId: undefined,
+  title: undefined,
+  message: undefined,
+  opType: undefined,
+  remark: undefined
+}
+const data = reactive<PageData<MessageOpRecordForm, MessageOpRecordQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userId: undefined,
+    opUserId: undefined,
+    title: undefined,
+    message: undefined,
+    opType: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键id不能为空", trigger: "blur" }
+    ],
+    userId: [
+      { required: true, message: "用户id不能为空", trigger: "blur" }
+    ],
+    title: [
+      { required: true, message: "操作标题不能为空", trigger: "blur" }
+    ],
+    message: [
+      { required: true, message: "操作内容不能为空", trigger: "blur" }
+    ],
+    opType: [
+      { required: true, message: "操作方式不能为空", trigger: "change" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询用户操作记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMessageOpRecord(queryParams.value);
+  messageOpRecordList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  messageOpRecordFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MessageOpRecordVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加用户操作记录";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MessageOpRecordVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getMessageOpRecord(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改用户操作记录";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  messageOpRecordFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateMessageOpRecord(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addMessageOpRecord(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MessageOpRecordVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除用户操作记录编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delMessageOpRecord(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/messageOpRecord/export', {
+    ...queryParams.value
+  }, `messageOpRecord_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/payDevice/index.vue b/src/views/fishery/payDevice/index.vue
index 59b3595..6e52bac 100644
--- a/src/views/fishery/payDevice/index.vue
+++ b/src/views/fishery/payDevice/index.vue
@@ -97,7 +97,7 @@
     <!-- 添加或修改设备充值记录对话框 -->
     <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
       <el-form ref="payDeviceFormRef" :model="form" :rules="rules" label-width="80px">
-        
+
           <el-form-item label="设备类型" prop="deviceType">
           <el-select v-model="form.deviceType" placeholder="请选择设备类型">
             <el-option
@@ -108,12 +108,12 @@
             ></el-option>
           </el-select>
         </el-form-item>
-       
+
         <el-form-item label="设备编号" prop="serialNum">
-          <el-input 
-            :value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''" 
-            placeholder="请选择设备" 
-            readonly 
+          <el-input
+            :value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''"
+            placeholder="请选择设备"
+            readonly
             @click="openDeviceSelect"
             style="cursor: pointer;"
             :disabled="!form.deviceType"
@@ -124,10 +124,10 @@
           </el-input>
         </el-form-item>
  <el-form-item label="用户" prop="userId">
-          <el-input 
-            :value="selectedUser ? `${selectedUser.userName} (${selectedUser.mobilePhone})` : ''" 
-            placeholder="请选择用户" 
-            readonly 
+          <el-input
+            :value="selectedUser ? `${selectedUser.userName} (${selectedUser.mobilePhone})` : ''"
+            placeholder="请选择用户"
+            readonly
             @click="openUserSelect"
             style="cursor: pointer;"
           >
@@ -174,7 +174,7 @@
           </el-select>
         </el-form-item> -->
         <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
@@ -184,42 +184,42 @@
         </div>
       </template>
     </el-dialog>
-    
+
     <!-- 设备选择对话框 -->
     <el-dialog title="选择设备" v-model="deviceSelectVisible" width="1200px" append-to-body>
       <!-- 搜索条件 -->
       <el-form :model="deviceQueryParams" :inline="true" class="mb-4">
         <el-form-item label="用户信息">
-          <el-input 
-            v-model="deviceQueryParams.params.userKeyword" 
-            placeholder="请输入用户名或手机号" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.params.userKeyword"
+            placeholder="请输入用户名或手机号"
+            clearable
             style="width: 200px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <el-form-item label="设备编号">
-          <el-input 
-            v-model="deviceQueryParams.serialNum" 
-            placeholder="请输入设备编号" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.serialNum"
+            placeholder="请输入设备编号"
+            clearable
             style="width: 180px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <el-form-item label="设备名称">
-          <el-input 
-            v-model="deviceQueryParams.deviceName" 
-            placeholder="请输入设备名称" 
-            clearable 
+          <el-input
+            v-model="deviceQueryParams.deviceName"
+            placeholder="请输入设备名称"
+            clearable
             style="width: 180px"
             @keyup.enter="handleDeviceQuery"
           />
         </el-form-item>
         <el-form-item label="设备类型">
-          <el-select 
-            v-model="deviceQueryParams.deviceType" 
-            placeholder="请选择设备类型" 
+          <el-select
+            v-model="deviceQueryParams.deviceType"
+            placeholder="请选择设备类型"
             disabled
             style="width: 150px"
           >
@@ -236,10 +236,10 @@
           <el-button icon="Refresh" @click="resetDeviceQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      
+
       <!-- 设备表格 -->
-      <el-table 
-        :data="deviceList" 
+      <el-table
+        :data="deviceList"
         highlight-current-row
         height="400px"
         border
@@ -266,9 +266,9 @@
         </el-table-column>
         <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
-            <el-button 
-              type="primary" 
-              size="small" 
+            <el-button
+              type="primary"
+              size="small"
               @click="handleDeviceSelect(scope.row)"
             >
               选择
@@ -276,42 +276,42 @@
           </template>
         </el-table-column>
       </el-table>
-      
+
       <!-- 分页 -->
-      <pagination 
-        v-show="deviceTotal > 0" 
-        :total="deviceTotal" 
-        v-model:page="deviceQueryParams.pageNum" 
-        v-model:limit="deviceQueryParams.pageSize" 
+      <pagination
+        v-show="deviceTotal > 0"
+        :total="deviceTotal"
+        v-model:page="deviceQueryParams.pageNum"
+        v-model:limit="deviceQueryParams.pageSize"
         @pagination="handleDevicePaginationChange"
         class="mt-4"
       />
-      
+
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="cancelDeviceSelect">取 消</el-button>
         </div>
       </template>
     </el-dialog>
-    
+
     <!-- 用户选择对话框 -->
     <el-dialog title="选择用户" v-model="userSelectVisible" width="900px" append-to-body>
       <!-- 搜索条件 -->
       <el-form :model="userQueryParams" :inline="true" class="mb-4">
         <el-form-item label="用户名">
-          <el-input 
-            v-model="userQueryParams.userName" 
-            placeholder="请输入用户名" 
-            clearable 
+          <el-input
+            v-model="userQueryParams.userName"
+            placeholder="请输入用户名"
+            clearable
             style="width: 180px"
             @keyup.enter="handleUserQuery"
           />
         </el-form-item>
         <el-form-item label="手机号">
-          <el-input 
-            v-model="userQueryParams.mobilePhone" 
-            placeholder="请输入手机号" 
-            clearable 
+          <el-input
+            v-model="userQueryParams.mobilePhone"
+            placeholder="请输入手机号"
+            clearable
             style="width: 180px"
             @keyup.enter="handleUserQuery"
           />
@@ -321,10 +321,10 @@
           <el-button icon="Refresh" @click="resetUserQuery">重置</el-button>
         </el-form-item>
       </el-form>
-      
+
       <!-- 用户表格 -->
-      <el-table 
-        :data="aquUserList" 
+      <el-table
+        :data="aquUserList"
         highlight-current-row
         height="400px"
         border
@@ -336,9 +336,9 @@
         <el-table-column label="区县" align="center" prop="district" />
         <el-table-column label="操作" align="center" width="100">
           <template #default="scope">
-            <el-button 
-              type="primary" 
-              size="small" 
+            <el-button
+              type="primary"
+              size="small"
               @click="handleUserSelect(scope.row)"
             >
               选择
@@ -346,24 +346,24 @@
           </template>
         </el-table-column>
       </el-table>
-      
+
       <!-- 分页 -->
-      <pagination 
-        v-show="userTotal > 0" 
-        :total="userTotal" 
-        v-model:page="userQueryParams.pageNum" 
-        v-model:limit="userQueryParams.pageSize" 
+      <pagination
+        v-show="userTotal > 0"
+        :total="userTotal"
+        v-model:page="userQueryParams.pageNum"
+        v-model:limit="userQueryParams.pageSize"
         @pagination="handleUserPaginationChange"
         class="mt-4"
       />
-      
+
       <template #footer>
         <div class="dialog-footer">
           <el-button @click="cancelUserSelect">取 消</el-button>
         </div>
       </template>
     </el-dialog>
-    
+
     <!-- 订单详情对话框 -->
     <el-dialog title="订单详情" v-model="orderDetailVisible" width="800px" append-to-body>
       <el-descriptions v-if="orderDetail" :column="2" border>
@@ -583,7 +583,7 @@ const handleUpdate = async (row?: PayDeviceVO) => {
   const _id = row?.id || ids.value[0]
   const res = await getPayDevice(_id);
   Object.assign(form.value, res.data);
-  
+
   // 回显用户信息
   if (form.value.userId) {
     try {
@@ -604,7 +604,7 @@ const handleUpdate = async (row?: PayDeviceVO) => {
   } else {
     selectedUser.value = null;
   }
-  
+
   // 回显设备信息
   if (form.value.serialNum) {
     try {
@@ -627,7 +627,7 @@ const handleUpdate = async (row?: PayDeviceVO) => {
   } else {
     selectedDevice.value = null;
   }
-  
+
   dialog.visible = true;
   dialog.title = "修改设备充值记录";
 }
@@ -815,7 +815,7 @@ const handleViewOrder = async (row: PayDeviceVO) => {
     proxy?.$modal.msgWarning('该记录没有关联订单');
     return;
   }
-  
+
   try {
     const res = await getPayOrder(row.orderId);
     orderDetail.value = res.data;
diff --git a/src/views/fishery/pond/index.vue b/src/views/fishery/pond/index.vue
index 6c6086e..31d9ce0 100644
--- a/src/views/fishery/pond/index.vue
+++ b/src/views/fishery/pond/index.vue
@@ -72,7 +72,7 @@
           </template>
         </el-table-column>
         <el-table-column label="创建时间" align="center" prop="createTime"  width="160"/>
-        <el-table-column label="修改时间" align="center" prop="updateTime"  width="160"/> 
+        <el-table-column label="更新时间" align="center" prop="updateTime"  width="160"/> 
         <el-table-column label="操作" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
diff --git a/src/views/fishery/tecentUserCache/index.vue b/src/views/fishery/tecentUserCache/index.vue
new file mode 100644
index 0000000..fc187d8
--- /dev/null
+++ b/src/views/fishery/tecentUserCache/index.vue
@@ -0,0 +1,224 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <!-- <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card> -->
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <!-- <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['fishery:tecentUserCache:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['fishery:tecentUserCache:edit']">修改</el-button>
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:tecentUserCache:remove']">删除</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:tecentUserCache:export']">导出</el-button>
+          </el-col> -->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="tecentUserCacheList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="主键id" align="center" prop="id" v-if="true" /> -->
+        <el-table-column label="openId" align="center" prop="openId" />
+        <el-table-column label="unionId" align="center" prop="unionId" />
+         <el-table-column label="创建时间" align="center" prop="createTime" width="180"/>
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!-- <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['fishery:tecentUserCache:edit']"></el-button>
+            </el-tooltip> -->
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:tecentUserCache:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改公众号用户缓存对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="tecentUserCacheFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="openId" prop="openId">
+          <el-input v-model="form.openId" placeholder="请输入openId" />
+        </el-form-item>
+        <el-form-item label="unionId" prop="unionId">
+          <el-input v-model="form.unionId" placeholder="请输入unionId" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="TecentUserCache" lang="ts">
+import { listTecentUserCache, getTecentUserCache, delTecentUserCache, addTecentUserCache, updateTecentUserCache } from '@/api/fishery/tecentUserCache';
+import { TecentUserCacheVO, TecentUserCacheQuery, TecentUserCacheForm } from '@/api/fishery/tecentUserCache/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const tecentUserCacheList = ref<TecentUserCacheVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const tecentUserCacheFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: TecentUserCacheForm = {
+  id: undefined,
+  openId: undefined,
+  unionId: undefined,
+  remark: undefined
+}
+const data = reactive<PageData<TecentUserCacheForm, TecentUserCacheQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键id不能为空", trigger: "blur" }
+    ],
+    openId: [
+      { required: true, message: "openId不能为空", trigger: "blur" }
+    ],
+    unionId: [
+      { required: true, message: "unionId不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询公众号用户缓存列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listTecentUserCache(queryParams.value);
+  tecentUserCacheList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  tecentUserCacheFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: TecentUserCacheVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加公众号用户缓存";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: TecentUserCacheVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getTecentUserCache(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改公众号用户缓存";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  tecentUserCacheFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateTecentUserCache(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addTecentUserCache(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: TecentUserCacheVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除公众号用户缓存编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delTecentUserCache(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/tecentUserCache/export', {
+    ...queryParams.value
+  }, `tecentUserCache_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/userRelation/index.vue b/src/views/fishery/userRelation/index.vue
index aef101d..8fc03d5 100644
--- a/src/views/fishery/userRelation/index.vue
+++ b/src/views/fishery/userRelation/index.vue
@@ -68,7 +68,7 @@
           <el-input v-model="form.childUserId" placeholder="请输入子账号id" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 7401494..7331950 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -109,7 +109,7 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
diff --git a/src/views/system/dict/data.vue b/src/views/system/dict/data.vue
index be5c87a..8cc92f0 100644
--- a/src/views/system/dict/data.vue
+++ b/src/views/system/dict/data.vue
@@ -112,7 +112,7 @@
           </el-select>
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注"></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index c97b92e..5e6e540 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -94,7 +94,7 @@
           <el-input v-model="form.dictType" placeholder="请输入字典类型" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注"></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
diff --git a/src/views/system/oss/config.vue b/src/views/system/oss/config.vue
index 89898d6..ea2fd1c 100644
--- a/src/views/system/oss/config.vue
+++ b/src/views/system/oss/config.vue
@@ -128,7 +128,7 @@
           <el-input v-model="form.region" placeholder="请输入域" />
         </el-form-item>
         <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
         </el-form-item>
       </el-form>
       <template #footer>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 803cf05..6da4e7d 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -154,7 +154,7 @@
               </el-radio-group>
             </el-form-item>
             <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注" />
             </el-form-item>
           </el-form>
           <template #footer>
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index c6d83b4..385f1d3 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -139,7 +139,7 @@
           ></el-tree>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入备注"></el-input>
         </el-form-item>
       </el-form>
       <template #footer>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index da8c5bc..d1ef075 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -239,7 +239,7 @@
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
-              <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+              <el-input v-model="form.remark" type="textarea" placeholder="请输入备注"></el-input>
             </el-form-item>
           </el-col>
         </el-row>

From cae0ff5d1ee864b99774974f908f16b7c365c30e Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Fri, 24 Oct 2025 20:41:45 +0800
Subject: [PATCH 2/6] =?UTF-8?q?fix:=20=E9=A6=96=E9=A1=B5=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/index.vue | 235 +++++++++++++++++++++++++++-----------------
 1 file changed, 144 insertions(+), 91 deletions(-)

diff --git a/src/views/index.vue b/src/views/index.vue
index bfda3f2..1aba486 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,96 +1,16 @@
 <template>
   <div class="app-container home">
-    <el-row :gutter="20">
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>RuoYi-Vue-Plus多租户管理系统</h2>
-        <p>
-          RuoYi-Vue-Plus 是基于 RuoYi-Vue 针对 分布式集群 场景升级(不兼容原框架)
-          <br />
-          * 前端开发框架 Vue3、TS、Element Plus<br />
-          * 后端开发框架 Spring Boot<br />
-          * 容器框架 Undertow 基于 Netty 的高性能容器<br />
-          * 权限认证框架 Sa-Token 支持多终端认证系统<br />
-          * 关系数据库 MySQL 适配 8.X 最低 5.7<br />
-          * 缓存数据库 Redis 适配 6.X 最低 4.X<br />
-          * 数据库框架 Mybatis-Plus 快速 CRUD 增加开发效率<br />
-          * 数据库框架 p6spy 更强劲的 SQL 分析<br />
-          * 多数据源框架 dynamic-datasource 支持主从与多种类数据库异构<br />
-          * 序列化框架 Jackson 统一使用 jackson 高效可靠<br />
-          * Redis客户端 Redisson 性能强劲、API丰富<br />
-          * 分布式限流 Redisson 全局、请求IP、集群ID 多种限流<br />
-          * 分布式锁 Lock4j 注解锁、工具锁 多种多样<br />
-          * 分布式幂等 Lock4j 基于分布式锁实现<br />
-          * 分布式链路追踪 SkyWalking 支持链路追踪、网格分析、度量聚合、可视化<br />
-          * 分布式任务调度 SnailJob 高性能 高可靠 易扩展<br />
-          * 文件存储 Minio 本地存储<br />
-          * 文件存储 七牛、阿里、腾讯 云存储<br />
-          * 监控框架 SpringBoot-Admin 全方位服务监控<br />
-          * 校验框架 Validation 增强接口安全性 严谨性<br />
-          * Excel框架 FastExcel(原Alibaba EasyExcel) 性能优异 扩展性强<br />
-          * 文档框架 SpringDoc、javadoc 无注解零入侵基于java注释<br />
-          * 工具类框架 Hutool、Lombok 减少代码冗余 增加安全性<br />
-          * 代码生成器 适配MP、SpringDoc规范化代码 一键生成前后端代码<br />
-          * 部署方式 Docker 容器编排 一键部署业务集群<br />
-          * 国际化 SpringMessage Spring标准国际化方案<br />
-        </p>
-        <p><b>当前版本:</b> <span>v5.5.0</span></p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://gitee.com/dromara/RuoYi-Vue-Plus')">访问码云</el-button>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://github.com/dromara/RuoYi-Vue-Plus')">访问GitHub</el-button>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://plus-doc.dromara.org/#/ruoyi-vue-plus/changlog')"
-            >更新日志</el-button
-          >
-        </p>
-      </el-col>
-
-      <el-col :sm="24" :lg="12" style="padding-left: 20px">
-        <h2>RuoYi-Cloud-Plus多租户微服务管理系统</h2>
-        <p>
-          RuoYi-Cloud-Plus 微服务通用权限管理系统 重写 RuoYi-Cloud 全方位升级(不兼容原框架)
-          <br />
-          * 前端开发框架 Vue3、TS、Element UI<br />
-          * 后端开发框架 Spring Boot<br />
-          * 微服务开发框架 Spring Cloud、Spring Cloud Alibaba<br />
-          * 容器框架 Undertow 基于 XNIO 的高性能容器<br />
-          * 权限认证框架 Sa-Token、Jwt 支持多终端认证系统<br />
-          * 关系数据库 MySQL 适配 8.X 最低 5.7<br />
-          * 关系数据库 Oracle 适配 11g 12c<br />
-          * 关系数据库 PostgreSQL 适配 13 14<br />
-          * 关系数据库 SQLServer 适配 2017 2019<br />
-          * 缓存数据库 Redis 适配 6.X 最低 5.X<br />
-          * 分布式注册中心 Alibaba Nacos 采用2.X 基于GRPC通信高性能<br />
-          * 分布式配置中心 Alibaba Nacos 采用2.X 基于GRPC通信高性能<br />
-          * 服务网关 Spring Cloud Gateway 响应式高性能网关<br />
-          * 负载均衡 Spring Cloud Loadbalancer 负载均衡处理<br />
-          * RPC远程调用 Apache Dubbo 原生态使用体验、高性能<br />
-          * 分布式限流熔断 Alibaba Sentinel 无侵入、高扩展<br />
-          * 分布式事务 Alibaba Seata 无侵入、高扩展 支持 四种模式<br />
-          * 分布式消息队列 Apache Kafka 高性能高速度<br />
-          * 分布式消息队列 Apache RocketMQ 高可用功能多样<br />
-          * 分布式消息队列 RabbitMQ 支持各种扩展插件功能多样性<br />
-          * 分布式搜索引擎 ElasticSearch 业界知名<br />
-          * 分布式链路追踪 Apache SkyWalking 链路追踪、网格分析、度量聚合、可视化<br />
-          * 分布式日志中心 ELK 业界成熟解决方案<br />
-          * 分布式监控 Prometheus、Grafana 全方位性能监控<br />
-          * 其余与 Vue 版本一致<br />
-        </p>
-        <p><b>当前版本:</b> <span>v2.5.0</span></p>
-        <p>
-          <el-tag type="danger">&yen;免费开源</el-tag>
-        </p>
-        <p>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://gitee.com/dromara/RuoYi-Cloud-Plus')">访问码云</el-button>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://github.com/dromara/RuoYi-Cloud-Plus')">访问GitHub</el-button>
-          <el-button type="primary" icon="Cloudy" plain @click="goTarget('https://plus-doc.dromara.org/#/ruoyi-cloud-plus/changlog')"
-            >更新日志</el-button
-          >
-        </p>
-      </el-col>
-    </el-row>
-    <el-divider />
+    <div class="welcome-container">
+      <div class="welcome-content">
+        <h1 class="welcome-title">欢迎使用</h1>
+        <h2 class="platform-name">水产养殖监测平台</h2>
+        <div class="welcome-decoration">
+          <span class="dot"></span>
+          <span class="dot"></span>
+          <span class="dot"></span>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
@@ -102,6 +22,139 @@ const goTarget = (url: string) => {
 
 <style lang="scss" scoped>
 .home {
+  height: calc(100vh - 84px);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%);
+  position: relative;
+  overflow: hidden;
+
+  &::before {
+    content: '';
+    position: absolute;
+    top: -50%;
+    left: -50%;
+    width: 200%;
+    height: 200%;
+    background: radial-gradient(circle, rgba(255, 255, 255, 0.1) 1px, transparent 1px);
+    background-size: 50px 50px;
+    animation: moveBackground 20s linear infinite;
+  }
+
+  .welcome-container {
+    position: relative;
+    z-index: 1;
+  }
+
+  .welcome-content {
+    text-align: center;
+    padding: 60px 80px;
+    background: rgba(255, 255, 255, 0.95);
+    border-radius: 20px;
+    box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3);
+    backdrop-filter: blur(10px);
+    transform: translateY(0);
+    animation: fadeInUp 1s ease-out;
+  }
+
+  .welcome-title {
+    font-size: 48px;
+    font-weight: 300;
+    color: #333;
+    margin: 0 0 20px 0;
+    letter-spacing: 8px;
+    animation: slideInLeft 0.8s ease-out;
+  }
+
+  .platform-name {
+    font-size: 56px;
+    font-weight: 700;
+    background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
+    -webkit-background-clip: text;
+    -webkit-text-fill-color: transparent;
+    background-clip: text;
+    margin: 0 0 30px 0;
+    letter-spacing: 4px;
+    animation: slideInRight 0.8s ease-out;
+  }
+
+  .welcome-decoration {
+    display: flex;
+    justify-content: center;
+    gap: 12px;
+    margin-top: 30px;
+  }
+
+  .dot {
+    width: 12px;
+    height: 12px;
+    border-radius: 50%;
+    background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
+    animation: bounce 1.4s infinite ease-in-out;
+
+    &:nth-child(1) {
+      animation-delay: -0.32s;
+    }
+
+    &:nth-child(2) {
+      animation-delay: -0.16s;
+    }
+  }
+
+  @keyframes fadeInUp {
+    from {
+      opacity: 0;
+      transform: translateY(40px);
+    }
+    to {
+      opacity: 1;
+      transform: translateY(0);
+    }
+  }
+
+  @keyframes slideInLeft {
+    from {
+      opacity: 0;
+      transform: translateX(-50px);
+    }
+    to {
+      opacity: 1;
+      transform: translateX(0);
+    }
+  }
+
+  @keyframes slideInRight {
+    from {
+      opacity: 0;
+      transform: translateX(50px);
+    }
+    to {
+      opacity: 1;
+      transform: translateX(0);
+    }
+  }
+
+  @keyframes bounce {
+    0%,
+    80%,
+    100% {
+      transform: scale(0);
+    }
+    40% {
+      transform: scale(1);
+    }
+  }
+
+  @keyframes moveBackground {
+    0% {
+      transform: translate(0, 0);
+    }
+    100% {
+      transform: translate(50px, 50px);
+    }
+  }
+
   blockquote {
     padding: 10px 20px;
     margin: 0 0 20px;

From 24cdc18b8af5dab8fe76c5aeb0e782ece0b969a6 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Thu, 30 Oct 2025 11:21:52 +0800
Subject: [PATCH 3/6] =?UTF-8?q?feat:=20=E6=96=B0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=91=8A=E8=AD=A6?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E3=80=81=E8=AE=BE=E5=A4=87=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B=E7=AD=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/fishery/callNotice/index.ts           |  63 +++
 src/api/fishery/callNotice/types.ts           | 235 ++++++++++
 .../fishery/mapMessageWarnCallNotice/index.ts |  63 +++
 .../fishery/mapMessageWarnCallNotice/types.ts |  63 +++
 src/api/fishery/messageWarn/index.ts          |  63 +++
 src/api/fishery/messageWarn/types.ts          | 183 ++++++++
 src/types/components.d.ts                     |   3 -
 src/views/demo/demo/index.vue                 |   2 +-
 src/views/demo/tree/index.vue                 |   2 +-
 src/views/fishery/aquUser/index.vue           |   2 +-
 src/views/fishery/callNotice/index.vue        | 392 +++++++++++++++++
 src/views/fishery/device/index.vue            |   2 +-
 src/views/fishery/deviceBindRecord/index.vue  |   2 +-
 .../fishery/deviceCorrectRecord/index.vue     |   2 +-
 src/views/fishery/deviceErrorCode/index.vue   |   2 +-
 src/views/fishery/deviceSwitch/index.vue      |   2 +-
 src/views/fishery/deviceThreshold/index.vue   |   2 +-
 src/views/fishery/deviceWarnOne/index.vue     |   2 +-
 src/views/fishery/fish/index.vue              |   2 +-
 src/views/fishery/linkedCtrl/index.vue        |   2 +-
 .../mapMessageWarnCallNotice/index.vue        | 231 ++++++++++
 src/views/fishery/messageOpRecord/index.vue   |   2 +-
 src/views/fishery/messageWarn/index.vue       | 405 ++++++++++++++++++
 src/views/fishery/payDevice/index.vue         |   2 +-
 src/views/fishery/pond/index.vue              |   2 +-
 src/views/fishery/tecentUserCache/index.vue   |   2 +-
 src/views/fishery/timingCtrl/index.vue        |   2 +-
 src/views/fishery/userRelation/index.vue      |   2 +-
 src/views/system/client/index.vue             |   2 +-
 src/views/system/config/index.vue             |   2 +-
 src/views/system/dict/index.vue               |   2 +-
 src/views/system/notice/index.vue             |   2 +-
 32 files changed, 1720 insertions(+), 25 deletions(-)
 create mode 100644 src/api/fishery/callNotice/index.ts
 create mode 100644 src/api/fishery/callNotice/types.ts
 create mode 100644 src/api/fishery/mapMessageWarnCallNotice/index.ts
 create mode 100644 src/api/fishery/mapMessageWarnCallNotice/types.ts
 create mode 100644 src/api/fishery/messageWarn/index.ts
 create mode 100644 src/api/fishery/messageWarn/types.ts
 create mode 100644 src/views/fishery/callNotice/index.vue
 create mode 100644 src/views/fishery/mapMessageWarnCallNotice/index.vue
 create mode 100644 src/views/fishery/messageWarn/index.vue

diff --git a/src/api/fishery/callNotice/index.ts b/src/api/fishery/callNotice/index.ts
new file mode 100644
index 0000000..cb8e0b0
--- /dev/null
+++ b/src/api/fishery/callNotice/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { CallNoticeVO, CallNoticeForm, CallNoticeQuery } from '@/api/fishery/callNotice/types';
+
+/**
+ * 查询告警电话通知记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listCallNotice = (query?: CallNoticeQuery): AxiosPromise<CallNoticeVO[]> => {
+  return request({
+    url: '/fishery/callNotice/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询告警电话通知记录详细
+ * @param id
+ */
+export const getCallNotice = (id: string | number): AxiosPromise<CallNoticeVO> => {
+  return request({
+    url: '/fishery/callNotice/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增告警电话通知记录
+ * @param data
+ */
+export const addCallNotice = (data: CallNoticeForm) => {
+  return request({
+    url: '/fishery/callNotice',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改告警电话通知记录
+ * @param data
+ */
+export const updateCallNotice = (data: CallNoticeForm) => {
+  return request({
+    url: '/fishery/callNotice',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除告警电话通知记录
+ * @param id
+ */
+export const delCallNotice = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/callNotice/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/callNotice/types.ts b/src/api/fishery/callNotice/types.ts
new file mode 100644
index 0000000..bde6697
--- /dev/null
+++ b/src/api/fishery/callNotice/types.ts
@@ -0,0 +1,235 @@
+export interface CallNoticeVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 用户id
+   */
+  userId: string | number;
+
+  /**
+   * 通知手机号
+   */
+  mobilePhone: string;
+
+  /**
+   * 设备id
+   */
+  deviceId: string | number;
+
+  /**
+   * 呼叫状态
+   */
+  callStatus: number;
+
+  /**
+   * 主叫号码
+   */
+  caller: string;
+
+  /**
+   * 通话时长
+   */
+  duration: string;
+
+  /**
+   * 通话结束时间
+   */
+  endTime: string;
+
+  /**
+   * 挂断方向
+   */
+  hangupDirection: string;
+
+  /**
+   * 呼叫发起时间
+   */
+  originateTime: string;
+
+  /**
+   * 扩展字段回传
+   */
+  outId: string | number;
+
+  /**
+   * 被叫响铃时间
+   */
+  ringTime: string;
+
+  /**
+   * 通话接通时间
+   */
+  startTime: string;
+
+  /**
+   * 呼叫结果状态码
+   */
+  statusCode: string;
+
+  /**
+   * 结果描述
+   */
+  statusMsg: string;
+
+  /**
+   * 通话类型
+   */
+  tollType: string;
+
+  /**
+   * 话单类型
+   */
+  voiceType: string;
+
+}
+
+export interface CallNoticeForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 通知手机号
+   */
+  mobilePhone?: string;
+
+  /**
+   * 设备id
+   */
+  deviceId?: string | number;
+
+  /**
+   * 设定的呼叫时间
+   */
+  callTime?: string;
+
+  /**
+   * 呼叫的CallId
+   */
+  callId?: string | number;
+
+  /**
+   * 呼叫状态
+   */
+  callStatus?: number;
+
+  /**
+   * 主叫号码
+   */
+  caller?: string;
+
+  /**
+   * 通话时长
+   */
+  duration?: string;
+
+  /**
+   * 通话结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 挂断方向
+   */
+  hangupDirection?: string;
+
+  /**
+   * 呼叫发起时间
+   */
+  originateTime?: string;
+
+  /**
+   * 扩展字段回传
+   */
+  outId?: string | number;
+
+  /**
+   * 被叫响铃时间
+   */
+  ringTime?: string;
+
+  /**
+   * 通话接通时间
+   */
+  startTime?: string;
+
+  /**
+   * 呼叫结果状态码
+   */
+  statusCode?: string;
+
+  /**
+   * 结果描述
+   */
+  statusMsg?: string;
+
+  /**
+   * 通话类型
+   */
+  tollType?: string;
+
+  /**
+   * 话单类型
+   */
+  voiceType?: string;
+
+  /**
+   * 塘口名称
+   */
+  pondName?: string;
+
+}
+
+export interface CallNoticeQuery extends PageQuery {
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  callStatus?: string | number;
+
+  /**
+   * 通知手机号
+   */
+  mobilePhone?: string;
+
+  /**
+   * 设备id
+   */
+  deviceId?: string | number;
+
+  /**
+   * 通话时长
+   */
+  duration?: string;
+
+  /**
+   * 通话结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 挂断方向
+   */
+  hangupDirection?: string;
+
+  /**
+   * 通话类型
+   */
+  tollType?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/fishery/mapMessageWarnCallNotice/index.ts b/src/api/fishery/mapMessageWarnCallNotice/index.ts
new file mode 100644
index 0000000..e0bc6db
--- /dev/null
+++ b/src/api/fishery/mapMessageWarnCallNotice/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MapMessageWarnCallNoticeVO, MapMessageWarnCallNoticeForm, MapMessageWarnCallNoticeQuery } from '@/api/fishery/mapMessageWarnCallNotice/types';
+
+/**
+ * 查询告警消息和电话告警通知关系表列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMapMessageWarnCallNotice = (query?: MapMessageWarnCallNoticeQuery): AxiosPromise<MapMessageWarnCallNoticeVO[]> => {
+  return request({
+    url: '/fishery/mapMessageWarnCallNotice/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询告警消息和电话告警通知关系表详细
+ * @param id
+ */
+export const getMapMessageWarnCallNotice = (id: string | number): AxiosPromise<MapMessageWarnCallNoticeVO> => {
+  return request({
+    url: '/fishery/mapMessageWarnCallNotice/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增告警消息和电话告警通知关系表
+ * @param data
+ */
+export const addMapMessageWarnCallNotice = (data: MapMessageWarnCallNoticeForm) => {
+  return request({
+    url: '/fishery/mapMessageWarnCallNotice',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改告警消息和电话告警通知关系表
+ * @param data
+ */
+export const updateMapMessageWarnCallNotice = (data: MapMessageWarnCallNoticeForm) => {
+  return request({
+    url: '/fishery/mapMessageWarnCallNotice',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除告警消息和电话告警通知关系表
+ * @param id
+ */
+export const delMapMessageWarnCallNotice = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/mapMessageWarnCallNotice/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/mapMessageWarnCallNotice/types.ts b/src/api/fishery/mapMessageWarnCallNotice/types.ts
new file mode 100644
index 0000000..0502cb7
--- /dev/null
+++ b/src/api/fishery/mapMessageWarnCallNotice/types.ts
@@ -0,0 +1,63 @@
+export interface MapMessageWarnCallNoticeVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 告警消息Id
+   */
+  messageWarnId: string | number;
+
+  /**
+   * 电话通知id
+   */
+  callNoticeId: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface MapMessageWarnCallNoticeForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 告警消息Id
+   */
+  messageWarnId?: string | number;
+
+  /**
+   * 电话通知id
+   */
+  callNoticeId?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface MapMessageWarnCallNoticeQuery extends PageQuery {
+
+  /**
+   * 告警消息Id
+   */
+  messageWarnId?: string | number;
+
+  /**
+   * 电话通知id
+   */
+  callNoticeId?: string | number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/fishery/messageWarn/index.ts b/src/api/fishery/messageWarn/index.ts
new file mode 100644
index 0000000..4e7ce30
--- /dev/null
+++ b/src/api/fishery/messageWarn/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { MessageWarnVO, MessageWarnForm, MessageWarnQuery } from '@/api/fishery/messageWarn/types';
+
+/**
+ * 查询设备告警记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listMessageWarn = (query?: MessageWarnQuery): AxiosPromise<MessageWarnVO[]> => {
+  return request({
+    url: '/fishery/messageWarn/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备告警记录详细
+ * @param id
+ */
+export const getMessageWarn = (id: string | number): AxiosPromise<MessageWarnVO> => {
+  return request({
+    url: '/fishery/messageWarn/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备告警记录
+ * @param data
+ */
+export const addMessageWarn = (data: MessageWarnForm) => {
+  return request({
+    url: '/fishery/messageWarn',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备告警记录
+ * @param data
+ */
+export const updateMessageWarn = (data: MessageWarnForm) => {
+  return request({
+    url: '/fishery/messageWarn',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备告警记录
+ * @param id
+ */
+export const delMessageWarn = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/messageWarn/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/messageWarn/types.ts b/src/api/fishery/messageWarn/types.ts
new file mode 100644
index 0000000..f397574
--- /dev/null
+++ b/src/api/fishery/messageWarn/types.ts
@@ -0,0 +1,183 @@
+export interface MessageWarnVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 用户id
+   */
+  userId: string | number;
+
+  /**
+   * 设备id
+   */
+  deviceId: string | number;
+
+  /**
+   * 消息标题
+   */
+  title: string;
+
+  /**
+   * 消息内容
+   */
+  message: string;
+
+  /**
+   * 是否已读
+   */
+  isRead: number;
+
+  /**
+   * 告警类型
+   */
+  warnType: number;
+
+  /**
+   * 塘口名称
+   */
+  pondName: string;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+  /**
+   * 用户名
+   */
+  userName?: string;
+
+  /**
+   * 手机号
+   */
+  mobilePhone?: string;
+
+  /**
+   * 设备编号
+   */
+  serialNum?: string;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+  /**
+   * 创建时间
+   */
+  createTime?: string;
+
+}
+
+export interface MessageWarnForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 设备id
+   */
+  deviceId?: string | number;
+
+  /**
+   * 消息标题
+   */
+  title?: string;
+
+  /**
+   * 消息内容
+   */
+  message?: string;
+
+  /**
+   * 是否已读
+   */
+  isRead?: number;
+
+  /**
+   * 告警类型
+   */
+  warnType?: number;
+
+  /**
+   * 塘口名称
+   */
+  pondName?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+  /**
+   * 用户名
+   */
+  userName?: string;
+
+  /**
+   * 手机号
+   */
+  mobilePhone?: string;
+
+  /**
+   * 设备编号
+   */
+  serialNum?: string;
+
+  /**
+   * 设备名称
+   */
+  deviceName?: string;
+
+}
+
+export interface MessageWarnQuery extends PageQuery {
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 设备id
+   */
+  deviceId?: string | number;
+
+  /**
+   * 消息标题
+   */
+  title?: string;
+
+  /**
+   * 消息内容
+   */
+  message?: string;
+
+  /**
+   * 是否已读
+   */
+  isRead?: number;
+
+  /**
+   * 告警类型
+   */
+  warnType?: number;
+
+  /**
+   * 塘口名称
+   */
+  pondName?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index a8d3273..abfacc7 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -36,7 +36,6 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
-    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
     ElLink: typeof import('element-plus/es')['ElLink']
@@ -57,7 +56,6 @@ declare module 'vue' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
-    ElText: typeof import('element-plus/es')['ElText']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
@@ -69,7 +67,6 @@ declare module 'vue' {
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
-    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
diff --git a/src/views/demo/demo/index.vue b/src/views/demo/demo/index.vue
index e064f40..f58c811 100644
--- a/src/views/demo/demo/index.vue
+++ b/src/views/demo/demo/index.vue
@@ -222,7 +222,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: DemoVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除测试单编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => (loading.value = false));
   await delDemo(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
diff --git a/src/views/demo/tree/index.vue b/src/views/demo/tree/index.vue
index ef923be..67c22bf 100644
--- a/src/views/demo/tree/index.vue
+++ b/src/views/demo/tree/index.vue
@@ -246,7 +246,7 @@ const submitForm = () => {
 
 /** 删除按钮操作 */
 const handleDelete = async (row: TreeVO) => {
-  await proxy?.$modal.confirm('是否确认删除测试树编号为"' + row.id + '"的数据项？');
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？');
   loading.value = true;
   await delTree(row.id).finally(() => (loading.value = false));
   await getList();
diff --git a/src/views/fishery/aquUser/index.vue b/src/views/fishery/aquUser/index.vue
index c14c4e8..ee01768 100644
--- a/src/views/fishery/aquUser/index.vue
+++ b/src/views/fishery/aquUser/index.vue
@@ -961,7 +961,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: AquUserVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除养殖账号编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => (loading.value = false));
   await delAquUser(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
diff --git a/src/views/fishery/callNotice/index.vue b/src/views/fishery/callNotice/index.vue
new file mode 100644
index 0000000..ec9d6a1
--- /dev/null
+++ b/src/views/fishery/callNotice/index.vue
@@ -0,0 +1,392 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+            <el-form-item label="用户信息" prop="params.userKeyword">
+              <el-input v-model="queryParams.params.userKeyword" placeholder="请输入用户名或手机号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备信息" prop="params.deviceKeyword">
+              <el-input v-model="queryParams.params.deviceKeyword" placeholder="请输入设备名称或设备编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备类型" prop="params.deviceType">
+              <el-select v-model="queryParams.params.deviceType" placeholder="请选择设备类型" clearable >
+                <el-option v-for="dict in aqu_device_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+              <el-form-item label="告警类型" prop="params.warnType">
+              <el-select v-model="queryParams.params.warnType" placeholder="请选择告警类型" clearable >
+                <el-option v-for="dict in warn_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="呼叫电话" prop="mobilePhone">
+              <el-input v-model="queryParams.mobilePhone" placeholder="请输入呼叫电话" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="呼叫状态" prop="callStatus">
+              <el-select v-model="queryParams.callStatus" placeholder="请选择呼叫状态" clearable >
+                <el-option v-for="dict in call_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <!-- <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['fishery:callNotice:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['fishery:callNotice:edit']">修改</el-button>
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:callNotice:remove']">删除</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:callNotice:export']">导出</el-button>
+          </el-col> -->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="callNoticeList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="用户名" align="center" prop="userName" width="120"/>
+        <!-- <el-table-column label="手机号" align="center" prop="mobilePhone"  width="120"/> -->
+        <el-table-column label="设备编号" align="center" prop="serialNum"  width="150"/>
+         <!-- <el-table-column label="设备名称" align="center" prop="deviceName" width="120"/> -->
+          <el-table-column label="设备类型" align="center" prop="deviceType" width="120">
+          <template #default="scope">
+            <dict-tag :options="aqu_device_type" :value="scope.row.deviceType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="呼叫电话" align="center" prop="mobilePhone" width="120"/>
+         <el-table-column label="呼叫时间" align="center" prop="callTime"  width="180"/>
+          <el-table-column label="告警类型" align="center" prop="warnType" width="150">
+          <template #default="scope">
+            <dict-tag :options="warn_type" :value="scope.row.warnType"/>
+          </template>
+        </el-table-column>
+         <el-table-column label="告警标题" align="center" prop="warnTitle" width="100"/>
+        <el-table-column label="呼叫状态" align="center" prop="callStatus">
+          <template #default="scope">
+            <dict-tag :options="call_status" :value="scope.row.callStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="主叫号码" align="center" prop="caller" />
+         <!-- <el-table-column label="呼叫发起时间" align="center" prop="originateTime" /> -->
+          <!-- <el-table-column label="通话接通时间" align="center" prop="startTime" />
+           <el-table-column label="通话结束时间" align="center" prop="endTime" /> -->
+        <!-- <el-table-column label="通话时长" align="center" prop="duration" width="90">
+          <template #default="scope">
+            {{ scope.row.duration ? scope.row.duration + '秒' : '' }}
+          </template>
+        </el-table-column> -->
+        <!-- <el-table-column label="呼叫结果状态码" align="center" prop="statusCode" /> -->
+        <el-table-column label="结果描述" align="center" prop="statusMsg" />
+        <!-- <el-table-column label="通话类型" align="center" prop="tollType">
+          <template #default="scope">
+            <dict-tag :options="toll_type" :value="scope.row.tollType"/>
+          </template>
+        </el-table-column> -->
+        <el-table-column label="操作" align="center"   width="80"  class-name="small-padding fixed-width">
+          <template #default="scope">
+            <!-- <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['fishery:callNotice:edit']"></el-button>
+            </el-tooltip> -->
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:callNotice:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改告警电话通知记录对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="callNoticeFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="用户id" prop="userId">
+          <el-input v-model="form.userId" placeholder="请输入用户id" />
+        </el-form-item>
+        <el-form-item label="呼叫电话" prop="mobilePhone">
+          <el-input v-model="form.mobilePhone" placeholder="请输入呼叫电话" />
+        </el-form-item>
+        <el-form-item label="设备id" prop="deviceId">
+          <el-input v-model="form.deviceId" placeholder="请输入设备id" />
+        </el-form-item>
+        <el-form-item label="设定的呼叫时间" prop="callTime">
+          <el-date-picker clearable
+            v-model="form.callTime"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择设定的呼叫时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="呼叫的CallId" prop="callId">
+          <el-input v-model="form.callId" placeholder="请输入呼叫的CallId" />
+        </el-form-item>
+        <el-form-item label="呼叫状态" prop="callStatus">
+          <el-select v-model="form.callStatus" placeholder="请选择呼叫状态">
+            <el-option
+                v-for="dict in call_status"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="主叫号码" prop="caller">
+          <el-input v-model="form.caller" placeholder="请输入主叫号码" />
+        </el-form-item>
+        <el-form-item label="通话时长" prop="duration">
+          <el-input v-model="form.duration" placeholder="请输入通话时长" />
+        </el-form-item>
+        <el-form-item label="通话结束时间" prop="endTime">
+          <el-input v-model="form.endTime" placeholder="请输入通话结束时间" />
+        </el-form-item>
+        <el-form-item label="挂断方向" prop="hangupDirection">
+          <el-input v-model="form.hangupDirection" placeholder="请输入挂断方向" />
+        </el-form-item>
+        <el-form-item label="呼叫发起时间" prop="originateTime">
+          <el-input v-model="form.originateTime" placeholder="请输入呼叫发起时间" />
+        </el-form-item>
+        <el-form-item label="扩展字段回传" prop="outId">
+          <el-input v-model="form.outId" placeholder="请输入扩展字段回传" />
+        </el-form-item>
+        <el-form-item label="被叫响铃时间" prop="ringTime">
+          <el-input v-model="form.ringTime" placeholder="请输入被叫响铃时间" />
+        </el-form-item>
+        <el-form-item label="通话接通时间" prop="startTime">
+          <el-input v-model="form.startTime" placeholder="请输入通话接通时间" />
+        </el-form-item>
+        <el-form-item label="呼叫结果状态码" prop="statusCode">
+          <el-input v-model="form.statusCode" placeholder="请输入呼叫结果状态码" />
+        </el-form-item>
+        <el-form-item label="结果描述" prop="statusMsg">
+          <el-input v-model="form.statusMsg" placeholder="请输入结果描述" />
+        </el-form-item>
+        <el-form-item label="通话类型" prop="tollType">
+          <el-select v-model="form.tollType" placeholder="请选择通话类型">
+            <el-option
+                v-for="dict in toll_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="话单类型" prop="voiceType">
+          <el-select v-model="form.voiceType" placeholder="请选择话单类型">
+            <el-option
+                v-for="dict in voice_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="塘口名称" prop="pondName">
+          <el-input v-model="form.pondName" placeholder="请输入塘口名称" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="CallNotice" lang="ts">
+import { listCallNotice, getCallNotice, delCallNotice, addCallNotice, updateCallNotice } from '@/api/fishery/callNotice';
+import { CallNoticeVO, CallNoticeQuery, CallNoticeForm } from '@/api/fishery/callNotice/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { toll_type, call_status, voice_type,aqu_device_type,warn_type } = toRefs<any>(proxy?.useDict('toll_type', 'call_status', 'voice_type','aqu_device_type','warn_type'));
+
+const callNoticeList = ref<CallNoticeVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const callNoticeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: CallNoticeForm = {
+  id: undefined,
+  userId: undefined,
+  mobilePhone: undefined,
+  deviceId: undefined,
+  callTime: undefined,
+  callId: undefined,
+  callStatus: undefined,
+  caller: undefined,
+  duration: undefined,
+  endTime: undefined,
+  hangupDirection: undefined,
+  originateTime: undefined,
+  outId: undefined,
+  ringTime: undefined,
+  startTime: undefined,
+  statusCode: undefined,
+  statusMsg: undefined,
+  tollType: undefined,
+  voiceType: undefined,
+  pondName: undefined,
+}
+const data = reactive<PageData<CallNoticeForm, CallNoticeQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userId: undefined,
+    mobilePhone: undefined,
+    deviceId: undefined,
+    duration: undefined,
+    endTime: undefined,
+    hangupDirection: undefined,
+    tollType: undefined,
+    callStatus: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键id不能为空", trigger: "blur" }
+    ],
+    userId: [
+      { required: true, message: "用户id不能为空", trigger: "blur" }
+    ],
+    mobilePhone: [
+      { required: true, message: "呼叫电话不能为空", trigger: "blur" }
+    ],
+    deviceId: [
+      { required: true, message: "设备id不能为空", trigger: "blur" }
+    ],
+    callTime: [
+      { required: true, message: "设定的呼叫时间不能为空", trigger: "blur" }
+    ],
+    callStatus: [
+      { required: true, message: "呼叫状态不能为空", trigger: "change" }
+    ],
+    pondName: [
+      { required: true, message: "塘口名称不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询告警电话通知记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listCallNotice(queryParams.value);
+  callNoticeList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  callNoticeFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: CallNoticeVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加告警电话通知记录";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: CallNoticeVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getCallNotice(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改告警电话通知记录";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  callNoticeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateCallNotice(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addCallNotice(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: CallNoticeVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
+  await delCallNotice(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/callNotice/export', {
+    ...queryParams.value
+  }, `callNotice_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/device/index.vue b/src/views/fishery/device/index.vue
index 3ac046d..faac47b 100644
--- a/src/views/fishery/device/index.vue
+++ b/src/views/fishery/device/index.vue
@@ -1207,7 +1207,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: DeviceVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除设备管理编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delDevice(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/deviceBindRecord/index.vue b/src/views/fishery/deviceBindRecord/index.vue
index 75cfd93..cb73477 100644
--- a/src/views/fishery/deviceBindRecord/index.vue
+++ b/src/views/fishery/deviceBindRecord/index.vue
@@ -393,7 +393,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: DeviceBindRecordVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除设备绑定记录编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delDeviceBindRecord(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/deviceCorrectRecord/index.vue b/src/views/fishery/deviceCorrectRecord/index.vue
index 3482ff6..283048e 100644
--- a/src/views/fishery/deviceCorrectRecord/index.vue
+++ b/src/views/fishery/deviceCorrectRecord/index.vue
@@ -705,7 +705,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: DeviceCorrectRecordVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除设备校准记录编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delDeviceCorrectRecord(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/deviceErrorCode/index.vue b/src/views/fishery/deviceErrorCode/index.vue
index 4e5ec22..3846cbd 100644
--- a/src/views/fishery/deviceErrorCode/index.vue
+++ b/src/views/fishery/deviceErrorCode/index.vue
@@ -497,7 +497,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: DeviceErrorCodeVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除设备故障码编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delDeviceErrorCode(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/deviceSwitch/index.vue b/src/views/fishery/deviceSwitch/index.vue
index 1ab2a73..f3f0283 100644
--- a/src/views/fishery/deviceSwitch/index.vue
+++ b/src/views/fishery/deviceSwitch/index.vue
@@ -535,7 +535,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: DeviceSwitchVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除测控一体机开关编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delDeviceSwitch(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/deviceThreshold/index.vue b/src/views/fishery/deviceThreshold/index.vue
index cea7121..9b5a600 100644
--- a/src/views/fishery/deviceThreshold/index.vue
+++ b/src/views/fishery/deviceThreshold/index.vue
@@ -235,7 +235,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: DeviceThresholdVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除设备阈值编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => (loading.value = false));
   await delDeviceThreshold(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
diff --git a/src/views/fishery/deviceWarnOne/index.vue b/src/views/fishery/deviceWarnOne/index.vue
index 15f9b70..9a19abd 100644
--- a/src/views/fishery/deviceWarnOne/index.vue
+++ b/src/views/fishery/deviceWarnOne/index.vue
@@ -291,7 +291,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: DeviceWarnOneVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除设备报警明细编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delDeviceWarnOne(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/fish/index.vue b/src/views/fishery/fish/index.vue
index 527b1bd..69040a1 100644
--- a/src/views/fishery/fish/index.vue
+++ b/src/views/fishery/fish/index.vue
@@ -215,7 +215,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: FishVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除鱼类编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => (loading.value = false));
   await delFish(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
diff --git a/src/views/fishery/linkedCtrl/index.vue b/src/views/fishery/linkedCtrl/index.vue
index 3ec297e..a161c64 100644
--- a/src/views/fishery/linkedCtrl/index.vue
+++ b/src/views/fishery/linkedCtrl/index.vue
@@ -456,7 +456,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: LinkedCtrlVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除溶解氧联动控制编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delLinkedCtrl(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/mapMessageWarnCallNotice/index.vue b/src/views/fishery/mapMessageWarnCallNotice/index.vue
new file mode 100644
index 0000000..413c6c1
--- /dev/null
+++ b/src/views/fishery/mapMessageWarnCallNotice/index.vue
@@ -0,0 +1,231 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="告警消息Id" prop="messageWarnId">
+              <el-input v-model="queryParams.messageWarnId" placeholder="请输入告警消息Id" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="电话通知id" prop="callNoticeId">
+              <el-input v-model="queryParams.callNoticeId" placeholder="请输入电话通知id" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['fishery:mapMessageWarnCallNotice:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['fishery:mapMessageWarnCallNotice:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:mapMessageWarnCallNotice:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:mapMessageWarnCallNotice:export']">导出</el-button>
+          </el-col>
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="mapMessageWarnCallNoticeList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="主键id" align="center" prop="id" v-if="true" />
+        <el-table-column label="告警消息Id" align="center" prop="messageWarnId" />
+        <el-table-column label="电话通知id" align="center" prop="callNoticeId" />
+        <el-table-column label="备注" align="center" prop="remark" />
+        <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="修改" placement="top">
+              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['fishery:mapMessageWarnCallNotice:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:mapMessageWarnCallNotice:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 添加或修改告警消息和电话告警通知关系表对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+      <el-form ref="mapMessageWarnCallNoticeFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="告警消息Id" prop="messageWarnId">
+          <el-input v-model="form.messageWarnId" placeholder="请输入告警消息Id" />
+        </el-form-item>
+        <el-form-item label="电话通知id" prop="callNoticeId">
+          <el-input v-model="form.callNoticeId" placeholder="请输入电话通知id" />
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MapMessageWarnCallNotice" lang="ts">
+import { listMapMessageWarnCallNotice, getMapMessageWarnCallNotice, delMapMessageWarnCallNotice, addMapMessageWarnCallNotice, updateMapMessageWarnCallNotice } from '@/api/fishery/mapMessageWarnCallNotice';
+import { MapMessageWarnCallNoticeVO, MapMessageWarnCallNoticeQuery, MapMessageWarnCallNoticeForm } from '@/api/fishery/mapMessageWarnCallNotice/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const mapMessageWarnCallNoticeList = ref<MapMessageWarnCallNoticeVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const mapMessageWarnCallNoticeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: MapMessageWarnCallNoticeForm = {
+  id: undefined,
+  messageWarnId: undefined,
+  callNoticeId: undefined,
+  remark: undefined
+}
+const data = reactive<PageData<MapMessageWarnCallNoticeForm, MapMessageWarnCallNoticeQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    messageWarnId: undefined,
+    callNoticeId: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键id不能为空", trigger: "blur" }
+    ],
+    messageWarnId: [
+      { required: true, message: "告警消息Id不能为空", trigger: "blur" }
+    ],
+    callNoticeId: [
+      { required: true, message: "电话通知id不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询告警消息和电话告警通知关系表列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMapMessageWarnCallNotice(queryParams.value);
+  mapMessageWarnCallNoticeList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  mapMessageWarnCallNoticeFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MapMessageWarnCallNoticeVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加告警消息和电话告警通知关系表";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: MapMessageWarnCallNoticeVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getMapMessageWarnCallNotice(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改告警消息和电话告警通知关系表";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  mapMessageWarnCallNoticeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateMapMessageWarnCallNotice(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addMapMessageWarnCallNotice(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MapMessageWarnCallNoticeVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
+  await delMapMessageWarnCallNotice(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/mapMessageWarnCallNotice/export', {
+    ...queryParams.value
+  }, `mapMessageWarnCallNotice_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/messageOpRecord/index.vue b/src/views/fishery/messageOpRecord/index.vue
index 4f19048..5f087a0 100644
--- a/src/views/fishery/messageOpRecord/index.vue
+++ b/src/views/fishery/messageOpRecord/index.vue
@@ -255,7 +255,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: MessageOpRecordVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除用户操作记录编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delMessageOpRecord(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/messageWarn/index.vue b/src/views/fishery/messageWarn/index.vue
new file mode 100644
index 0000000..9d326a2
--- /dev/null
+++ b/src/views/fishery/messageWarn/index.vue
@@ -0,0 +1,405 @@
+<template>
+  <div class="p-2">
+    <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+      <div v-show="showSearch" class="mb-[10px]">
+        <el-card shadow="hover">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+            <el-form-item label="用户信息" prop="params.userKeyword">
+              <el-input v-model="queryParams.params.userKeyword" placeholder="请输入用户名或手机号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备信息" prop="params.deviceKeyword">
+              <el-input v-model="queryParams.params.deviceKeyword" placeholder="请输入设备名称或设备编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+               <el-form-item label="告警类型" prop="warnType">
+              <el-select v-model="queryParams.warnType" placeholder="请选择告警类型" clearable >
+                <el-option v-for="dict in warn_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否已读" prop="isRead">
+              <el-select v-model="queryParams.isRead" placeholder="请选择是否已读" clearable >
+                <el-option v-for="dict in yes_no" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item>
+              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+            </el-form-item>
+          </el-form>
+        </el-card>
+      </div>
+    </transition>
+
+    <el-card shadow="never">
+      <template #header>
+        <el-row :gutter="10" class="mb8">
+          <!-- <el-col :span="1.5">
+            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['fishery:messageWarn:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['fishery:messageWarn:edit']">修改</el-button>
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:messageWarn:remove']">删除</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:messageWarn:export']">导出</el-button>
+          </el-col> -->
+          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+        </el-row>
+      </template>
+
+      <el-table v-loading="loading" border :data="messageWarnList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="用户名" align="center" prop="userName" width="120"/>
+        <el-table-column label="手机号" align="center" prop="mobilePhone"  width="120"/>
+        <el-table-column label="设备编号" align="center" prop="serialNum"  width="150"/>
+         <el-table-column label="设备名称" align="center" prop="deviceName" width="120"/>
+<!--        <el-table-column label="塘口名称" align="center" prop="pondName"  width="120"/>-->
+        <el-table-column label="告警标题" align="center" prop="title" width="100"/>
+         <el-table-column label="告警类型" align="center" prop="warnType" width="150">
+          <template #default="scope">
+            <dict-tag :options="warn_type" :value="scope.row.warnType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="是否已读" align="center" prop="isRead" width="90">
+          <template #default="scope">
+            <dict-tag :options="yes_no" :value="scope.row.isRead"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="告警内容" align="center" prop="message" />
+ <el-table-column label="电话通知次数" align="center" prop="callNoticeCount" width="120">
+          <template #default="scope">
+            <span 
+              v-if="scope.row.callNoticeCount > 0" 
+              style="color: #409eff; cursor: pointer; text-decoration: underline;"
+              @click="handleViewCallNotice(scope.row)"
+            >
+              {{ scope.row.callNoticeCount }}
+            </span>
+            <span v-else>{{ scope.row.callNoticeCount || 0 }}</span>
+          </template>
+        </el-table-column>
+  <el-table-column label="告警时间" align="center" prop="createTime"  width="160"/>
+        <el-table-column label="操作" align="center" width="100"  class-name="small-padding">
+          <template #default="scope">
+            <el-tooltip content="查看" placement="top">
+              <el-button link type="primary" icon="View" @click="handleView(scope.row)" v-hasPermi="['fishery:messageWarn:query']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:messageWarn:remove']"></el-button>
+            </el-tooltip>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+    <!-- 查看设备告警记录对话框 -->
+    <el-dialog :title="dialog.title" v-model="dialog.visible" width="600px" append-to-body>
+      <el-form ref="messageWarnFormRef" :model="form" label-width="100px">
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="用户名">
+              <el-input v-model="form.userName" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="手机号">
+              <el-input v-model="form.mobilePhone" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="设备编号">
+              <el-input v-model="form.serialNum" disabled />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备名称">
+              <el-input v-model="form.deviceName" disabled />
+            </el-form-item>
+          </el-col>
+        </el-row>
+                <el-row :gutter="20">
+          <el-col :span="12">
+            <el-form-item label="告警类型">
+              <el-select v-model="form.warnType" disabled style="width: 100%">
+                <el-option
+                    v-for="dict in warn_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="是否已读">
+              <el-select v-model="form.isRead" disabled style="width: 100%">
+                <el-option
+                    v-for="dict in yes_no"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="parseInt(dict.value)"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="塘口名称">
+          <el-input v-model="form.pondName" disabled />
+        </el-form-item>
+        <el-form-item label="告警标题">
+          <el-input v-model="form.title" disabled />
+        </el-form-item>
+         <el-form-item label="告警时间">
+          <el-input v-model="form.createTime" disabled />
+        </el-form-item>
+        <el-form-item label="告警内容">
+          <el-input v-model="form.message" type="textarea" :rows="3" disabled />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancel">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 电话通知记录对话框 -->
+    <el-dialog title="电话通知记录" v-model="callNoticeDialog.visible" width="1200px" append-to-body>
+      <el-table v-loading="callNoticeDialog.loading" border :data="callNoticeList" max-height="400">
+        <el-table-column label="通知手机号" align="center" prop="mobilePhone" width="120"/>
+        <el-table-column label="呼叫时间" align="center" prop="createTime" width="180"/>
+        <el-table-column label="告警类型" align="center" prop="warnType" width="120">
+          <template #default="scope">
+            <dict-tag :options="warn_type" :value="scope.row.warnType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="告警标题" align="center" prop="warnTitle" width="120"/>
+        <el-table-column label="呼叫状态" align="center" prop="callStatus" width="100">
+          <template #default="scope">
+            <dict-tag :options="call_status" :value="scope.row.callStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="主叫号码" align="center" prop="caller" width="120"/>
+        <el-table-column label="通话时长" align="center" prop="duration" width="100">
+          <template #default="scope">
+            {{ scope.row.duration ? scope.row.duration + '秒' : '' }}
+          </template>
+        </el-table-column>
+        <el-table-column label="结果描述" align="center" prop="statusMsg" show-overflow-tooltip/>
+      </el-table>
+      <pagination 
+        v-show="callNoticeTotal > 0" 
+        :total="callNoticeTotal" 
+        v-model:page="callNoticeQuery.pageNum" 
+        v-model:limit="callNoticeQuery.pageSize" 
+        @pagination="getCallNoticeList" 
+      />
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="callNoticeDialog.visible = false">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="MessageWarn" lang="ts">
+import { listMessageWarn, getMessageWarn, delMessageWarn, addMessageWarn, updateMessageWarn } from '@/api/fishery/messageWarn';
+import { MessageWarnVO, MessageWarnQuery, MessageWarnForm } from '@/api/fishery/messageWarn/types';
+import { listCallNotice } from '@/api/fishery/callNotice';
+import { CallNoticeVO } from '@/api/fishery/callNotice/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { yes_no, warn_type, call_status } = toRefs<any>(proxy?.useDict('yes_no', 'warn_type', 'call_status'));
+
+const messageWarnList = ref<MessageWarnVO[]>([]);
+const callNoticeList = ref<CallNoticeVO[]>([]);
+const buttonLoading = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref<Array<string | number>>([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const callNoticeTotal = ref(0);
+
+const callNoticeQuery = reactive({
+  pageNum: 1,
+  pageSize: 10,
+  messageWarnId: undefined as string | number | undefined
+});
+
+const queryFormRef = ref<ElFormInstance>();
+const messageWarnFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const callNoticeDialog = reactive({
+  visible: false,
+  loading: false
+});
+
+const initFormData: MessageWarnForm = {
+  id: undefined,
+  userId: undefined,
+  deviceId: undefined,
+  title: undefined,
+  message: undefined,
+  isRead: undefined,
+  warnType: undefined,
+  pondName: undefined,
+  remark: undefined
+}
+const data = reactive<PageData<MessageWarnForm, MessageWarnQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userId: undefined,
+    deviceId: undefined,
+    title: undefined,
+    message: undefined,
+    isRead: undefined,
+    warnType: undefined,
+    pondName: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键id不能为空", trigger: "blur" }
+    ],
+    userId: [
+      { required: true, message: "用户id不能为空", trigger: "blur" }
+    ],
+    deviceId: [
+      { required: true, message: "设备id不能为空", trigger: "blur" }
+    ],
+    title: [
+      { required: true, message: "告警标题不能为空", trigger: "blur" }
+    ],
+    message: [
+      { required: true, message: "告警内容不能为空", trigger: "blur" }
+    ],
+    isRead: [
+      { required: true, message: "是否已读不能为空", trigger: "change" }
+    ],
+    warnType: [
+      { required: true, message: "告警类型不能为空", trigger: "change" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备告警记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listMessageWarn(queryParams.value);
+  messageWarnList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  messageWarnFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: MessageWarnVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  dialog.visible = true;
+  dialog.title = "添加设备告警记录";
+}
+
+/** 查看按钮操作 */
+const handleView = async (row: MessageWarnVO) => {
+  reset();
+  const res = await getMessageWarn(row.id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "查看告警详情";
+}
+
+/** 查看电话通知记录 */
+const handleViewCallNotice = async (row: MessageWarnVO) => {
+  callNoticeQuery.messageWarnId = row.id;
+  callNoticeQuery.pageNum = 1;
+  callNoticeDialog.visible = true;
+  await getCallNoticeList();
+}
+
+/** 获取电话通知记录列表 */
+const getCallNoticeList = async () => {
+  callNoticeDialog.loading = true;
+  try {
+    const res = await listCallNotice({
+      pageNum: callNoticeQuery.pageNum,
+      pageSize: callNoticeQuery.pageSize,
+      params: {
+        messageWarnId: callNoticeQuery.messageWarnId
+      }
+    });
+    callNoticeList.value = res.rows;
+    callNoticeTotal.value = res.total;
+  } finally {
+    callNoticeDialog.loading = false;
+  }
+}
+
+
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: MessageWarnVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
+  await delMessageWarn(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/messageWarn/export', {
+    ...queryParams.value
+  }, `messageWarn_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/payDevice/index.vue b/src/views/fishery/payDevice/index.vue
index 6e52bac..909bf79 100644
--- a/src/views/fishery/payDevice/index.vue
+++ b/src/views/fishery/payDevice/index.vue
@@ -652,7 +652,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: PayDeviceVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除设备充值记录编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delPayDevice(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/pond/index.vue b/src/views/fishery/pond/index.vue
index 31d9ce0..6495f1b 100644
--- a/src/views/fishery/pond/index.vue
+++ b/src/views/fishery/pond/index.vue
@@ -852,7 +852,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: PondVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除塘口编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => (loading.value = false));
   await delPond(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
diff --git a/src/views/fishery/tecentUserCache/index.vue b/src/views/fishery/tecentUserCache/index.vue
index fc187d8..eff3ed2 100644
--- a/src/views/fishery/tecentUserCache/index.vue
+++ b/src/views/fishery/tecentUserCache/index.vue
@@ -205,7 +205,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: TecentUserCacheVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除公众号用户缓存编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delTecentUserCache(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/timingCtrl/index.vue b/src/views/fishery/timingCtrl/index.vue
index 1626fd6..52a4c76 100644
--- a/src/views/fishery/timingCtrl/index.vue
+++ b/src/views/fishery/timingCtrl/index.vue
@@ -445,7 +445,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: TimingCtrlVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除开关定时控制编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delTimingCtrl(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/fishery/userRelation/index.vue b/src/views/fishery/userRelation/index.vue
index 8fc03d5..8e9d346 100644
--- a/src/views/fishery/userRelation/index.vue
+++ b/src/views/fishery/userRelation/index.vue
@@ -212,7 +212,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: UserRelationVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除养殖用户子账号编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => loading.value = false);
   await delUserRelation(_ids);
   proxy?.$modal.msgSuccess("删除成功");
   await getList();
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 0354d0d..0734a6f 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -281,7 +281,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: ClientVO) => {
   const _ids = row?.id || ids.value;
-  await proxy?.$modal.confirm('是否确认删除客户端管理编号为"' + _ids + '"的数据项？').finally(() => (loading.value = false));
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？').finally(() => (loading.value = false));
   await delClient(_ids);
   proxy?.$modal.msgSuccess('删除成功');
   await getList();
diff --git a/src/views/system/config/index.vue b/src/views/system/config/index.vue
index 7331950..db26291 100644
--- a/src/views/system/config/index.vue
+++ b/src/views/system/config/index.vue
@@ -234,7 +234,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: ConfigVO) => {
   const configIds = row?.configId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除参数编号为"' + configIds + '"的数据项？');
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？');
   await delConfig(configIds);
   await getList();
   proxy?.$modal.msgSuccess('删除成功');
diff --git a/src/views/system/dict/index.vue b/src/views/system/dict/index.vue
index 5e6e540..e02d385 100644
--- a/src/views/system/dict/index.vue
+++ b/src/views/system/dict/index.vue
@@ -218,7 +218,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: DictTypeVO) => {
   const dictIds = row?.dictId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除字典编号为"' + dictIds + '"的数据项？');
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？');
   await delType(dictIds);
   getList();
   proxy?.$modal.msgSuccess('删除成功');
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index b9a4473..5254901 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -255,7 +255,7 @@ const submitForm = () => {
 /** 删除按钮操作 */
 const handleDelete = async (row?: NoticeVO) => {
   const noticeIds = row?.noticeId || ids.value;
-  await proxy?.$modal.confirm('是否确认删除公告编号为"' + noticeIds + '"的数据项？');
+  await proxy?.$modal.confirm('是否确认删除选中的数据项？');
   await delNotice(noticeIds);
   await getList();
   proxy?.$modal.msgSuccess('删除成功');

From c5de2882fff315d3e8986db5dbb6775a0cda8e69 Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Wed, 5 Nov 2025 00:42:36 +0800
Subject: [PATCH 4/6] =?UTF-8?q?feat:=20=E6=96=B0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E8=AE=BE=E5=A4=87=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B=E7=AD=89=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/fishery/monitorHistory/index.ts |   16 +
 src/api/fishery/monitorHistory/types.ts |  136 ++
 src/types/components.d.ts               |    4 +-
 src/views/index.vue                     | 1681 ++++++++++++++++++++---
 4 files changed, 1647 insertions(+), 190 deletions(-)
 create mode 100644 src/api/fishery/monitorHistory/index.ts
 create mode 100644 src/api/fishery/monitorHistory/types.ts

diff --git a/src/api/fishery/monitorHistory/index.ts b/src/api/fishery/monitorHistory/index.ts
new file mode 100644
index 0000000..0a3f949
--- /dev/null
+++ b/src/api/fishery/monitorHistory/index.ts
@@ -0,0 +1,16 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceSensorDataQueryBo, DeviceSensorData } from '@/api/fishery/monitorHistory/types';
+
+/**
+ * 查询设备历史数据
+ * @param query
+ * @returns {*}
+ */
+export const getHistoryData = (query: DeviceSensorDataQueryBo): AxiosPromise<DeviceSensorData[]> => {
+  return request({
+    url: '/td/device/getHistoryData',
+    method: 'get',
+    params: query
+  });
+};
diff --git a/src/api/fishery/monitorHistory/types.ts b/src/api/fishery/monitorHistory/types.ts
new file mode 100644
index 0000000..de391a1
--- /dev/null
+++ b/src/api/fishery/monitorHistory/types.ts
@@ -0,0 +1,136 @@
+/**
+ * 设备传感器数据查询对象
+ */
+export interface DeviceSensorDataQueryBo extends BaseEntity {
+  /**
+   * 设备序列号
+   */
+  serialNum?: string;
+
+  /**
+   * 设备ID
+   */
+  deviceId?: string | number;
+
+  /**
+   * 手机号
+   */
+  mobilePhone?: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType?: number;
+
+  /**
+   * 开始时间
+   */
+  startTime?: string;
+
+  /**
+   * 结束时间
+   */
+  endTime?: string;
+
+  /**
+   * 时间间隔
+   */
+  intervalType?: string;
+}
+
+/**
+ * 设备传感器数据对象
+ */
+export interface DeviceSensorData {
+  // 测量字段（随时间变化的数值）
+  /**
+   * 时序主键时间戳
+   */
+  time: string;
+
+  /**
+   * 数据创建时间
+   */
+  createTime: string;
+
+  /**
+   * 溶解氧
+   */
+  dissolvedOxygen: number;
+
+  /**
+   * 温度
+   */
+  temperature: number;
+
+  /**
+   * 饱和度
+   */
+  saturability: number;
+
+  /**
+   * pH值
+   */
+  ph: number;
+
+  /**
+   * 盐度
+   */
+  salinity: number;
+
+  /**
+   * 参考值
+   */
+  treference: number;
+
+  /**
+   * 荧光值
+   */
+  tfluorescence: number;
+
+  /**
+   * 相位差
+   */
+  phaseDifference: number;
+
+  /**
+   * 电池电量
+   */
+  battery: number;
+
+  // 标签字段（元数据，不随时间频繁变化）
+  /**
+   * 设备序列号
+   */
+  serialNum: string;
+
+  /**
+   * 设备ID
+   */
+  deviceId: number;
+
+  /**
+   * 用户ID
+   */
+  userId: number;
+
+  /**
+   * 用户名
+   */
+  userName: string;
+
+  /**
+   * 手机号
+   */
+  mobilePhone: string;
+
+  /**
+   * 设备名称
+   */
+  deviceName: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType: number;
+}
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index abfacc7..ba0d740 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -17,9 +17,9 @@ declare module 'vue' {
     ElBreadcrumb: typeof import('element-plus/es')['ElBreadcrumb']
     ElBreadcrumbItem: typeof import('element-plus/es')['ElBreadcrumbItem']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
-    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -38,13 +38,13 @@ declare module 'vue' {
     ElIcon: typeof import('element-plus/es')['ElIcon']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
-    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
+    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
diff --git a/src/views/index.vue b/src/views/index.vue
index 1aba486..d57ed1c 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,217 +1,1522 @@
 <template>
   <div class="app-container home">
-    <div class="welcome-container">
-      <div class="welcome-content">
-        <h1 class="welcome-title">欢迎使用</h1>
-        <h2 class="platform-name">水产养殖监测平台</h2>
-        <div class="welcome-decoration">
-          <span class="dot"></span>
-          <span class="dot"></span>
-          <span class="dot"></span>
+    <!-- Header Section -->
+
+    <!-- Statistics Cards -->
+    <!-- First Row: 6 cards -->
+    <el-row :gutter="20" class="stat-cards">
+      <!-- 1. 养殖用户 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card user-card">
+          <div class="stat-icon">
+            <el-icon size="40"><User /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.userCount }}</div>
+            <div class="stat-label">养殖用户</div>
+          </div>
         </div>
-      </div>
-    </div>
+      </el-col>
+      <!-- 2. 塘口数量 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card pond-card">
+          <div class="stat-icon">
+            <el-icon size="40"><LocationFilled /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.pondCount }}</div>
+            <div class="stat-label">塘口数量</div>
+          </div>
+        </div>
+      </el-col>
+      <!-- 3. 设备总数 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card device-card">
+          <div class="stat-icon">
+            <el-icon size="40"><Monitor /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.deviceCount }}</div>
+            <div class="stat-label">设备总数</div>
+          </div>
+        </div>
+      </el-col>
+      <!-- 4. 测控一体机 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card monitor-device-card">
+          <div class="stat-icon">
+            <el-icon size="40"><Platform /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.monitorDeviceCount }}</div>
+            <div class="stat-label">测控一体机</div>
+          </div>
+        </div>
+      </el-col>
+      <!-- 5. 水质监测仪 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card water-quality-card">
+          <div class="stat-icon">
+            <el-icon size="40"><Odometer /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.waterQualityDeviceCount }}</div>
+            <div class="stat-label">水质监测仪</div>
+          </div>
+        </div>
+      </el-col>
+      <!-- 6. 设备开关 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card switch-card">
+          <div class="stat-icon">
+            <el-icon size="40"><Switch /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.switchCount }}</div>
+            <div class="stat-label">设备开关</div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+
+    <!-- Second Row: 6 cards -->
+    <el-row :gutter="20" class="stat-cards secondary-stats">
+      <!-- 7. 联动控制 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card control-card">
+          <div class="stat-icon">
+            <el-icon size="40"><Connection /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.linkedCtrlCount }}</div>
+            <div class="stat-label">联动控制</div>
+          </div>
+        </div>
+      </el-col>
+      <!-- 8. 定时控制 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card timing-card">
+          <div class="stat-icon">
+            <el-icon size="40"><Timer /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.timingCtrlCount }}</div>
+            <div class="stat-label">定时控制</div>
+          </div>
+        </div>
+      </el-col>
+      <!-- 9. 过期设备 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card expired-card">
+          <div class="stat-icon">
+            <el-icon size="40"><WarningFilled /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.expiredDevices }}</div>
+            <div class="stat-label">过期设备</div>
+          </div>
+        </div>
+      </el-col>
+        <!-- 11. 电话通知记录 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card call-notice-card">
+          <div class="stat-icon">
+            <el-icon size="40"><Phone /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.callNoticeCount }}</div>
+            <div class="stat-label">电话通知记录</div>
+          </div>
+        </div>
+      </el-col>
+      <!-- 10. 设备告警记录 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card warning-card">
+          <div class="stat-icon">
+            <el-icon size="40"><Bell /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.warningCount }}</div>
+            <div class="stat-label">设备告警记录</div>
+          </div>
+        </div>
+      </el-col>
+    
+      <!-- 12. 设备报警信息 -->
+      <el-col :xs="24" :sm="12" :md="8" :lg="4" :xl="4">
+        <div class="stat-card device-warn-card">
+          <div class="stat-icon">
+            <el-icon size="40"><Warning /></el-icon>
+          </div>
+          <div class="stat-info">
+            <div class="stat-value">{{ statistics.deviceWarnCount }}</div>
+            <div class="stat-label">设备报警信息</div>
+          </div>
+        </div>
+      </el-col>
+    </el-row>
+
+    <!-- Charts Row -->
+    <el-row :gutter="20" class="charts-row">
+      <!-- 1. 设备在线统计 -->
+      <el-col :xs="24" :sm="24" :md="8">
+        <div class="chart-card">
+          <div class="chart-header">
+            <h3>设备在线统计</h3>
+          </div>
+          <div class="online-stats">
+            <div class="online-item">
+              <div class="online-label">在线设备</div>
+              <div class="online-value online">{{ statistics.onlineDevices }}</div>
+            </div>
+            <div class="online-item">
+              <div class="online-label">离线设备</div>
+              <div class="online-value offline">{{ statistics.offlineDevices }}</div>
+            </div>
+            <div class="online-item">
+              <div class="online-label">在线率</div>
+              <div class="online-value rate">{{ onlineRate }}%</div>
+            </div>
+          </div>
+          <div id="onlineStatusChart" class="chart-container-with-stats"></div>
+        </div>
+      </el-col>
+
+      <!-- 2. 设备类型分布 -->
+      <el-col :xs="24" :sm="24" :md="8">
+        <div class="chart-card">
+          <div class="chart-header">
+            <h3>设备类型分布</h3>
+          </div>
+          <div id="deviceTypeChart" class="chart-container"></div>
+        </div>
+      </el-col>
+
+      <!-- 3. 设备告警状态 -->
+      <el-col :xs="24" :sm="24" :md="8">
+        <div class="chart-card">
+          <div class="chart-header">
+            <h3>设备告警类型分布</h3>
+          </div>
+          <div id="warningStatusChart" class="chart-container"></div>
+        </div>
+      </el-col>
+    </el-row>
+
+    
+    <!-- 电话通知记录 -->
+    <el-row :gutter="20" class="charts-row">
+      <el-col :span="24">
+        <div class="chart-card" style="height: auto; min-height: auto;">
+          <div class="chart-header">
+            <h3>最近电话通知记录</h3>
+            <el-button type="primary" size="small" @click="openCallNoticesDialog">查看更多</el-button>
+          </div>
+          <el-table :data="recentCallNotices" style="width: 100%" v-loading="loading">
+            <el-table-column prop="userName" label="用户名" align="center" width="120" />
+            <el-table-column prop="serialNum" label="设备编号" align="center" width="150" />
+            <el-table-column label="设备类型" align="center" width="120">
+              <template #default="scope">
+                <el-tag>{{ getDeviceTypeLabel(scope.row.deviceType) }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="mobilePhone" label="呼叫电话" align="center" width="120" />
+            <el-table-column prop="callTime" label="呼叫时间" align="center" width="180" />
+            <el-table-column label="告警类型" align="center" width="150">
+              <template #default="scope">
+                <el-tag :type="getWarningTypeTag(scope.row.warnType)">{{ scope.row.warnTypeLabel }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="warnTitle" label="告警标题" align="center" width="100" />
+            <el-table-column label="呼叫状态" align="center" width="120">
+              <template #default="scope">
+                <el-tag :type="getCallStatusTag(scope.row.callStatus)">{{ getCallStatusLabel(scope.row.callStatus) }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="caller" label="主叫号码" align="center" width="120" />
+            <el-table-column prop="statusMsg" label="结果描述" align="center" min-width="180" show-overflow-tooltip />
+          </el-table>
+        </div>
+      </el-col>
+    </el-row>
+    
+    <!-- Recent Warnings Table -->
+    <el-row :gutter="20" class="charts-row">
+      <el-col :span="24">
+        <div class="chart-card" style="height: auto; min-height: auto;">
+          <div class="chart-header">
+            <h3>最近设备告警记录</h3>
+            <el-button type="primary" size="small" @click="openWarningsDialog">查看更多</el-button>
+          </div>
+          <el-table :data="recentWarnings" style="width: 100%" v-loading="loading">
+            <el-table-column prop="deviceName" label="设备名称" align="center" />
+            <el-table-column prop="serialNum" label="设备编号" align="center"  />
+            <el-table-column label="告警类型" align="center" >
+              <template #default="scope">
+                <el-tag :type="getWarningTypeTag(scope.row.warnType)">{{ scope.row.warnTypeLabel }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column prop="title" label="告警标题"   align="center"  />
+              <el-table-column prop="warnTime" label="告警时间"  align="center"  />
+            <el-table-column prop="message" label="告警内容" min-width="280" show-overflow-tooltip />
+          
+          </el-table>
+        </div>
+      </el-col>
+    </el-row>
+
+    <!-- 设备报警信息表格 -->
+    <el-row :gutter="20" class="charts-row">
+      <el-col :span="24">
+        <div class="chart-card" style="height: auto; min-height: auto;">
+          <div class="chart-header">
+            <h3>最近设备报警信息</h3>
+            <el-button type="primary" size="small" @click="openDeviceWarnsDialog">查看更多</el-button>
+          </div>
+          <el-table :data="recentDeviceWarns" style="width: 100%" v-loading="loading">
+            <el-table-column prop="deviceSerialNum" label="设备编号" align="center" width="150" />
+            <el-table-column label="设备类型" align="center" width="120">
+              <template #default="scope">
+                <el-tag>{{ getDeviceTypeLabel(scope.row.deviceType) }}</el-tag>
+              </template>
+            </el-table-column>
+            <el-table-column label="参数类型" align="center" width="120">
+              <template #default="scope">
+                <dict-tag :options="threshold_type" :value="scope.row.thresholdType"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="进展状态" align="center" width="120">
+              <template #default="scope">
+                <dict-tag :options="process_status" :value="scope.row.processStatus"/>
+              </template>
+            </el-table-column>
+            <el-table-column label="故障类型" align="center" width="120">
+              <template #default="scope">
+                <dict-tag :options="risk_type" :value="scope.row.warnType"/>
+              </template>
+            </el-table-column>
+            <el-table-column prop="totalCount" label="告警总数量" align="center" width="100" />
+            <el-table-column prop="handlerName" label="处理人" align="center" min-width="120" />
+            <el-table-column prop="processTime" label="处理时间" align="center" min-width="180" />
+            <el-table-column prop="updateTime" label="更新时间" align="center" min-width="180" />
+          </el-table>
+        </div>
+      </el-col>
+    </el-row>
+
+
+    <!-- 告警记录弹窗 -->
+    <el-dialog title="告警记录" v-model="warningsDialog.visible" width="1200px" append-to-body>
+      <!-- 查询条件 -->
+      <el-form :model="warningsQuery" :inline="true" class="mb-3">
+        <el-form-item label="设备信息">
+          <el-input 
+            v-model="warningsQuery.deviceKeyword" 
+            placeholder="设备名称/设备编号" 
+            clearable 
+            style="width: 200px"
+            @keyup.enter="searchWarnings"
+          />
+        </el-form-item>
+        <el-form-item label="告警类型">
+          <el-select v-model="warningsQuery.warnType" placeholder="请选择" clearable style="width: 150px">
+            <el-option v-for="dict in warn_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="searchWarnings">搜索</el-button>
+          <el-button icon="Refresh" @click="resetWarningsQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- 表格 -->
+      <el-table v-loading="warningsDialog.loading" border :data="warningsDialog.list" max-height="500">
+        <el-table-column prop="deviceName" label="设备名称"  align="center" width="120" />
+        <el-table-column prop="serialNum" label="设备编号"  align="center" width="150" />
+        <el-table-column label="告警类型"  align="center" width="150">
+          <template #default="scope">
+            <el-tag :type="getWarningTypeTag(scope.row.warnType)">{{ getWarnTypeLabel(scope.row.warnType) }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="title" label="告警标题"  align="center" width="120" />
+         <el-table-column prop="createTime" label="告警时间"  align="center" width="160" />
+        <el-table-column prop="message" label="告警内容"  align="center" min-width="200" show-overflow-tooltip />
+       
+      </el-table>
+
+      <!-- 分页 -->
+      <el-pagination
+        v-show="warningsDialog.total > 0"
+        class="mt-3"
+        :total="warningsDialog.total"
+        v-model:current-page="warningsQuery.pageNum"
+        v-model:page-size="warningsQuery.pageSize"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="loadWarningsDialog"
+        @current-change="loadWarningsDialog"
+      />
+
+      <template #footer>
+        <el-button @click="warningsDialog.visible = false">关闭</el-button>
+      </template>
+    </el-dialog>
+
+    <!-- 电话通知记录弹窗 -->
+    <el-dialog title="电话通知记录" v-model="callNoticesDialog.visible" width="1450px" append-to-body>
+      <!-- 查询条件 -->
+      <el-form :model="callNoticesQuery" :inline="true" class="mb-3">
+        <el-form-item label="手机号">
+          <el-input 
+            v-model="callNoticesQuery.mobilePhone" 
+            placeholder="请输入手机号" 
+            clearable 
+            style="width: 180px"
+            @keyup.enter="searchCallNotices"
+          />
+        </el-form-item>
+        <el-form-item label="告警类型">
+          <el-select v-model="callNoticesQuery.warnType" placeholder="请选择" clearable style="width: 150px">
+            <el-option v-for="dict in warn_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="呼叫状态">
+          <el-select v-model="callNoticesQuery.callStatus" placeholder="请选择" clearable style="width: 150px">
+            <el-option v-for="dict in call_status" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="searchCallNotices">搜索</el-button>
+          <el-button icon="Refresh" @click="resetCallNoticesQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- 表格 -->
+      <el-table v-loading="callNoticesDialog.loading" border :data="callNoticesDialog.list" max-height="500">
+        <el-table-column prop="userName" label="用户名" align="center" width="120" />
+        <el-table-column prop="serialNum" label="设备编号" align="center" width="150" />
+        <el-table-column label="设备类型" align="center" width="120">
+          <template #default="scope">
+            <el-tag>{{ getDeviceTypeLabel(scope.row.deviceType) }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="mobilePhone" label="呼叫电话" align="center" width="120" />
+        <el-table-column prop="callTime" label="呼叫时间" align="center" width="180" />
+        <el-table-column label="告警类型" align="center" width="150">
+          <template #default="scope">
+            <el-tag :type="getWarningTypeTag(scope.row.warnType)">{{ getWarnTypeLabel(scope.row.warnType) }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="warnTitle" label="告警标题" align="center" width="100" />
+        <el-table-column label="呼叫状态" align="center" width="120">
+          <template #default="scope">
+            <el-tag :type="getCallStatusTag(scope.row.callStatus)">{{ getCallStatusLabel(scope.row.callStatus) }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column prop="caller" label="主叫号码" align="center" width="120" />
+        <el-table-column prop="statusMsg" label="结果描述" align="center" min-width="180" show-overflow-tooltip />
+      </el-table>
+
+      <!-- 分页 -->
+      <el-pagination
+        v-show="callNoticesDialog.total > 0"
+        class="mt-3"
+        :total="callNoticesDialog.total"
+        v-model:current-page="callNoticesQuery.pageNum"
+        v-model:page-size="callNoticesQuery.pageSize"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="loadCallNoticesDialog"
+        @current-change="loadCallNoticesDialog"
+      />
+
+      <template #footer>
+        <el-button @click="callNoticesDialog.visible = false">关闭</el-button>
+      </template>
+    </el-dialog>
+    
+    <!-- 设备报警信息弹窗 -->
+    <el-dialog title="设备报警信息" v-model="deviceWarnsDialog.visible" width="1450px" append-to-body>
+      <!-- 查询条件 -->
+      <el-form :model="deviceWarnsQuery" :inline="true" class="mb-3">
+        <el-form-item label="设备编号">
+          <el-input 
+            v-model="deviceWarnsQuery.deviceSerialNum" 
+            placeholder="请输入设备编号" 
+            clearable 
+            style="width: 180px"
+            @keyup.enter="searchDeviceWarns"
+          />
+        </el-form-item>
+        <el-form-item label="设备类型">
+          <el-select v-model="deviceWarnsQuery.deviceType" placeholder="请选择" clearable style="width: 150px">
+            <el-option v-for="dict in aqu_device_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="进展状态">
+          <el-select v-model="deviceWarnsQuery.processStatus" placeholder="请选择" clearable style="width: 150px">
+            <el-option v-for="dict in process_status" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="故障类型">
+          <el-select v-model="deviceWarnsQuery.warnType" placeholder="请选择" clearable style="width: 150px">
+            <el-option v-for="dict in risk_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="searchDeviceWarns">搜索</el-button>
+          <el-button icon="Refresh" @click="resetDeviceWarnsQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- 表格 -->
+      <el-table v-loading="deviceWarnsDialog.loading" border :data="deviceWarnsDialog.list" max-height="500">
+        <el-table-column prop="deviceSerialNum" label="设备编号" align="center" width="150" />
+        <el-table-column label="设备类型" align="center" width="120">
+          <template #default="scope">
+            <dict-tag :options="aqu_device_type" :value="scope.row.deviceType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="参数类型" align="center" width="120">
+          <template #default="scope">
+            <dict-tag :options="threshold_type" :value="scope.row.thresholdType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="进展状态" align="center" width="120">
+          <template #default="scope">
+            <dict-tag :options="process_status" :value="scope.row.processStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="故障类型" align="center" width="120">
+          <template #default="scope">
+            <dict-tag :options="risk_type" :value="scope.row.warnType"/>
+          </template>
+        </el-table-column>
+        <el-table-column prop="totalCount" label="告警总数量" align="center" width="100" />
+        <el-table-column prop="handlerName" label="处理人" align="center" min-width="120" />
+        <el-table-column prop="processTime" label="处理时间" align="center" min-width="180" />
+        <el-table-column prop="updateTime" label="更新时间" align="center" min-width="180" />
+      </el-table>
+
+      <!-- 分页 -->
+      <el-pagination
+        v-show="deviceWarnsDialog.total > 0"
+        class="mt-3"
+        :total="deviceWarnsDialog.total"
+        v-model:current-page="deviceWarnsQuery.pageNum"
+        v-model:page-size="deviceWarnsQuery.pageSize"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="loadDeviceWarnsDialog"
+        @current-change="loadDeviceWarnsDialog"
+      />
+
+      <template #footer>
+        <el-button @click="deviceWarnsDialog.visible = false">关闭</el-button>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
 <script setup name="Index" lang="ts">
-const goTarget = (url: string) => {
-  window.open(url, '__blank');
+import { ref, onMounted, computed, nextTick } from 'vue';
+import * as echarts from 'echarts';
+import { listDevice } from '@/api/fishery/device';
+import { listPond } from '@/api/fishery/pond';
+import { listDeviceSwitch } from '@/api/fishery/deviceSwitch';
+import { listMessageWarn } from '@/api/fishery/messageWarn';
+import { listAquUser } from '@/api/fishery/aquUser';
+import { listLinkedCtrl } from '@/api/fishery/linkedCtrl';
+import { listTimingCtrl } from '@/api/fishery/timingCtrl';
+import { listCallNotice } from '@/api/fishery/callNotice';
+import { listDeviceWarnCombine } from '@/api/fishery/deviceWarnCombine';
+import { useRouter } from 'vue-router';
+import { useDict } from '@/utils/dict';
+
+const router = useRouter();
+const loading = ref(false);
+
+// 获取字典数据
+const { warn_type, call_status, aqu_device_type, threshold_type, process_status, risk_type } = useDict('warn_type', 'call_status', 'aqu_device_type', 'threshold_type', 'process_status', 'risk_type');
+
+// Statistics data
+const statistics = ref({
+  deviceCount: 0,
+  pondCount: 0,
+  warningCount: 0,
+  userCount: 0,
+  switchCount: 0,
+  linkedCtrlCount: 0,
+  timingCtrlCount: 0,
+  onlineDevices: 0,
+  offlineDevices: 0,
+  expiredDevices: 0,
+  callNoticeCount: 0,  // 电话通知记录次数
+  deviceWarnCount: 0,  // 设备报警信息次数
+  monitorDeviceCount: 0,  // 测控一体机数量
+  waterQualityDeviceCount: 0  // 水质监测仪数量
+});
+
+const deviceTypeData = ref<any[]>([]);
+const warningData = ref<any[]>([]);
+const recentWarnings = ref<any[]>([]);
+const recentCallNotices = ref<any[]>([]);
+const recentDeviceWarns = ref<any[]>([]);
+
+// 告警弹窗相关
+const warningsDialog = ref({
+  visible: false,
+  loading: false,
+  list: [] as any[],
+  total: 0
+});
+
+const warningsQuery = ref({
+  pageNum: 1,
+  pageSize: 10,
+  deviceKeyword: '',
+  warnType: undefined as number | undefined,
+  isRead: undefined as number | undefined
+});
+
+// 电话通知弹窗相关
+const callNoticesDialog = ref({
+  visible: false,
+  loading: false,
+  list: [] as any[],
+  total: 0
+});
+
+const callNoticesQuery = ref({
+  pageNum: 1,
+  pageSize: 10,
+  mobilePhone: '',
+  warnType: undefined as number | undefined,
+  callStatus: undefined as number | undefined
+});
+
+// 设备报警信息弹窗相关
+const deviceWarnsDialog = ref({
+  visible: false,
+  loading: false,
+  list: [] as any[],
+  total: 0
+});
+
+const deviceWarnsQuery = ref({
+  pageNum: 1,
+  pageSize: 10,
+  deviceSerialNum: '',
+  deviceType: undefined as number | undefined,
+  processStatus: undefined as number | undefined,
+  warnType: undefined as number | undefined
+});
+
+// Computed online rate
+const onlineRate = computed(() => {
+  const total = statistics.value.deviceCount;
+  if (total === 0) return 0;
+  return ((statistics.value.onlineDevices / total) * 100).toFixed(1);
+});
+
+// Load all statistics
+const loadStatistics = async () => {
+  loading.value = true;
+  try {
+    // 并行加载所有API
+    // 对于数据量较大的接口使用分页，对于需要详细统计的接口查询全部
+    const [deviceRes, pondRes, warningRes, userRes, switchRes, linkedRes, timingRes, callNoticeRes, deviceWarnCombineRes]: any[] = 
+      await Promise.all([
+        listDevice(), // 设备需要统计类型分布和在线状态，查询全部
+        listPond({ pageNum: 1, pageSize: 10 }), // 塘口只需要总数
+        listMessageWarn({ pageNum: 1, pageSize: 5 }), // 告警只需5条用于展示表格
+        listAquUser({ pageNum: 1, pageSize: 10 }), // 用户只需要总数
+        listDeviceSwitch({ pageNum: 1, pageSize: 10 }), // 开关只需要总数
+        listLinkedCtrl({ pageNum: 1, pageSize: 10 }), // 联动控制只需要总数
+        listTimingCtrl({ pageNum: 1, pageSize: 10 }), // 定时控制只需要总数
+        listCallNotice({ pageNum: 1, pageSize: 10 }), // 电话通知记录只需要总数
+        listDeviceWarnCombine({ pageNum: 1, pageSize: 10 }) // 设备报警信息（合并后）只需要总数
+      ]);
+    
+    // Process devices - 使用total获取总数，不再依赖数组长度
+    let devices: any[] = [];
+    let deviceTotal = 0;
+    if (deviceRes.rows) {
+      devices = deviceRes.rows;
+      deviceTotal = deviceRes.total || devices.length;
+    } else if (deviceRes.data) {
+      if (Array.isArray(deviceRes.data)) {
+        devices = deviceRes.data;
+        deviceTotal = devices.length;
+      } else {
+        devices = deviceRes.data.rows || [];
+        deviceTotal = deviceRes.data.total || devices.length;
+      }
+    }
+    statistics.value.deviceCount = deviceTotal;
+    
+    // Calculate device type distribution
+    const deviceTypeMap = new Map();
+    const deviceTypeNames: any = {
+      1: '测控一体机',
+      2: '水质监测仪',
+      3: '增氧机',
+      4: '投料机',
+      5: '其他设备'
+    };
+    
+    let monitorDeviceCount = 0;  // 测控一体机数量
+    let waterQualityDeviceCount = 0;  // 水质监测仪数量
+    
+    devices.forEach((device: any) => {
+      const typeName = deviceTypeNames[device.deviceType] || '未知类型';
+      deviceTypeMap.set(typeName, (deviceTypeMap.get(typeName) || 0) + 1);
+      
+      // 统计测控一体机和水质监测仪
+      if (device.deviceType === 1) {
+        monitorDeviceCount++;
+      } else if (device.deviceType === 2) {
+        waterQualityDeviceCount++;
+      }
+    });
+    
+    statistics.value.monitorDeviceCount = monitorDeviceCount;
+    statistics.value.waterQualityDeviceCount = waterQualityDeviceCount;
+    
+    deviceTypeData.value = Array.from(deviceTypeMap.entries()).map(([name, value]) => ({
+      name,
+      value
+    }));
+    
+    // Calculate online/offline status - 使用全部设备数据统计
+    let onlineCount = 0;
+    let offlineCount = 0;
+    let expiredCount = 0;
+    const now = new Date();
+    
+    devices.forEach((device: any) => {
+      // 检查设备是否过期
+      if (device.deadTime) {
+        const deadTime = new Date(device.deadTime);
+        if (deadTime < now) {
+          expiredCount++;
+        }
+      }
+      
+      // 判断逻辑：有溶解氧或水温数据，且告警码为0或null，视为在线
+      const hasData = device.valueDissolvedOxygen > 0 || device.valueTemperature > 0;
+      const noAlarm = !device.warnCode || device.warnCode === 0;
+      
+      if (hasData && noAlarm) {
+        onlineCount++;
+      } else if (hasData) {
+        // 有数据但有告警，也算在线（异常状态）
+        onlineCount++;
+      } else {
+        offlineCount++;
+      }
+    });
+    
+    statistics.value.onlineDevices = onlineCount;
+    statistics.value.offlineDevices = offlineCount;
+    statistics.value.expiredDevices = expiredCount;
+    
+    // Process ponds - 使用total
+    const ponds = pondRes.rows || pondRes.data?.rows || pondRes.data || [];
+    const pondTotal = pondRes.total || pondRes.data?.total || ponds.length;
+    statistics.value.pondCount = pondTotal;
+    
+    // Process warnings - 使用total
+    const warnings = warningRes.rows || warningRes.data?.rows || warningRes.data || [];
+    const warningTotal = warningRes.total || warningRes.data?.total || warnings.length;
+    statistics.value.warningCount = warningTotal;
+    
+    // Process recent warnings for table
+    recentWarnings.value = warnings.slice(0, 5).map((warn: any) => ({
+      userName: warn.userName || '-',
+      mobilePhone: warn.mobilePhone || '-',
+      deviceName: warn.deviceName || '未知设备',
+      serialNum: warn.serialNum || '-',
+      warnType: warn.warnType, // 告警类型（数字）
+      warnTypeLabel: getWarnTypeLabel(warn.warnType), // 告警类型文本
+      title: warn.title || '-',
+      message: warn.message || warn.title || '-', // 告警内容
+      warnTime: warn.createTime, // 告警时间
+      isRead: warn.isRead // 是否已读
+    }));
+    
+    // 按告警类型分别查询，获取每个类型的total（高效方案）
+    // 从warn_type字典获取所有告警类型
+    if (warn_type && warn_type.length > 0) {
+      const warnTypeQueries = warn_type.map((dict: any) => 
+        listMessageWarn({ warnType: parseInt(dict.value), pageNum: 1, pageSize: 1 })
+      );
+      
+      // 并行查询所有告警类型的数量
+      const warnTypeResults: any[] = await Promise.all(warnTypeQueries);
+      
+      // Calculate warning type distribution - 使用分页查询的total统计（高效）
+      const warnTypeMap = new Map();
+      warnTypeResults.forEach((result: any, index: number) => {
+        const total = result.total || result.data?.total || 0;
+        if (total > 0) {
+          const typeLabel = warn_type[index].label;
+          warnTypeMap.set(typeLabel, total);
+        }
+      });
+      
+      warningData.value = Array.from(warnTypeMap.entries()).map(([name, value]) => ({
+        name,
+        value
+      }));
+    } else {
+      console.warn('warn_type dictionary is not loaded yet');
+      warningData.value = [];
+    }
+    
+    // Process other statistics - 使用total减少数据传输
+    const users = userRes.rows || userRes.data?.rows || userRes.data || [];
+    const userTotal = userRes.total || userRes.data?.total || users.length;
+    statistics.value.userCount = userTotal;
+    
+    const switches = switchRes.rows || switchRes.data?.rows || switchRes.data || [];
+    const switchTotal = switchRes.total || switchRes.data?.total || switches.length;
+    statistics.value.switchCount = switchTotal;
+    
+    const linkedCtrls = linkedRes.rows || linkedRes.data?.rows || linkedRes.data || [];
+    const linkedTotal = linkedRes.total || linkedRes.data?.total || linkedCtrls.length;
+    statistics.value.linkedCtrlCount = linkedTotal;
+    
+    const timingCtrls = timingRes.rows || timingRes.data?.rows || timingRes.data || [];
+    const timingTotal = timingRes.total || timingRes.data?.total || timingCtrls.length;
+    statistics.value.timingCtrlCount = timingTotal;
+    
+    // 统计电话通知记录次数
+    const callNoticeTotal = callNoticeRes.total || callNoticeRes.data?.total || 0;
+    statistics.value.callNoticeCount = callNoticeTotal;
+    
+    // 统计设备报警信息次数（合并后的数据）
+    const deviceWarnCombineTotal = deviceWarnCombineRes.total || deviceWarnCombineRes.data?.total || 0;
+    statistics.value.deviceWarnCount = deviceWarnCombineTotal;
+    
+    // 加载最近电话通知记录（用于表格展示）
+    const callNoticeListRes: any = await listCallNotice({ pageNum: 1, pageSize: 5 });
+    const callNotices = callNoticeListRes.rows || callNoticeListRes.data?.rows || callNoticeListRes.data || [];
+    recentCallNotices.value = callNotices.slice(0, 5).map((notice: any) => ({
+      userName: notice.userName || '-',
+      serialNum: notice.serialNum || '-',
+      deviceType: notice.deviceType,
+      mobilePhone: notice.mobilePhone || '-',
+      callTime: notice.callTime,
+      warnType: notice.warnType,
+      warnTypeLabel: getWarnTypeLabel(notice.warnType),
+      warnTitle: notice.warnTitle || '-',
+      callStatus: notice.callStatus,
+      caller: notice.caller || '-',
+      statusMsg: notice.statusMsg || '-',
+      createTime: notice.createTime
+    }));
+    
+    // 加载最近设备报警信息（用于表格展示）
+    const deviceWarnListRes: any = await listDeviceWarnCombine({ pageNum: 1, pageSize: 5 });
+    const deviceWarns = deviceWarnListRes.rows || deviceWarnListRes.data?.rows || deviceWarnListRes.data || [];
+    recentDeviceWarns.value = deviceWarns.slice(0, 5).map((warn: any) => ({
+      deviceSerialNum: warn.deviceSerialNum || '-',
+      deviceType: warn.deviceType,
+      thresholdType: warn.thresholdType,
+      processStatus: warn.processStatus,
+      warnType: warn.warnType,
+      totalCount: warn.totalCount || 0,
+      handlerName: warn.handlerName || '-',
+      processTime: warn.processTime,
+      updateTime: warn.updateTime
+    }));
+    
+  } catch (error) {
+    console.error('Failed to load statistics:', error);
+  } finally {
+    loading.value = false;
+  }
 };
+
+// Initialize charts
+const initCharts = () => {
+  // 等待 DOM 更新完成
+  nextTick(() => {
+    // Device Type Pie Chart
+    const deviceChartDom = document.getElementById('deviceTypeChart');
+    if (!deviceChartDom) {
+      console.error('deviceTypeChart element not found');
+      return;
+    }
+    
+    const deviceChart = echarts.init(deviceChartDom);
+    
+    // 检查是否有数据
+    const hasDeviceData = deviceTypeData.value && deviceTypeData.value.length > 0;
+    
+    deviceChart.setOption({
+      tooltip: {
+        trigger: 'item',
+        formatter: '{a} <br/>{b}: {c} ({d}%)'
+      },
+      legend: {
+        orient: 'horizontal',
+        bottom: 0,
+        left: 'center',
+        itemGap: 15,
+        textStyle: {
+          fontSize: 12
+        }
+      },
+      series: [
+        {
+          name: '设备类型',
+          type: 'pie',
+          radius: ['40%', '60%'],
+          center: ['50%', '45%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderRadius: 10,
+            borderColor: '#fff',
+            borderWidth: 2
+          },
+          label: {
+            show: false,
+            position: 'center'
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 16,
+              fontWeight: 'bold'
+            }
+          },
+          labelLine: {
+            show: false
+          },
+          data: hasDeviceData ? deviceTypeData.value : [
+            { name: '暂无设备', value: 1 }
+          ]
+        }
+      ],
+      color: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de']
+    });
+    
+    // Warning Status Pie Chart
+    const warningChartDom = document.getElementById('warningStatusChart');
+    if (!warningChartDom) {
+      console.error('warningStatusChart element not found');
+      return;
+    }
+    
+    const warningChart = echarts.init(warningChartDom);
+    
+    // 检查是否有数据
+    const hasWarningData = warningData.value && warningData.value.length > 0;
+    
+    warningChart.setOption({
+      tooltip: {
+        trigger: 'item',
+        formatter: '{a} <br/>{b}: {c} ({d}%)'
+      },
+      legend: {
+        orient: 'horizontal',
+        bottom: 0,
+        left: 'center',
+        itemGap: 15,
+        textStyle: {
+          fontSize: 12
+        }
+      },
+      series: [
+        {
+          name: '告警类型',
+          type: 'pie',
+          radius: ['40%', '60%'],
+          center: ['50%', '45%'],
+          avoidLabelOverlap: false,
+          itemStyle: {
+            borderRadius: 10,
+            borderColor: '#fff',
+            borderWidth: 2
+          },
+          label: {
+            show: false,
+            position: 'center'
+          },
+          emphasis: {
+            label: {
+              show: true,
+              fontSize: 16,
+              fontWeight: 'bold'
+            }
+          },
+          labelLine: {
+            show: false
+          },
+          data: hasWarningData ? warningData.value : [
+            { name: '暂无告警', value: 1 }
+          ]
+        }
+      ],
+      color: ['#ee6666', '#fac858', '#91cc75', '#5470c6', '#73c0de']
+    });
+    
+    // Online Status Gauge Chart
+    const onlineChartDom = document.getElementById('onlineStatusChart');
+    if (!onlineChartDom) {
+      console.error('onlineStatusChart element not found');
+      return;
+    }
+    
+    const onlineChart = echarts.init(onlineChartDom);
+    onlineChart.setOption({
+      series: [
+        {
+          type: 'gauge',
+          startAngle: 180,
+          endAngle: 0,
+          min: 0,
+          max: 100,
+          splitNumber: 10,
+          itemStyle: {
+            color: '#58D9F9'
+          },
+          progress: {
+            show: true,
+            width: 18
+          },
+          pointer: {
+            show: false
+          },
+          axisLine: {
+            lineStyle: {
+              width: 18
+            }
+          },
+          axisTick: {
+            show: false
+          },
+          splitLine: {
+            show: false
+          },
+          axisLabel: {
+            show: false
+          },
+          detail: {
+            valueAnimation: true,
+            formatter: '{value}%',
+            fontSize: 24,
+            offsetCenter: [0, '-10%']
+          },
+          data: [
+            {
+              value: Number(onlineRate.value)
+            }
+          ]
+        }
+      ]
+    });
+    
+    // Make charts responsive
+    window.addEventListener('resize', () => {
+      deviceChart.resize();
+      warningChart.resize();
+      onlineChart.resize();
+    });
+  });
+};
+
+// View all warnings - 打开弹窗
+const openWarningsDialog = () => {
+  warningsDialog.value.visible = true;
+  resetWarningsQuery();
+  loadWarningsDialog();
+};
+
+// 加载告警弹窗数据
+const loadWarningsDialog = async () => {
+  warningsDialog.value.loading = true;
+  try {
+    const params: any = {
+      pageNum: warningsQuery.value.pageNum,
+      pageSize: warningsQuery.value.pageSize
+    };
+    
+    // 添加查询条件
+    if (warningsQuery.value.deviceKeyword) {
+      params['params[deviceKeyword]'] = warningsQuery.value.deviceKeyword;
+    }
+    if (warningsQuery.value.warnType !== undefined) {
+      params.warnType = warningsQuery.value.warnType;
+    }
+    if (warningsQuery.value.isRead !== undefined) {
+      params.isRead = warningsQuery.value.isRead;
+    }
+    
+    const res: any = await listMessageWarn(params);
+    const data = res.rows || res.data?.rows || [];
+    const total = res.total || res.data?.total || 0;
+    
+    warningsDialog.value.list = data;
+    warningsDialog.value.total = total;
+  } catch (error) {
+    console.error('Failed to load warnings dialog:', error);
+  } finally {
+    warningsDialog.value.loading = false;
+  }
+};
+
+// 搜索告警
+const searchWarnings = () => {
+  warningsQuery.value.pageNum = 1;
+  loadWarningsDialog();
+};
+
+// 重置查询条件
+const resetWarningsQuery = () => {
+  warningsQuery.value = {
+    pageNum: 1,
+    pageSize: 10,
+    deviceKeyword: '',
+    warnType: undefined,
+    isRead: undefined
+  };
+  loadWarningsDialog();
+};
+
+// ========== 电话通知记录弹窗 ==========
+
+// 打开电话通知弹窗
+const openCallNoticesDialog = () => {
+  callNoticesDialog.value.visible = true;
+  resetCallNoticesQuery();
+  loadCallNoticesDialog();
+};
+
+// 加载电话通知弹窗数据
+const loadCallNoticesDialog = async () => {
+  callNoticesDialog.value.loading = true;
+  try {
+    const params: any = {
+      pageNum: callNoticesQuery.value.pageNum,
+      pageSize: callNoticesQuery.value.pageSize
+    };
+    
+    // 添加查询条件
+    if (callNoticesQuery.value.mobilePhone) {
+      params.mobilePhone = callNoticesQuery.value.mobilePhone;
+    }
+    if (callNoticesQuery.value.warnType !== undefined) {
+      params.warnType = callNoticesQuery.value.warnType;
+    }
+    if (callNoticesQuery.value.callStatus !== undefined) {
+      params.callStatus = callNoticesQuery.value.callStatus;
+    }
+    
+    const res: any = await listCallNotice(params);
+    const data = res.rows || res.data?.rows || [];
+    const total = res.total || res.data?.total || 0;
+    
+    callNoticesDialog.value.list = data;
+    callNoticesDialog.value.total = total;
+  } catch (error) {
+    console.error('Failed to load call notices dialog:', error);
+  } finally {
+    callNoticesDialog.value.loading = false;
+  }
+};
+
+// 搜索电话通知
+const searchCallNotices = () => {
+  callNoticesQuery.value.pageNum = 1;
+  loadCallNoticesDialog();
+};
+
+// 重置查询条件
+const resetCallNoticesQuery = () => {
+  callNoticesQuery.value = {
+    pageNum: 1,
+    pageSize: 10,
+    mobilePhone: '',
+    warnType: undefined,
+    callStatus: undefined
+  };
+  loadCallNoticesDialog();
+};
+
+// 获取呼叫状态标签
+const getCallStatusLabel = (callStatus: number) => {
+  if (!call_status || call_status.length === 0) return '未知状态';
+  const dict = call_status.find((item: any) => parseInt(item.value) === callStatus);
+  return dict ? dict.label : '未知状态';
+};
+
+// 获取呼叫状态标签类型
+const getCallStatusTag = (callStatus: number) => {
+  const typeMap: any = {
+    1: 'success',  // 接通
+    2: 'warning',  // 未接通
+    3: 'info',     // 其他
+  };
+  return typeMap[callStatus] || 'info';
+};
+
+// ========== 设备报警信息弹窗 ==========
+
+// 打开设备报警信息弹窗
+const openDeviceWarnsDialog = () => {
+  deviceWarnsDialog.value.visible = true;
+  resetDeviceWarnsQuery();
+  loadDeviceWarnsDialog();
+};
+
+// 加载设备报警信息弹窗数据
+const loadDeviceWarnsDialog = async () => {
+  deviceWarnsDialog.value.loading = true;
+  try {
+    const params: any = {
+      pageNum: deviceWarnsQuery.value.pageNum,
+      pageSize: deviceWarnsQuery.value.pageSize
+    };
+    
+    // 添加查询条件
+    if (deviceWarnsQuery.value.deviceSerialNum) {
+      params.deviceSerialNum = deviceWarnsQuery.value.deviceSerialNum;
+    }
+    if (deviceWarnsQuery.value.deviceType !== undefined) {
+      params.deviceType = deviceWarnsQuery.value.deviceType;
+    }
+    if (deviceWarnsQuery.value.processStatus !== undefined) {
+      params.processStatus = deviceWarnsQuery.value.processStatus;
+    }
+    if (deviceWarnsQuery.value.warnType !== undefined) {
+      params.warnType = deviceWarnsQuery.value.warnType;
+    }
+    
+    const res: any = await listDeviceWarnCombine(params);
+    const data = res.rows || res.data?.rows || [];
+    const total = res.total || res.data?.total || 0;
+    
+    deviceWarnsDialog.value.list = data;
+    deviceWarnsDialog.value.total = total;
+  } catch (error) {
+    console.error('Failed to load device warns dialog:', error);
+  } finally {
+    deviceWarnsDialog.value.loading = false;
+  }
+};
+
+// 搜索设备报警信息
+const searchDeviceWarns = () => {
+  deviceWarnsQuery.value.pageNum = 1;
+  loadDeviceWarnsDialog();
+};
+
+// 重置查询条件
+const resetDeviceWarnsQuery = () => {
+  deviceWarnsQuery.value = {
+    pageNum: 1,
+    pageSize: 10,
+    deviceSerialNum: '',
+    deviceType: undefined,
+    processStatus: undefined,
+    warnType: undefined
+  };
+  loadDeviceWarnsDialog();
+};
+
+// 获取设备类型标签
+const getDeviceTypeLabel = (deviceType: number) => {
+  if (!aqu_device_type || aqu_device_type.length === 0) return '未知类型';
+  const dict = aqu_device_type.find((item: any) => parseInt(item.value) === deviceType);
+  return dict ? dict.label : '未知类型';
+};
+
+// Get warning type tag
+const getWarningTypeTag = (warnType: number) => {
+  const typeMap: any = {
+    1: 'danger',   // 溶解氧告警
+    2: 'warning',  // 温度告警
+    3: 'info',     // 电量告警
+    4: 'danger'    // 电压告警
+  };
+  return typeMap[warnType] || 'info';
+};
+
+// Get warning type label from dict
+const getWarnTypeLabel = (warnType: number) => {
+  if (!warn_type || warn_type.length === 0) return '未知类型';
+  const dict = warn_type.find((item: any) => parseInt(item.value) === warnType);
+  return dict ? dict.label : '未知类型';
+};
+
+onMounted(async () => {
+  await loadStatistics();
+  // 数据加载完成后初始化图表
+  initCharts();
+});
 </script>
 
 <style lang="scss" scoped>
 .home {
-  height: calc(100vh - 84px);
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  background: linear-gradient(135deg, #f5f7fa 0%, #c3cfe2 100%);
-  position: relative;
-  overflow: hidden;
+  padding: 20px;
+  background: #f0f2f5;
+  min-height: calc(100vh - 84px);
 
-  &::before {
-    content: '';
-    position: absolute;
-    top: -50%;
-    left: -50%;
-    width: 200%;
-    height: 200%;
-    background: radial-gradient(circle, rgba(255, 255, 255, 0.1) 1px, transparent 1px);
-    background-size: 50px 50px;
-    animation: moveBackground 20s linear infinite;
-  }
-
-  .welcome-container {
-    position: relative;
-    z-index: 1;
-  }
-
-  .welcome-content {
+  .dashboard-header {
     text-align: center;
-    padding: 60px 80px;
-    background: rgba(255, 255, 255, 0.95);
-    border-radius: 20px;
-    box-shadow: 0 20px 60px rgba(0, 0, 0, 0.3);
-    backdrop-filter: blur(10px);
-    transform: translateY(0);
-    animation: fadeInUp 1s ease-out;
-  }
-
-  .welcome-title {
-    font-size: 48px;
-    font-weight: 300;
-    color: #333;
-    margin: 0 0 20px 0;
-    letter-spacing: 8px;
-    animation: slideInLeft 0.8s ease-out;
-  }
-
-  .platform-name {
-    font-size: 56px;
-    font-weight: 700;
-    background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
-    -webkit-background-clip: text;
-    -webkit-text-fill-color: transparent;
-    background-clip: text;
-    margin: 0 0 30px 0;
-    letter-spacing: 4px;
-    animation: slideInRight 0.8s ease-out;
-  }
-
-  .welcome-decoration {
-    display: flex;
-    justify-content: center;
-    gap: 12px;
-    margin-top: 30px;
-  }
-
-  .dot {
-    width: 12px;
-    height: 12px;
-    border-radius: 50%;
-    background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
-    animation: bounce 1.4s infinite ease-in-out;
-
-    &:nth-child(1) {
-      animation-delay: -0.32s;
+    margin-bottom: 30px;
+    
+    .dashboard-title {
+      font-size: 32px;
+      font-weight: 600;
+      color: #303133;
+      margin: 0 0 10px 0;
+      background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
+      -webkit-background-clip: text;
+      -webkit-text-fill-color: transparent;
+      background-clip: text;
     }
-
-    &:nth-child(2) {
-      animation-delay: -0.16s;
+    
+    .dashboard-subtitle {
+      font-size: 16px;
+      color: #909399;
+      margin: 0;
     }
   }
 
-  @keyframes fadeInUp {
-    from {
-      opacity: 0;
-      transform: translateY(40px);
-    }
-    to {
-      opacity: 1;
-      transform: translateY(0);
-    }
-  }
-
-  @keyframes slideInLeft {
-    from {
-      opacity: 0;
-      transform: translateX(-50px);
-    }
-    to {
-      opacity: 1;
-      transform: translateX(0);
-    }
-  }
-
-  @keyframes slideInRight {
-    from {
-      opacity: 0;
-      transform: translateX(50px);
-    }
-    to {
-      opacity: 1;
-      transform: translateX(0);
-    }
-  }
-
-  @keyframes bounce {
-    0%,
-    80%,
-    100% {
-      transform: scale(0);
-    }
-    40% {
-      transform: scale(1);
-    }
-  }
-
-  @keyframes moveBackground {
-    0% {
-      transform: translate(0, 0);
-    }
-    100% {
-      transform: translate(50px, 50px);
-    }
-  }
-
-  blockquote {
-    padding: 10px 20px;
-    margin: 0 0 20px;
-    font-size: 17.5px;
-    border-left: 5px solid #eee;
-  }
-  hr {
-    margin-top: 20px;
+  .stat-cards {
     margin-bottom: 20px;
-    border: 0;
-    border-top: 1px solid #eee;
+    
+    .stat-card {
+      background: white;
+      border-radius: 8px;
+      padding: 24px;
+      display: flex;
+      align-items: center;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+      transition: transform 0.3s, box-shadow 0.3s;
+      cursor: pointer;
+      margin-bottom: 20px;
+      
+      &:hover {
+        transform: translateY(-5px);
+        box-shadow: 0 4px 20px 0 rgba(0, 0, 0, 0.15);
+      }
+      
+      .stat-icon {
+        width: 60px;
+        height: 60px;
+        border-radius: 10px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-right: 20px;
+      }
+      
+      .stat-info {
+        flex: 1;
+        
+        .stat-value {
+          font-size: 28px;
+          font-weight: 600;
+          color: #303133;
+          margin-bottom: 5px;
+        }
+        
+        .stat-label {
+          font-size: 14px;
+          color: #909399;
+        }
+      }
+    }
+    
+    .device-card .stat-icon {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      color: white;
+    }
+    
+    .pond-card .stat-icon {
+      background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%);
+      color: white;
+    }
+    
+    .warning-card .stat-icon {
+      background: linear-gradient(135deg, #fa709a 0%, #fee140 100%);
+      color: white;
+    }
+    
+    .user-card .stat-icon {
+      background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
+      color: white;
+    }
+    
+    .switch-card .stat-icon {
+      background: linear-gradient(135deg, #43e97b 0%, #38f9d7 100%);
+      color: white;
+    }
+    
+    .control-card .stat-icon {
+      background: linear-gradient(135deg, #fa709a 0%, #fee140 100%);
+      color: white;
+    }
+    
+    .timing-card .stat-icon {
+      background: linear-gradient(135deg, #30cfd0 0%, #330867 100%);
+      color: white;
+    }
+    
+    .fish-card .stat-icon {
+      background: linear-gradient(135deg, #a8edea 0%, #fed6e3 100%);
+      color: white;
+    }
+    
+    .expired-card .stat-icon {
+      background: linear-gradient(135deg, #ff6b6b 0%, #ee5a24 100%);
+      color: white;
+    }
+    
+    .call-notice-card .stat-icon {
+      background: linear-gradient(135deg, #a8edea 0%, #fed6e3 100%);
+      color: white;
+    }
+    
+    .device-warn-card .stat-icon {
+      background: linear-gradient(135deg, #ffa07a 0%, #ff6347 100%);
+      color: white;
+    }
+    
+    .monitor-device-card .stat-icon {
+      background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+      color: white;
+    }
+    
+    .water-quality-card .stat-icon {
+      background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
+      color: white;
+    }
   }
-  .col-item {
+  
+  .secondary-stats {
     margin-bottom: 20px;
   }
 
-  ul {
-    padding: 0;
-    margin: 0;
-  }
-
-  font-family: 'open sans', 'Helvetica Neue', Helvetica, Arial, sans-serif;
-  font-size: 13px;
-  color: #676a6c;
-  overflow-x: hidden;
-
-  ul {
-    list-style-type: none;
-  }
-
-  h4 {
-    margin-top: 0px;
-  }
-
-  h2 {
-    margin-top: 10px;
-    font-size: 26px;
-    font-weight: 100;
-  }
-
-  p {
-    margin-top: 10px;
-
-    b {
-      font-weight: 700;
+  .charts-row {
+    margin-bottom: 20px;
+    
+    .chart-card {
+      background: white;
+      border-radius: 8px;
+      padding: 24px;
+      box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+      margin-bottom: 20px;
+      height: 490px; // 固定总高度：标题(53px) + 内容(437px)
+      display: flex;
+      flex-direction: column;
+      
+      .chart-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        margin-bottom: 20px;
+        padding-bottom: 15px;
+        border-bottom: 1px solid #ebeef5;
+        flex-shrink: 0;
+        
+        h3 {
+          margin: 0;
+          font-size: 18px;
+          font-weight: 600;
+          color: #303133;
+        }
+      }
+      
+      // 表格容器：不限制高度，自适应内容
+      .el-table {
+        flex-shrink: 0;
+      }
+      
+      .chart-container {
+        width: 100%;
+        flex: 1;
+        min-height: 0;
+      }
+      
+      // 设备在线统计不需要特殊处理，使用flex自动分配
+      .chart-container-with-stats {
+        width: 100%;
+        flex: 1;
+        min-height: 0;
+      }
+      
+      .online-stats {
+        display: flex;
+        justify-content: space-around;
+        margin-bottom: 20px;
+        flex-shrink: 0;
+        
+        .online-item {
+          text-align: center;
+          
+          .online-label {
+            font-size: 14px;
+            color: #909399;
+            margin-bottom: 10px;
+          }
+          
+          .online-value {
+            font-size: 32px;
+            font-weight: 600;
+            
+            &.online {
+              color: #67c23a;
+            }
+            
+            &.offline {
+              color: #f56c6c;
+            }
+            
+            &.rate {
+              color: #409eff;
+            }
+          }
+        }
+      }
     }
   }
+}
 
-  .update-log {
-    ol {
-      display: block;
-      list-style-type: decimal;
-      margin-block-start: 1em;
-      margin-block-end: 1em;
-      margin-inline-start: 0;
-      margin-inline-end: 0;
-      padding-inline-start: 40px;
+// Responsive design
+@media (max-width: 768px) {
+  .home {
+    padding: 10px;
+    
+    .dashboard-header .dashboard-title {
+      font-size: 24px;
+    }
+    
+    .stat-cards .stat-card {
+      padding: 16px;
+      
+      .stat-icon {
+        width: 50px;
+        height: 50px;
+        margin-right: 15px;
+      }
+      
+      .stat-info .stat-value {
+        font-size: 24px;
+      }
+    }
+    
+    .charts-row .chart-card {
+      padding: 16px;
+      
+      .chart-container {
+        height: 280px;
+      }
     }
   }
 }

From 4ac97b19a21cdbee78948816aa4131acb1be297f Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Wed, 5 Nov 2025 00:44:47 +0800
Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E6=96=B0=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E5=BC=80=E5=8F=91=EF=BC=8C=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/fishery/monitorHistory/index.vue | 587 +++++++++++++++++++++
 1 file changed, 587 insertions(+)
 create mode 100644 src/views/fishery/monitorHistory/index.vue

diff --git a/src/views/fishery/monitorHistory/index.vue b/src/views/fishery/monitorHistory/index.vue
new file mode 100644
index 0000000..66f9763
--- /dev/null
+++ b/src/views/fishery/monitorHistory/index.vue
@@ -0,0 +1,587 @@
+<template>
+  <div class="p-2">
+    <!-- 查询表单 -->
+    <el-card shadow="hover" class="mb-[10px]">
+      <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="100px">
+        <el-form-item label="设备" prop="deviceId">
+          <el-input 
+            v-model="selectedDeviceDisplay" 
+            placeholder="请选择设备" 
+            readonly
+            clearable
+            @clear="handleClearDevice"
+            style="width: 280px; cursor: pointer;"
+            @click="openDeviceSelect" 
+          >
+            <template #suffix>
+              <el-icon style="cursor: pointer;" @click.stop="openDeviceSelect"><Search /></el-icon>
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="监测时间" prop="dateRange">
+          <el-date-picker
+            v-model="dateRange"
+            type="daterange"
+            range-separator="-"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="YYYY-MM-DD"
+            style="width: 280px"
+          />
+        </el-form-item>
+        <el-form-item label="时间间隔" prop="intervalType">
+          <el-select v-model="queryParams.intervalType" placeholder="请选择时间间隔" clearable style="width: 150px">
+            <el-option
+              v-for="dict in interval_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+
+    <!-- 设备选择对话框 -->
+    <el-dialog title="选择设备" v-model="deviceSelectVisible" width="1200px" append-to-body>
+      <!-- 搜索条件 -->
+      <el-form :model="deviceQueryParams" :inline="true" class="mb-4">
+        <el-form-item label="用户信息">
+          <el-input
+            v-model="deviceQueryParams.params.userKeyword"
+            placeholder="请输入用户名或手机号"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleDeviceQuery"
+          />
+        </el-form-item>
+        <el-form-item label="设备编号">
+          <el-input
+            v-model="deviceQueryParams.serialNum"
+            placeholder="请输入设备编号"
+            clearable
+            style="width: 180px"
+            @keyup.enter="handleDeviceQuery"
+          />
+        </el-form-item>
+        <el-form-item label="设备名称">
+          <el-input
+            v-model="deviceQueryParams.deviceName"
+            placeholder="请输入设备名称"
+            clearable
+            style="width: 180px"
+            @keyup.enter="handleDeviceQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleDeviceQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetDeviceQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <!-- 设备表格 -->
+      <el-table
+        :data="deviceList"
+        highlight-current-row
+        height="400px"
+        border
+      >
+        <el-table-column label="用户名" align="center" prop="userName" />
+        <el-table-column label="手机号" align="center" prop="mobilePhone" />
+        <el-table-column label="设备编号" align="center" prop="serialNum" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="塘口名称" align="center" prop="pondName" />
+        <el-table-column label="绑定时间" align="center" prop="bindTime" width="120">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.bindTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="服务到期时间" align="center" prop="deadTime" width="120">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.deadTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" align="center" width="100">
+          <template #default="scope">
+            <el-button
+              type="primary"
+              size="small"
+              @click="handleDeviceSelect(scope.row)"
+            >
+              选择
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <!-- 分页 -->
+      <pagination
+        v-show="deviceTotal > 0"
+        :total="deviceTotal"
+        v-model:page="deviceQueryParams.pageNum"
+        v-model:limit="deviceQueryParams.pageSize"
+        @pagination="handleDevicePaginationChange"
+        class="mt-4"
+      />
+
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="cancelDeviceSelect">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+
+    <!-- 图表区域 -->
+    <el-card shadow="never">
+      <el-tabs v-model="activeTab" @tab-change="handleTabChange">
+        <el-tab-pane label="溶解氧(Mg/L)" name="dissolvedOxygen"></el-tab-pane>
+        <el-tab-pane label="水温(℃)" name="temperature"></el-tab-pane>
+        <el-tab-pane label="饱和度(%)" name="saturability"></el-tab-pane>
+        <el-tab-pane label="PH(Ph)" name="ph"></el-tab-pane>
+        <el-tab-pane label="盐度(%)" name="salinity"></el-tab-pane>
+        <el-tab-pane label="参比值" name="treference"></el-tab-pane>
+        <el-tab-pane label="荧光值" name="tfluorescence"></el-tab-pane>
+        <el-tab-pane label="电量(%)" name="battery"></el-tab-pane>
+      </el-tabs>
+
+      <div 
+        ref="chartRef" 
+        v-loading="loading" 
+        style="width: 100%; height: 450px; margin-top: 20px;"
+      ></div>
+
+      <!-- 图表工具栏 -->
+      <div class="chart-toolbar">
+        <el-button-group>
+          <el-tooltip content="折线图" placement="top">
+            <el-button 
+              :type="chartType === 'line' ? 'primary' : ''" 
+              icon="TrendCharts"
+              @click="changeChartType('line')"
+            />
+          </el-tooltip>
+          <el-tooltip content="柱状图" placement="top">
+            <el-button 
+              :type="chartType === 'bar' ? 'primary' : ''" 
+              icon="Histogram"
+              @click="changeChartType('bar')"
+            />
+          </el-tooltip>
+          <el-tooltip content="下载" placement="top">
+            <el-button icon="Download" @click="downloadChart" />
+          </el-tooltip>
+        </el-button-group>
+      </div>
+    </el-card>
+  </div>
+</template>
+
+<script setup name="MonitorHistory" lang="ts">
+import { ref, reactive, onMounted, nextTick, computed } from 'vue';
+import * as echarts from 'echarts';
+import type { EChartsOption } from 'echarts';
+import { getHistoryData } from '@/api/fishery/monitorHistory';
+import type { DeviceSensorDataQueryBo, DeviceSensorData } from '@/api/fishery/monitorHistory/types';
+import { listDevice } from '@/api/fishery/device';
+import type { DeviceVO } from '@/api/fishery/device/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { interval_type } = toRefs<any>(proxy?.useDict('interval_type'));
+
+// 查询参数
+const queryParams = ref<DeviceSensorDataQueryBo>({
+  serialNum: '',
+  startTime: '',
+  endTime: '',
+  intervalType: '3'
+});
+
+// 日期范围
+const dateRange = ref<string[]>([]);
+
+// 设备选择相关
+const deviceList = ref<DeviceVO[]>([]);
+const selectedDevice = ref<DeviceVO | null>(null);
+const deviceSelectVisible = ref(false);
+const deviceQueryParams = reactive<{
+  pageNum: number;
+  pageSize: number;
+  serialNum?: string;
+  deviceName?: string;
+  params: {
+    userKeyword?: string;
+  };
+}>({
+  pageNum: 1,
+  pageSize: 10,
+  serialNum: undefined,
+  deviceName: undefined,
+  params: {
+    userKeyword: undefined
+  }
+});
+const deviceTotal = ref(0);
+
+// 设备显示文本
+const selectedDeviceDisplay = computed(() => {
+  if (selectedDevice.value) {
+    return `${selectedDevice.value.deviceName} (${selectedDevice.value.serialNum})`;
+  }
+  return '';
+});
+
+// 当前激活的标签页
+const activeTab = ref<string>('dissolvedOxygen');
+
+// 图表类型
+const chartType = ref<string>('line');
+
+// 加载状态
+const loading = ref<boolean>(false);
+
+// 图表实例
+const chartRef = ref<HTMLElement>();
+let chartInstance: echarts.ECharts | null = null;
+
+// 历史数据
+const historyData = ref<DeviceSensorData[]>([]);
+
+// 标签页配置
+const tabConfig = {
+  dissolvedOxygen: { label: '溶解氧', unit: 'Mg/L', color: '#5470c6' },
+  temperature: { label: '水温', unit: '℃', color: '#91cc75' },
+  saturability: { label: '饱和度', unit: '%', color: '#fac858' },
+  ph: { label: 'PH', unit: 'Ph', color: '#ee6666' },
+  salinity: { label: '盐度', unit: '%', color: '#73c0de' },
+  treference: { label: '参比值', unit: '', color: '#3ba272' },
+  tfluorescence: { label: '荧光值', unit: '', color: '#fc8452' },
+  battery: { label: '电量', unit: '%', color: '#9a60b4' }
+};
+
+/** 查询历史数据 */
+const getHistoryList = async () => {
+  // 验证是否选择了设备
+  if (!queryParams.value.serialNum) {
+    proxy?.$modal.msgWarning('请先选择设备');
+    return;
+  }
+  
+  loading.value = true;
+  try {
+    // 设置时间范围
+    if (dateRange.value && dateRange.value.length === 2) {
+      queryParams.value.startTime = dateRange.value[0];
+      queryParams.value.endTime = dateRange.value[1];
+    }
+
+    const res = await getHistoryData(queryParams.value);
+    
+    // 处理不同的响应格式
+    if (Array.isArray(res)) {
+      // 如果res本身就是数组
+      historyData.value = res;
+    } else if (res.data && Array.isArray(res.data)) {
+      // 如果res.data是数组
+      historyData.value = res.data;
+    } else {
+      // 其他情况
+      historyData.value = [];
+    }
+    
+    // 更新图表
+    await nextTick();
+    if (historyData.value.length > 0) {
+      updateChart();
+    } else {
+      // 清空图表显示
+      updateChart();
+      proxy?.$modal.msgWarning('未查询到数据，请检查日期范围是否正确');
+    }
+  } catch (error) {
+    proxy?.$modal.msgError('查询历史数据失败');
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getHistoryList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  // 重置为最近1周
+  const endDate = new Date();
+  const startDate = new Date();
+  startDate.setDate(startDate.getDate() - 7);
+  
+  const startStr = `${startDate.getFullYear()}-${String(startDate.getMonth() + 1).padStart(2, '0')}-${String(startDate.getDate()).padStart(2, '0')}`;
+  const endStr = `${endDate.getFullYear()}-${String(endDate.getMonth() + 1).padStart(2, '0')}-${String(endDate.getDate()).padStart(2, '0')}`;
+  
+  dateRange.value = [startStr, endStr];
+  selectedDevice.value = null;
+  queryParams.value = {
+    serialNum: '',
+    startTime: '',
+    endTime: '',
+    intervalType: '3'
+  };
+};
+
+/** 标签页切换 */
+const handleTabChange = () => {
+  updateChart();
+};
+
+/** 图表类型切换 */
+const changeChartType = (type: string) => {
+  chartType.value = type;
+  updateChart();
+};
+
+/** 初始化图表 */
+const initChart = () => {
+  if (!chartRef.value) {
+    return;
+  }
+  
+  if (chartInstance) {
+    chartInstance.dispose();
+  }
+  
+  chartInstance = echarts.init(chartRef.value);
+  
+  // 监听窗口大小变化
+  window.addEventListener('resize', () => {
+    chartInstance?.resize();
+  });
+};
+
+/** 更新图表 */
+const updateChart = () => {
+  // 如果图表实例不存在，先初始化
+  if (!chartInstance) {
+    initChart();
+    if (!chartInstance) {
+      return;
+    }
+  }
+  
+  if (historyData.value.length === 0) {
+    // 显示空数据提示，完全清空之前的配置
+    chartInstance.setOption({
+      title: {
+        text: '暂无数据',
+        left: 'center',
+        top: 'center',
+        textStyle: {
+          color: '#999',
+          fontSize: 20
+        }
+      },
+      tooltip: {},
+      grid: {},
+      xAxis: { show: false },
+      yAxis: { show: false },
+      series: []
+    }, true);  // true 表示 notMerge，不合并之前的配置
+    return;
+  }
+
+  const config = tabConfig[activeTab.value as keyof typeof tabConfig];
+  
+  // 准备数据
+  const xData = historyData.value.map(item => {
+    // 处理时间字符串 "2025-10-28 00:00:28.639"
+    const timeStr = item.time.replace(' ', 'T'); // 转换为ISO格式
+    const date = new Date(timeStr);
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    const hours = String(date.getHours()).padStart(2, '0');
+    const minutes = String(date.getMinutes()).padStart(2, '0');
+    return `${month}-${day} ${hours}:${minutes}`;
+  });
+  
+  const yData = historyData.value.map(item => {
+    const value = item[activeTab.value as keyof DeviceSensorData];
+    // 确保返回数字类型
+    return typeof value === 'number' ? value : 0;
+  });
+
+  // 图表配置
+  const option: EChartsOption = {
+    tooltip: {
+      trigger: 'axis',
+      axisPointer: {
+        type: 'cross'
+      },
+      formatter: (params: any) => {
+        const param = params[0];
+        return `${param.axisValue}<br/>${config.label}: ${param.value} ${config.unit}`;
+      }
+    },
+    grid: {
+      left: '3%',
+      right: '4%',
+      bottom: '3%',
+      containLabel: true
+    },
+    xAxis: {
+      type: 'category',
+      boundaryGap: chartType.value === 'bar',
+      data: xData,
+      axisLabel: {
+        interval: Math.floor(xData.length / 20), // 控制显示密度
+        rotate: 0
+      }
+    },
+    yAxis: {
+      type: 'value',
+      name: `${config.label}(${config.unit})`,
+      axisLabel: {
+        formatter: `{value} ${config.unit}`
+      }
+    },
+    series: [
+      {
+        name: config.label,
+        type: chartType.value,
+        data: yData,
+        smooth: chartType.value === 'line',
+        itemStyle: {
+          color: config.color
+        },
+        lineStyle: chartType.value === 'line' ? {
+          width: 2
+        } : undefined,
+        areaStyle: chartType.value === 'line' ? {
+          opacity: 0.1
+        } : undefined
+      }
+    ]
+  };
+
+  chartInstance.setOption(option, true);
+};
+
+/** 下载图表 */
+const downloadChart = () => {
+  if (!chartInstance) return;
+  
+  const url = chartInstance.getDataURL({
+    type: 'png',
+    pixelRatio: 2,
+    backgroundColor: '#fff'
+  });
+  
+  const link = document.createElement('a');
+  link.download = `${tabConfig[activeTab.value as keyof typeof tabConfig].label}_${queryParams.value.serialNum}_${new Date().getTime()}.png`;
+  link.href = url;
+  link.click();
+};
+
+/** 获取设备列表 */
+const getDeviceList = async () => {
+  const res = await listDevice(deviceQueryParams);
+  deviceList.value = res.rows || res.data || [];
+  deviceTotal.value = res.total || 0;
+};
+
+/** 打开设备选择对话框 */
+const openDeviceSelect = () => {
+  deviceQueryParams.pageNum = 1;
+  deviceQueryParams.serialNum = undefined;
+  deviceQueryParams.deviceName = undefined;
+  deviceQueryParams.params.userKeyword = undefined;
+  getDeviceList();
+  deviceSelectVisible.value = true;
+};
+
+/** 搜索设备 */
+const handleDeviceQuery = () => {
+  deviceQueryParams.pageNum = 1;
+  getDeviceList();
+};
+
+/** 重置设备搜索 */
+const resetDeviceQuery = () => {
+  deviceQueryParams.pageNum = 1;
+  deviceQueryParams.serialNum = undefined;
+  deviceQueryParams.deviceName = undefined;
+  deviceQueryParams.params.userKeyword = undefined;
+  getDeviceList();
+};
+
+/** 设备分页改变 */
+const handleDevicePaginationChange = () => {
+  getDeviceList();
+};
+
+/** 选择设备 */
+const handleDeviceSelect = (device: DeviceVO) => {
+  selectedDevice.value = device;
+  queryParams.value.serialNum = device.serialNum;
+  deviceSelectVisible.value = false;
+};
+
+/** 取消设备选择 */
+const cancelDeviceSelect = () => {
+  deviceSelectVisible.value = false;
+};
+
+/** 清除设备选择 */
+const handleClearDevice = () => {
+  selectedDevice.value = null;
+  queryParams.value.serialNum = '';
+};
+
+onMounted(() => {
+  // 设置默认日期为最近1周
+  const endDate = new Date();
+  const startDate = new Date();
+  startDate.setDate(startDate.getDate() - 7);
+  
+  const startStr = `${startDate.getFullYear()}-${String(startDate.getMonth() + 1).padStart(2, '0')}-${String(startDate.getDate()).padStart(2, '0')}`;
+  const endStr = `${endDate.getFullYear()}-${String(endDate.getMonth() + 1).padStart(2, '0')}-${String(endDate.getDate()).padStart(2, '0')}`;
+  
+  dateRange.value = [startStr, endStr];
+  
+  // 初始化图表 - 确保DOM已经渲染
+  nextTick(() => {
+    initChart();
+  });
+});
+
+// 组件卸载时销毁图表
+onBeforeUnmount(() => {
+  if (chartInstance) {
+    chartInstance.dispose();
+    chartInstance = null;
+  }
+  window.removeEventListener('resize', () => {
+    chartInstance?.resize();
+  });
+});
+</script>
+
+<style scoped lang="scss">
+.chart-toolbar {
+  position: absolute;
+  top: 20px;
+  right: 20px;
+  z-index: 10;
+}
+
+:deep(.el-tabs__nav-wrap::after) {
+  height: 1px;
+}
+
+:deep(.el-radio-button__inner) {
+  padding: 8px 15px;
+}
+</style>

From d4c7f3b324f3a5657607968c3fb578b5c73c443e Mon Sep 17 00:00:00 2001
From: tianyongbao <tianyongbao@haier.com>
Date: Sun, 14 Dec 2025 23:16:39 +0800
Subject: [PATCH 6/6] =?UTF-8?q?fix:=20=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development          | 2 +-
 .env.production           | 2 +-
 src/types/components.d.ts | 6 +++++-
 vite.config.ts            | 1 +
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index bac6d60..ed999ab 100644
--- a/.env.development
+++ b/.env.development
@@ -19,7 +19,7 @@ VITE_APP_SNAILJOB_ADMIN = 'http://localhost:8800/snail-job'
 VITE_APP_PORT = 80
 
 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
-VITE_APP_ENCRYPT = true
+VITE_APP_ENCRYPT = false
 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换
 VITE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
 # 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换
diff --git a/.env.production b/.env.production
index 172b8bf..923a968 100644
--- a/.env.production
+++ b/.env.production
@@ -22,7 +22,7 @@ VITE_BUILD_COMPRESS = gzip
 VITE_APP_PORT = 80
 
 # 接口加密功能开关(如需关闭 后端也必须对应关闭)
-VITE_APP_ENCRYPT = true
+VITE_APP_ENCRYPT = false
 # 接口加密传输 RSA 公钥与后端解密私钥对应 如更换需前后端一同更换
 VITE_APP_RSA_PUBLIC_KEY = 'MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAKoR8mX0rGKLqzcWmOzbfj64K8ZIgOdHnzkXSOVOZbFu/TJhZ7rFAN+eaGkl3C4buccQd/EjEsj9ir7ijT7h96MCAwEAAQ=='
 # 接口响应解密 RSA 私钥与后端加密公钥对应 如更换需前后端一同更换
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index ba0d740..eded184 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -20,6 +20,7 @@ declare module 'vue' {
     ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup']
     ElCard: typeof import('element-plus/es')['ElCard']
     ElCheckbox: typeof import('element-plus/es')['ElCheckbox']
+    ElCheckboxGroup: typeof import('element-plus/es')['ElCheckboxGroup']
     ElCol: typeof import('element-plus/es')['ElCol']
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
@@ -36,15 +37,16 @@ declare module 'vue' {
     ElForm: typeof import('element-plus/es')['ElForm']
     ElFormItem: typeof import('element-plus/es')['ElFormItem']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElImage: typeof import('element-plus/es')['ElImage']
     ElInput: typeof import('element-plus/es')['ElInput']
     ElInputNumber: typeof import('element-plus/es')['ElInputNumber']
+    ElLink: typeof import('element-plus/es')['ElLink']
     ElMenu: typeof import('element-plus/es')['ElMenu']
     ElMenuItem: typeof import('element-plus/es')['ElMenuItem']
     ElOption: typeof import('element-plus/es')['ElOption']
     ElPagination: typeof import('element-plus/es')['ElPagination']
     ElPopover: typeof import('element-plus/es')['ElPopover']
     ElRadio: typeof import('element-plus/es')['ElRadio']
-    ElRadioButton: typeof import('element-plus/es')['ElRadioButton']
     ElRadioGroup: typeof import('element-plus/es')['ElRadioGroup']
     ElRow: typeof import('element-plus/es')['ElRow']
     ElScrollbar: typeof import('element-plus/es')['ElScrollbar']
@@ -56,6 +58,7 @@ declare module 'vue' {
     ElTabPane: typeof import('element-plus/es')['ElTabPane']
     ElTabs: typeof import('element-plus/es')['ElTabs']
     ElTag: typeof import('element-plus/es')['ElTag']
+    ElText: typeof import('element-plus/es')['ElText']
     ElTooltip: typeof import('element-plus/es')['ElTooltip']
     ElTree: typeof import('element-plus/es')['ElTree']
     ElTreeSelect: typeof import('element-plus/es')['ElTreeSelect']
@@ -67,6 +70,7 @@ declare module 'vue' {
     IconSelect: typeof import('./../components/IconSelect/index.vue')['default']
     IEpCaretBottom: typeof import('~icons/ep/caret-bottom')['default']
     IEpCaretTop: typeof import('~icons/ep/caret-top')['default']
+    IEpUploadFilled: typeof import('~icons/ep/upload-filled')['default']
     IFrame: typeof import('./../components/iFrame/index.vue')['default']
     ImagePreview: typeof import('./../components/ImagePreview/index.vue')['default']
     ImageUpload: typeof import('./../components/ImageUpload/index.vue')['default']
diff --git a/vite.config.ts b/vite.config.ts
index 58ca5f2..f2ba6ac 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -25,6 +25,7 @@ export default defineConfig(({ mode, command }) => {
       proxy: {
         [env.VITE_APP_BASE_API]: {
           target: 'http://localhost:8080',
+            // target: 'https://www.qdintc.com/fishery-api/',
           changeOrigin: true,
           ws: true,
           rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')