diff --git a/index.html b/index.html
index 15003f6..71dc78e 100644
--- a/index.html
+++ b/index.html
@@ -6,7 +6,7 @@
     <meta name="renderer" content="webkit" />
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
     <link rel="icon" href="/favicon.ico" />
-    <title>鱼测云后台管理系统</title>
+    <title>水产养殖监测平台</title>
     <!--[if lt IE 11
       ]><script>
         window.location.href = '/html/ie.html';
diff --git a/src/api/fishery/deviceCorrectRecord/index.ts b/src/api/fishery/deviceCorrectRecord/index.ts
new file mode 100644
index 0000000..fee44c9
--- /dev/null
+++ b/src/api/fishery/deviceCorrectRecord/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceCorrectRecordVO, DeviceCorrectRecordForm, DeviceCorrectRecordQuery } from '@/api/fishery/deviceCorrectRecord/types';
+
+/**
+ * 查询设备校准记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDeviceCorrectRecord = (query?: DeviceCorrectRecordQuery): AxiosPromise<DeviceCorrectRecordVO[]> => {
+  return request({
+    url: '/fishery/deviceCorrectRecord/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备校准记录详细
+ * @param id
+ */
+export const getDeviceCorrectRecord = (id: string | number): AxiosPromise<DeviceCorrectRecordVO> => {
+  return request({
+    url: '/fishery/deviceCorrectRecord/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备校准记录
+ * @param data
+ */
+export const addDeviceCorrectRecord = (data: DeviceCorrectRecordForm) => {
+  return request({
+    url: '/fishery/deviceCorrectRecord',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备校准记录
+ * @param data
+ */
+export const updateDeviceCorrectRecord = (data: DeviceCorrectRecordForm) => {
+  return request({
+    url: '/fishery/deviceCorrectRecord',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备校准记录
+ * @param id
+ */
+export const delDeviceCorrectRecord = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/deviceCorrectRecord/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/deviceCorrectRecord/types.ts b/src/api/fishery/deviceCorrectRecord/types.ts
new file mode 100644
index 0000000..b71bbca
--- /dev/null
+++ b/src/api/fishery/deviceCorrectRecord/types.ts
@@ -0,0 +1,143 @@
+export interface DeviceCorrectRecordVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 设备id
+   */
+  deviceId: string | number;
+
+  /**
+   * 用户id
+   */
+  userId: string | number;
+
+  /**
+   * 设备序列号
+   */
+  serialNum: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType: number;
+
+  /**
+   * 溶解氧
+   */
+  valueDissolvedOxygen: number;
+
+  /**
+   * 水温
+   */
+  valueTemperature: number;
+
+  /**
+   * 饱和度
+   */
+  valueSaturability: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface DeviceCorrectRecordForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 设备id
+   */
+  deviceId?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 设备序列号
+   */
+  serialNum?: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType?: number;
+
+  /**
+   * 溶解氧
+   */
+  valueDissolvedOxygen?: number;
+
+  /**
+   * 水温
+   */
+  valueTemperature?: number;
+
+  /**
+   * 饱和度
+   */
+  valueSaturability?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface DeviceCorrectRecordQuery extends PageQuery {
+
+  /**
+   * 设备id
+   */
+  deviceId?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 用户信息(用户名或手机号)
+   */
+  userInfo?: string;
+
+  /**
+   * 设备序列号
+   */
+  serialNum?: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType?: number;
+
+  /**
+   * 溶解氧
+   */
+  valueDissolvedOxygen?: number;
+
+  /**
+   * 水温
+   */
+  valueTemperature?: number;
+
+  /**
+   * 饱和度
+   */
+  valueSaturability?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/fishery/deviceErrorCode/index.ts b/src/api/fishery/deviceErrorCode/index.ts
new file mode 100644
index 0000000..6844f45
--- /dev/null
+++ b/src/api/fishery/deviceErrorCode/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceErrorCodeVO, DeviceErrorCodeForm, DeviceErrorCodeQuery } from '@/api/fishery/deviceErrorCode/types';
+
+/**
+ * 查询设备故障码列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDeviceErrorCode = (query?: DeviceErrorCodeQuery): AxiosPromise<DeviceErrorCodeVO[]> => {
+  return request({
+    url: '/fishery/deviceErrorCode/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备故障码详细
+ * @param id
+ */
+export const getDeviceErrorCode = (id: string | number): AxiosPromise<DeviceErrorCodeVO> => {
+  return request({
+    url: '/fishery/deviceErrorCode/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备故障码
+ * @param data
+ */
+export const addDeviceErrorCode = (data: DeviceErrorCodeForm) => {
+  return request({
+    url: '/fishery/deviceErrorCode',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备故障码
+ * @param data
+ */
+export const updateDeviceErrorCode = (data: DeviceErrorCodeForm) => {
+  return request({
+    url: '/fishery/deviceErrorCode',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备故障码
+ * @param id
+ */
+export const delDeviceErrorCode = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/deviceErrorCode/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/deviceErrorCode/types.ts b/src/api/fishery/deviceErrorCode/types.ts
new file mode 100644
index 0000000..cffee5c
--- /dev/null
+++ b/src/api/fishery/deviceErrorCode/types.ts
@@ -0,0 +1,78 @@
+export interface DeviceErrorCodeVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 设备id
+   */
+  deviceId: string | number;
+
+  /**
+   * 开关序号
+   */
+  switchIndex: number;
+
+  /**
+   * 故障码
+   */
+  errorCode: number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface DeviceErrorCodeForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 设备id
+   */
+  deviceId?: string | number;
+
+  /**
+   * 开关序号
+   */
+  switchIndex?: number;
+
+  /**
+   * 故障码
+   */
+  errorCode?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface DeviceErrorCodeQuery extends PageQuery {
+
+  /**
+   * 设备id
+   */
+  deviceId?: string | number;
+
+  /**
+   * 开关序号
+   */
+  switchIndex?: number;
+
+  /**
+   * 故障码
+   */
+  errorCode?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/fishery/deviceSwitch/index.ts b/src/api/fishery/deviceSwitch/index.ts
new file mode 100644
index 0000000..02185c8
--- /dev/null
+++ b/src/api/fishery/deviceSwitch/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { DeviceSwitchVO, DeviceSwitchForm, DeviceSwitchQuery } from '@/api/fishery/deviceSwitch/types';
+
+/**
+ * 查询测控一体机开关列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listDeviceSwitch = (query?: DeviceSwitchQuery): AxiosPromise<DeviceSwitchVO[]> => {
+  return request({
+    url: '/fishery/deviceSwitch/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询测控一体机开关详细
+ * @param id
+ */
+export const getDeviceSwitch = (id: string | number): AxiosPromise<DeviceSwitchVO> => {
+  return request({
+    url: '/fishery/deviceSwitch/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增测控一体机开关
+ * @param data
+ */
+export const addDeviceSwitch = (data: DeviceSwitchForm) => {
+  return request({
+    url: '/fishery/deviceSwitch',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改测控一体机开关
+ * @param data
+ */
+export const updateDeviceSwitch = (data: DeviceSwitchForm) => {
+  return request({
+    url: '/fishery/deviceSwitch',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除测控一体机开关
+ * @param id
+ */
+export const delDeviceSwitch = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/deviceSwitch/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/deviceSwitch/types.ts b/src/api/fishery/deviceSwitch/types.ts
new file mode 100644
index 0000000..95d3635
--- /dev/null
+++ b/src/api/fishery/deviceSwitch/types.ts
@@ -0,0 +1,183 @@
+export interface DeviceSwitchVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 设备id
+   */
+  deviceId: string | number;
+
+  /**
+   * 序号
+   */
+  index: number;
+
+  /**
+   * 名称
+   */
+  switchName: string;
+
+  /**
+   * 当前测定电流
+   */
+  detectElectricValue: number;
+
+  /**
+   * 当前测定电压
+   */
+  detectVoltageValue: number;
+
+  /**
+   * 接线方式
+   */
+  connectVoltageType: number;
+
+  /**
+   * 塘口id
+   */
+  pondId: string | number;
+
+  /**
+   * 额定电流设置
+   */
+  rateElectricValue: number;
+
+  /**
+   * 当前开关状态
+   */
+  isOpen: number;
+
+  /**
+   * 电流告警开关
+   */
+  electricWarnOpen: number;
+
+  /**
+   * 上次操作开关时间
+   */
+  lastTurnTime: string;
+
+}
+
+export interface DeviceSwitchForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 设备id
+   */
+  deviceId?: string | number;
+
+  /**
+   * 序号
+   */
+  index?: number;
+
+  /**
+   * 名称
+   */
+  switchName?: string;
+
+  /**
+   * 当前测定电流
+   */
+  detectElectricValue?: number;
+
+  /**
+   * 当前测定电压
+   */
+  detectVoltageValue?: number;
+
+  /**
+   * 接线方式
+   */
+  connectVoltageType?: number;
+
+  /**
+   * 塘口id
+   */
+  pondId?: string | number;
+
+  /**
+   * 额定电流设置
+   */
+  rateElectricValue?: number;
+
+  /**
+   * 当前开关状态
+   */
+  isOpen?: number;
+
+  /**
+   * 联动控制id
+   */
+  linkedCtrlId?: string | number;
+
+  /**
+   * 电流告警开关
+   */
+  electricWarnOpen?: number;
+
+  /**
+   * 上次操作开关时间
+   */
+  lastTurnTime?: string;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface DeviceSwitchQuery extends PageQuery {
+
+  /**
+   * 设备id
+   */
+  deviceId?: string | number;
+
+  /**
+   * 序号
+   */
+  index?: number;
+
+  /**
+   * 名称
+   */
+  switchName?: string;
+
+  /**
+   * 接线方式
+   */
+  connectVoltageType?: number;
+
+  /**
+   * 塘口id
+   */
+  pondId?: string | number;
+
+  /**
+   * 当前开关状态
+   */
+  isOpen?: number;
+
+  /**
+   * 联动控制id
+   */
+  linkedCtrlId?: string | number;
+
+  /**
+   * 上次操作开关时间
+   */
+  lastTurnTime?: string;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/fishery/payDevice/index.ts b/src/api/fishery/payDevice/index.ts
new file mode 100644
index 0000000..adbed7b
--- /dev/null
+++ b/src/api/fishery/payDevice/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { PayDeviceVO, PayDeviceForm, PayDeviceQuery } from '@/api/fishery/payDevice/types';
+
+/**
+ * 查询设备充值记录列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listPayDevice = (query?: PayDeviceQuery): AxiosPromise<PayDeviceVO[]> => {
+  return request({
+    url: '/fishery/payDevice/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询设备充值记录详细
+ * @param id
+ */
+export const getPayDevice = (id: string | number): AxiosPromise<PayDeviceVO> => {
+  return request({
+    url: '/fishery/payDevice/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增设备充值记录
+ * @param data
+ */
+export const addPayDevice = (data: PayDeviceForm) => {
+  return request({
+    url: '/fishery/payDevice',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改设备充值记录
+ * @param data
+ */
+export const updatePayDevice = (data: PayDeviceForm) => {
+  return request({
+    url: '/fishery/payDevice',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除设备充值记录
+ * @param id
+ */
+export const delPayDevice = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/payDevice/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/payDevice/types.ts b/src/api/fishery/payDevice/types.ts
new file mode 100644
index 0000000..644ff67
--- /dev/null
+++ b/src/api/fishery/payDevice/types.ts
@@ -0,0 +1,148 @@
+export interface PayDeviceVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 用户Id
+   */
+  userId: string | number;
+
+  /**
+   * 用户名
+   */
+  userName?: string;
+
+  /**
+   * 手机号
+   */
+  mobilePhone?: string;
+
+  /**
+   * 设备编号
+   */
+  serialNum: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType: number;
+
+  /**
+   * 续费时长（月）
+   */
+  addMonth: number;
+
+  /**
+   * 最新到期时间
+   */
+  deadTime: string;
+
+  /**
+   * 续费金额（分）
+   */
+  payAmount: number;
+
+  /**
+   * 订单id
+   */
+  orderId?: string | number;
+
+  /**
+   * 续费方式
+   */
+  payType: number;
+
+  /**
+   * 分润状态
+   */
+  profitStatus: number;
+
+}
+
+export interface PayDeviceForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 用户Id
+   */
+  userId?: string | number;
+
+  /**
+   * 设备编号
+   */
+  serialNum?: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType?: number;
+
+  /**
+   * 续费时长（月）
+   */
+  addMonth?: number;
+
+  /**
+   * 最新到期时间
+   */
+  deadTime?: string;
+
+  /**
+   * 续费金额（分）
+   */
+  payAmount?: number;
+
+  /**
+   * 续费方式
+   */
+  payType?: number;
+
+  /**
+   * 分润状态
+   */
+  profitStatus?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface PayDeviceQuery extends PageQuery {
+
+  /**
+   * 用户Id
+   */
+  userId?: string | number;
+
+  /**
+   * 设备编号
+   */
+  serialNum?: string;
+
+  /**
+   * 设备类型
+   */
+  deviceType?: number;
+
+  /**
+   * 续费方式
+   */
+  payType?: number;
+
+  /**
+   * 分润状态
+   */
+  profitStatus?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/fishery/payOrder/index.ts b/src/api/fishery/payOrder/index.ts
new file mode 100644
index 0000000..27fdb9a
--- /dev/null
+++ b/src/api/fishery/payOrder/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { PayOrderVO, PayOrderForm, PayOrderQuery } from '@/api/fishery/payOrder/types';
+
+/**
+ * 查询充值订单列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listPayOrder = (query?: PayOrderQuery): AxiosPromise<PayOrderVO[]> => {
+  return request({
+    url: '/fishery/payOrder/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询充值订单详细
+ * @param id
+ */
+export const getPayOrder = (id: string | number): AxiosPromise<PayOrderVO> => {
+  return request({
+    url: '/fishery/payOrder/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增充值订单
+ * @param data
+ */
+export const addPayOrder = (data: PayOrderForm) => {
+  return request({
+    url: '/fishery/payOrder',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改充值订单
+ * @param data
+ */
+export const updatePayOrder = (data: PayOrderForm) => {
+  return request({
+    url: '/fishery/payOrder',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除充值订单
+ * @param id
+ */
+export const delPayOrder = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/payOrder/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/payOrder/types.ts b/src/api/fishery/payOrder/types.ts
new file mode 100644
index 0000000..d3362e3
--- /dev/null
+++ b/src/api/fishery/payOrder/types.ts
@@ -0,0 +1,223 @@
+export interface PayOrderVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 用户id
+   */
+  userId: string | number;
+
+  /**
+   * 用户名
+   */
+  userName?: string;
+
+  /**
+   * 手机号
+   */
+  mobilePhone?: string;
+
+  /**
+   * 充值总金额（分）
+   */
+  totalAmount: number;
+
+  /**
+   * 有效期增加月数
+   */
+  addMonth: number;
+
+  /**
+   * 设备数量
+   */
+  deviceCount: number;
+
+  /**
+   * 用户支付金额（分）
+   */
+  payerTotal: number;
+
+  /**
+   * 支付完成时间
+   */
+  successTime: string;
+
+  /**
+   * 订单状态
+   */
+  orderStatus: number;
+
+  /**
+   * 分润状态
+   */
+  profitStatus: number;
+
+}
+
+export interface PayOrderForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 用户id
+   */
+  userId?: string | number;
+
+  /**
+   * 充值总金额（分）
+   */
+  totalAmount?: number;
+
+  /**
+   * 有效期增加月数
+   */
+  addMonth?: number;
+
+  /**
+   * 附加数据
+   */
+  attachment?: string;
+
+  /**
+   * 付款银行类型
+   */
+  bankType?: string;
+
+  /**
+   * 币种
+   */
+  currency?: string;
+
+  /**
+   * 订单描述
+   */
+  description?: string;
+
+  /**
+   * 设备数量
+   */
+  deviceCount?: number;
+
+  /**
+   * 支付的设备编号，json格式
+   */
+  isonDeviceSerialNum?: string;
+
+  /**
+   * 支付回调通知URL
+   */
+  notifyUrl?: string;
+
+  /**
+   * 商户系统内部订单号
+   */
+  outTradeNumber?: string;
+
+  /**
+   * 用户支付币种
+   */
+  payerCurrency?: string;
+
+  /**
+   * 用户支付金额（分）
+   */
+  payerTotal?: number;
+
+  /**
+   * 微信预交易订单号
+   */
+  prepayId?: string | number;
+
+  /**
+   * 支付完成时间
+   */
+  successTime?: string;
+
+  /**
+   * 交易状态
+   */
+  tradeState?: string;
+
+  /**
+   * 交易状态描述
+   */
+  tradeStateDescription?: string;
+
+  /**
+   * 交易类型
+   */
+  tradeType?: string;
+
+  /**
+   * 微信支付订单号
+   */
+  transactionId?: string | number;
+
+  /**
+   * 用户开放id
+   */
+  wxOpenId?: string | number;
+
+  /**
+   * 订单状态
+   */
+  orderStatus?: number;
+
+  /**
+   * 分润状态
+   */
+  profitStatus?: number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface PayOrderQuery extends PageQuery {
+
+  /**
+   * 付款银行类型
+   */
+  bankType?: string;
+
+  /**
+   * 支付完成时间
+   */
+  successTime?: string;
+
+  /**
+   * 交易状态
+   */
+  tradeState?: string;
+
+  /**
+   * 交易类型
+   */
+  tradeType?: string;
+
+  /**
+   * 微信支付订单号
+   */
+  transactionId?: string | number;
+
+  /**
+   * 订单状态
+   */
+  orderStatus?: number;
+
+  /**
+   * 分润状态
+   */
+  profitStatus?: number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/api/fishery/userRelation/index.ts b/src/api/fishery/userRelation/index.ts
new file mode 100644
index 0000000..25aa68f
--- /dev/null
+++ b/src/api/fishery/userRelation/index.ts
@@ -0,0 +1,63 @@
+import request from '@/utils/request';
+import { AxiosPromise } from 'axios';
+import { UserRelationVO, UserRelationForm, UserRelationQuery } from '@/api/fishery/userRelation/types';
+
+/**
+ * 查询养殖用户子账号列表
+ * @param query
+ * @returns {*}
+ */
+
+export const listUserRelation = (query?: UserRelationQuery): AxiosPromise<UserRelationVO[]> => {
+  return request({
+    url: '/fishery/userRelation/list',
+    method: 'get',
+    params: query
+  });
+};
+
+/**
+ * 查询养殖用户子账号详细
+ * @param id
+ */
+export const getUserRelation = (id: string | number): AxiosPromise<UserRelationVO> => {
+  return request({
+    url: '/fishery/userRelation/' + id,
+    method: 'get'
+  });
+};
+
+/**
+ * 新增养殖用户子账号
+ * @param data
+ */
+export const addUserRelation = (data: UserRelationForm) => {
+  return request({
+    url: '/fishery/userRelation',
+    method: 'post',
+    data: data
+  });
+};
+
+/**
+ * 修改养殖用户子账号
+ * @param data
+ */
+export const updateUserRelation = (data: UserRelationForm) => {
+  return request({
+    url: '/fishery/userRelation',
+    method: 'put',
+    data: data
+  });
+};
+
+/**
+ * 删除养殖用户子账号
+ * @param id
+ */
+export const delUserRelation = (id: string | number | Array<string | number>) => {
+  return request({
+    url: '/fishery/userRelation/' + id,
+    method: 'delete'
+  });
+};
diff --git a/src/api/fishery/userRelation/types.ts b/src/api/fishery/userRelation/types.ts
new file mode 100644
index 0000000..b89f43c
--- /dev/null
+++ b/src/api/fishery/userRelation/types.ts
@@ -0,0 +1,63 @@
+export interface UserRelationVO {
+  /**
+   * 主键id
+   */
+  id: string | number;
+
+  /**
+   * 父级账号id
+   */
+  parentUserId: string | number;
+
+  /**
+   * 子账号id
+   */
+  childUserId: string | number;
+
+  /**
+   * 备注
+   */
+  remark: string;
+
+}
+
+export interface UserRelationForm extends BaseEntity {
+  /**
+   * 主键id
+   */
+  id?: string | number;
+
+  /**
+   * 父级账号id
+   */
+  parentUserId?: string | number;
+
+  /**
+   * 子账号id
+   */
+  childUserId?: string | number;
+
+  /**
+   * 备注
+   */
+  remark?: string;
+
+}
+
+export interface UserRelationQuery extends PageQuery {
+
+  /**
+   * 父级账号id
+   */
+  parentUserId?: string | number;
+
+  /**
+   * 子账号id
+   */
+  childUserId?: string | number;
+
+  /**
+   * 日期范围参数
+   */
+  params?: any;
+}
diff --git a/src/types/components.d.ts b/src/types/components.d.ts
index b2dddfe..137fb4d 100644
--- a/src/types/components.d.ts
+++ b/src/types/components.d.ts
@@ -23,6 +23,8 @@ declare module 'vue' {
     ElColorPicker: typeof import('element-plus/es')['ElColorPicker']
     ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider']
     ElDatePicker: typeof import('element-plus/es')['ElDatePicker']
+    ElDescriptions: typeof import('element-plus/es')['ElDescriptions']
+    ElDescriptionsItem: typeof import('element-plus/es')['ElDescriptionsItem']
     ElDialog: typeof import('element-plus/es')['ElDialog']
     ElDivider: typeof import('element-plus/es')['ElDivider']
     ElDrawer: typeof import('element-plus/es')['ElDrawer']
diff --git a/src/views/fishery/deviceCorrectRecord/index.vue b/src/views/fishery/deviceCorrectRecord/index.vue
new file mode 100644
index 0000000..483bf84
--- /dev/null
+++ b/src/views/fishery/deviceCorrectRecord/index.vue
@@ -0,0 +1,724 @@
+<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="userKeyword">
+              <el-input v-model="queryParams.params.userKeyword" placeholder="请输入用户名或手机号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备编号" prop="serialNum">
+              <el-input v-model="queryParams.serialNum" 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>
+              <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:deviceCorrectRecord:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['fishery:deviceCorrectRecord:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:deviceCorrectRecord:remove']">删除</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:deviceCorrectRecord: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="deviceCorrectRecordList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+        <!-- <el-table-column label="设备id" align="center" prop="deviceId" /> -->
+        <el-table-column label="用户名" align="center" prop="userName" fixed="left" width="120"/>
+        <el-table-column label="手机号" align="center" prop="mobilePhone" fixed="left" width="120"/>
+        <el-table-column label="设备编号" align="center" prop="serialNum" />
+        <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="valueDissolvedOxygen" />
+        <el-table-column label="水温" align="center" prop="valueTemperature" />
+        <el-table-column label="饱和度" align="center" prop="valueSaturability" />
+      <el-table-column label="校准时间" align="center" prop="createTime" />
+        <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:deviceCorrectRecord:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:deviceCorrectRecord: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="deviceCorrectRecordFormRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="设备类型" prop="deviceType">
+          <el-select v-model="form.deviceType" placeholder="请选择设备类型">
+            <el-option
+                v-for="dict in aqu_device_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="设备编号" prop="serialNum">
+          <el-input 
+            :value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''" 
+            placeholder="请选择设备" 
+            readonly 
+            @click="openDeviceSelect"
+            style="cursor: pointer;"
+            :disabled="!form.deviceType"
+          >
+            <template #append>
+              <el-button icon="Search" @click="openDeviceSelect" :disabled="!form.deviceType">选择</el-button>
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="用户" prop="userId">
+          <el-input 
+            :value="selectedUser ? `${selectedUser.userName} (${selectedUser.mobilePhone})` : ''" 
+            placeholder="请选择用户" 
+            readonly 
+            @click="openUserSelect"
+            style="cursor: pointer;"
+          >
+            <template #append>
+              <el-button icon="Search" @click="openUserSelect">选择</el-button>
+            </template>
+          </el-input>
+        </el-form-item>
+        <el-form-item label="溶解氧" prop="valueDissolvedOxygen">
+          <el-input v-model="form.valueDissolvedOxygen" placeholder="请输入溶解氧" />
+        </el-form-item>
+        <el-form-item label="水温" prop="valueTemperature">
+          <el-input v-model="form.valueTemperature" placeholder="请输入水温" />
+        </el-form-item>
+        <el-form-item label="饱和度" prop="valueSaturability">
+          <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-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="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 label="设备类型">
+          <el-select 
+            v-model="deviceQueryParams.deviceType" 
+            placeholder="请选择设备类型" 
+            disabled
+            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>
+          <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="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="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-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 
+            style="width: 180px"
+            @keyup.enter="handleUserQuery"
+          />
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input 
+            v-model="userQueryParams.mobilePhone" 
+            placeholder="请输入手机号" 
+            clearable 
+            style="width: 180px"
+            @keyup.enter="handleUserQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleUserQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetUserQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      
+      <!-- 用户表格 -->
+      <el-table 
+        :data="aquUserList" 
+        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="province" />
+        <el-table-column label="城市" align="center" prop="city" />
+        <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" 
+              @click="handleUserSelect(scope.row)"
+            >
+              选择
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <!-- 分页 -->
+      <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>
+  </div>
+</template>
+
+<script setup name="DeviceCorrectRecord" lang="ts">
+import { listDeviceCorrectRecord, getDeviceCorrectRecord, delDeviceCorrectRecord, addDeviceCorrectRecord, updateDeviceCorrectRecord } from '@/api/fishery/deviceCorrectRecord';
+import { DeviceCorrectRecordVO, DeviceCorrectRecordQuery, DeviceCorrectRecordForm } from '@/api/fishery/deviceCorrectRecord/types';
+import { listAquUser } from '@/api/fishery/aquUser';
+import { AquUserVO } from '@/api/fishery/aquUser/types';
+import { listDevice } from '@/api/fishery/device';
+import { DeviceVO } from '@/api/fishery/device/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { aqu_device_type } = toRefs<any>(proxy?.useDict('aqu_device_type'));
+
+const deviceCorrectRecordList = ref<DeviceCorrectRecordVO[]>([]);
+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 aquUserList = ref<AquUserVO[]>([]);
+const selectedUser = ref<AquUserVO | null>(null);
+const userSelectVisible = ref(false);
+const userQueryParams = reactive<{
+  pageNum: number;
+  pageSize: number;
+  userName?: string;
+  mobilePhone?: string;
+}>({
+  pageNum: 1,
+  pageSize: 10,
+  userName: undefined,
+  mobilePhone: undefined
+});
+const userTotal = ref(0);
+
+// 设备选择相关
+const deviceList = ref<DeviceVO[]>([]);
+const selectedDevice = ref<DeviceVO | null>(null);
+const deviceSelectVisible = ref(false);
+const deviceQueryParams = reactive<{
+  pageNum: number;
+  pageSize: number;
+  userId?: string | number;
+  serialNum?: string;
+  deviceName?: string;
+  deviceType?: number;
+  params: {
+    userKeyword?: string;
+  };
+}>({
+  pageNum: 1,
+  pageSize: 10,
+  userId: undefined,
+  serialNum: undefined,
+  deviceName: undefined,
+  deviceType: undefined,
+  params: {
+    userKeyword: undefined
+  }
+});
+const deviceTotal = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const deviceCorrectRecordFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DeviceCorrectRecordForm = {
+  id: undefined,
+  deviceId: undefined,
+  userId: undefined,
+  serialNum: undefined,
+  deviceType: undefined,
+  valueDissolvedOxygen: undefined,
+  valueTemperature: undefined,
+  valueSaturability: undefined,
+  remark: undefined
+}
+const data = reactive<PageData<DeviceCorrectRecordForm, DeviceCorrectRecordQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceId: undefined,
+    userId: undefined,
+    serialNum: undefined,
+    deviceType: undefined,
+    valueDissolvedOxygen: undefined,
+    valueTemperature: undefined,
+    valueSaturability: undefined,
+    params: {
+      userKeyword: undefined
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键id不能为空", trigger: "blur" }
+    ],
+    userId: [
+      { required: true, message: "用户不能为空", trigger: "change" }
+    ],
+    serialNum: [
+      { required: true, message: "设备编号不能为空", trigger: "blur" }
+    ],
+    deviceType: [
+      { required: true, message: "设备类型不能为空", trigger: "change" }
+    ],
+    valueDissolvedOxygen: [
+      { required: true, message: "溶解氧不能为空", trigger: "blur" }
+    ],
+    valueTemperature: [
+      { required: true, message: "水温不能为空", trigger: "blur" }
+    ],
+    valueSaturability: [
+      { required: true, message: "饱和度不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备校准记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDeviceCorrectRecord(queryParams.value);
+  deviceCorrectRecordList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  selectedUser.value = null;
+  selectedDevice.value = null;
+  deviceCorrectRecordFormRef.value?.resetFields();
+}
+
+/** 获取用户列表 */
+const getAquUserList = async () => {
+  const res = await listAquUser(userQueryParams);
+  aquUserList.value = res.rows || res.data || [];
+  userTotal.value = res.total || 0;
+};
+
+/** 打开用户选择对话框 */
+const openUserSelect = () => {
+  userQueryParams.pageNum = 1;
+  userQueryParams.userName = undefined;
+  userQueryParams.mobilePhone = undefined;
+  getAquUserList();
+  userSelectVisible.value = true;
+};
+
+/** 搜索用户 */
+const handleUserQuery = () => {
+  userQueryParams.pageNum = 1;
+  getAquUserList();
+};
+
+/** 重置用户搜索 */
+const resetUserQuery = () => {
+  userQueryParams.pageNum = 1;
+  userQueryParams.userName = undefined;
+  userQueryParams.mobilePhone = undefined;
+  getAquUserList();
+};
+
+/** 用户分页改变 */
+const handleUserPaginationChange = () => {
+  getAquUserList();
+};
+
+/** 选择用户 */
+const handleUserSelect = (user: AquUserVO) => {
+  selectedUser.value = user;
+  form.value.userId = user.id;
+  userSelectVisible.value = false;
+};
+
+/** 取消选择用户 */
+const cancelUserSelect = () => {
+  userSelectVisible.value = false;
+};
+
+/** 获取设备列表 */
+const getDeviceList = async () => {
+  const res = await listDevice(deviceQueryParams);
+  deviceList.value = res.rows || res.data || [];
+  deviceTotal.value = res.total || 0;
+};
+
+/** 打开设备选择对话框 */
+const openDeviceSelect = () => {
+  if (!form.value.deviceType) {
+    proxy?.$modal.msgWarning('请先选择设备类型');
+    return;
+  }
+  deviceQueryParams.pageNum = 1;
+  deviceQueryParams.userId = form.value.userId;
+  deviceQueryParams.deviceType = form.value.deviceType;
+  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.userId = form.value.userId;
+  deviceQueryParams.deviceType = form.value.deviceType;
+  deviceQueryParams.serialNum = undefined;
+  deviceQueryParams.deviceName = undefined;
+  deviceQueryParams.params.userKeyword = undefined;
+  getDeviceList();
+};
+
+/** 设备分页改变 */
+const handleDevicePaginationChange = () => {
+  getDeviceList();
+};
+
+/** 选择设备 */
+const handleDeviceSelect = (device: DeviceVO) => {
+  selectedDevice.value = device;
+  form.value.serialNum = device.serialNum;
+  form.value.deviceId = device.id;
+  if (!form.value.userId && device.userId) {
+    form.value.userId = device.userId;
+    listAquUser({
+      pageNum: 1,
+      pageSize: 1000
+    }).then(res => {
+      const userList = res.rows || res.data || [];
+      const user = userList.find(u => u.id.toString() === device.userId.toString());
+      if (user) {
+        selectedUser.value = user;
+      }
+    }).catch(error => {
+      // ignore
+    });
+  }
+  deviceSelectVisible.value = false;
+};
+
+/** 取消选择设备 */
+const cancelDeviceSelect = () => {
+  deviceSelectVisible.value = false;
+};
+
+// 监听设备类型变化，清空设备和用户选择
+watch(() => form.value.deviceType, (newType, oldType) => {
+  if (newType !== oldType && oldType !== undefined) {
+    selectedDevice.value = null;
+    form.value.serialNum = undefined;
+    form.value.deviceId = undefined;
+    selectedUser.value = null;
+    form.value.userId = undefined;
+  }
+});
+
+// 监听用户变化，清空设备选择
+watch(() => form.value.userId, (newUserId, oldUserId) => {
+  if (newUserId !== oldUserId && oldUserId !== undefined) {
+    if (selectedDevice.value && selectedDevice.value.userId.toString() !== newUserId?.toString()) {
+      selectedDevice.value = null;
+      form.value.serialNum = undefined;
+      form.value.deviceId = undefined;
+    }
+  }
+});
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceCorrectRecordVO[]) => {
+  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?: DeviceCorrectRecordVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDeviceCorrectRecord(_id);
+  Object.assign(form.value, res.data);
+  
+  // 回显用户信息
+  if (form.value.userId) {
+    try {
+      const userRes = await listAquUser({
+        pageNum: 1,
+        pageSize: 1000
+      });
+      const userList = userRes.rows || userRes.data || [];
+      const user = userList.find(u => u.id.toString() === form.value.userId.toString());
+      if (user) {
+        selectedUser.value = user;
+      } else {
+        selectedUser.value = null;
+      }
+    } catch (error) {
+      selectedUser.value = null;
+    }
+  } else {
+    selectedUser.value = null;
+  }
+  
+  // 回显设备信息
+  if (form.value.serialNum) {
+    try {
+      const deviceRes = await listDevice({
+        pageNum: 1,
+        pageSize: 1000,
+        userId: form.value.userId,
+        serialNum: form.value.serialNum
+      });
+      const deviceListData = deviceRes.rows || deviceRes.data || [];
+      const device = deviceListData.find(d => d.serialNum === form.value.serialNum);
+      if (device) {
+        selectedDevice.value = device;
+      } else {
+        selectedDevice.value = null;
+      }
+    } catch (error) {
+      selectedDevice.value = null;
+    }
+  } else {
+    selectedDevice.value = null;
+  }
+  
+  dialog.visible = true;
+  dialog.title = "修改设备校准记录";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceCorrectRecordFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDeviceCorrectRecord(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDeviceCorrectRecord(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceCorrectRecordVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备校准记录编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delDeviceCorrectRecord(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/deviceCorrectRecord/export', {
+    ...queryParams.value
+  }, `deviceCorrectRecord_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/deviceErrorCode/index.vue b/src/views/fishery/deviceErrorCode/index.vue
new file mode 100644
index 0000000..8ee0aa5
--- /dev/null
+++ b/src/views/fishery/deviceErrorCode/index.vue
@@ -0,0 +1,516 @@
+<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="90px">
+            <el-form-item label="用户信息" prop="userKeyword">
+              <el-input v-model="queryParams.params.userKeyword" placeholder="请输入用户名或手机号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="设备编号" prop="deviceKeyword">
+              <el-input v-model="queryParams.params.deviceKeyword" placeholder="请输入设备编号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="开关序号" prop="switchIndex">
+              <el-input v-model="queryParams.switchIndex" placeholder="请输入开关序号" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="故障码" prop="errorCode">
+              <el-input v-model="queryParams.errorCode" placeholder="请输入故障码" 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:deviceErrorCode:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['fishery:deviceErrorCode:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:deviceErrorCode:remove']">删除</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:deviceErrorCode: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="deviceErrorCodeList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+         <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="switchIndex" />
+         <el-table-column label="开关名称" align="center" prop="switchName" />
+        <el-table-column label="故障码" align="center" prop="errorCode" />
+        <el-table-column label="故障时间" align="center" prop="createTime" width="180"></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="handleUpdate(scope.row)" v-hasPermi="['fishery:deviceErrorCode:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:deviceErrorCode: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="deviceErrorCodeFormRef" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="设备" prop="deviceId">
+          <el-input 
+            :value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''" 
+            placeholder="请选择设备" 
+            readonly 
+            @click="openDeviceSelect"
+            style="cursor: pointer;"
+          >
+            <template #append>
+              <el-button icon="Search" @click="openDeviceSelect">选择</el-button>
+            </template>
+          </el-input>
+        </el-form-item>
+        <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}`" 
+              :value="switchItem.index"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="故障码" prop="errorCode">
+          <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-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="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 label="设备类型">
+          <el-select 
+            v-model="deviceQueryParams.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>
+          <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="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="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>
+  </div>
+</template>
+
+<script setup name="DeviceErrorCode" lang="ts">
+import { listDeviceErrorCode, getDeviceErrorCode, delDeviceErrorCode, addDeviceErrorCode, updateDeviceErrorCode } from '@/api/fishery/deviceErrorCode';
+import { DeviceErrorCodeVO, DeviceErrorCodeQuery, DeviceErrorCodeForm } from '@/api/fishery/deviceErrorCode/types';
+import { listDevice } from '@/api/fishery/device';
+import { DeviceVO } from '@/api/fishery/device/types';
+import { listDeviceSwitch } from '@/api/fishery/deviceSwitch';
+import { DeviceSwitchVO } from '@/api/fishery/deviceSwitch/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { aqu_device_type } = toRefs<any>(proxy?.useDict('aqu_device_type'));
+
+const deviceErrorCodeList = ref<DeviceErrorCodeVO[]>([]);
+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 deviceList = ref<DeviceVO[]>([]);
+const selectedDevice = ref<DeviceVO | null>(null);
+const deviceSelectVisible = ref(false);
+const deviceQueryParams = reactive<{
+  pageNum: number;
+  pageSize: number;
+  serialNum?: string;
+  deviceName?: string;
+  deviceType?: number;
+  params: {
+    userKeyword?: string;
+  };
+}>({
+  pageNum: 1,
+  pageSize: 10,
+  serialNum: undefined,
+  deviceName: undefined,
+  deviceType: undefined,
+  params: {
+    userKeyword: undefined
+  }
+});
+const deviceTotal = ref(0);
+
+// 设备开关列表
+const deviceSwitchList = ref<DeviceSwitchVO[]>([]);
+
+const queryFormRef = ref<ElFormInstance>();
+const deviceErrorCodeFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DeviceErrorCodeForm = {
+  id: undefined,
+  deviceId: undefined,
+  switchIndex: undefined,
+  errorCode: undefined,
+  remark: undefined
+}
+const data = reactive<PageData<DeviceErrorCodeForm, DeviceErrorCodeQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceId: undefined,
+    switchIndex: undefined,
+    errorCode: undefined,
+    params: {
+      userKeyword: undefined,
+      deviceKeyword: undefined
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键id不能为空", trigger: "blur" }
+    ],
+    deviceId: [
+      { required: true, message: "设备id不能为空", trigger: "blur" }
+    ],
+    switchIndex: [
+      { required: true, message: "开关序号不能为空", trigger: "blur" }
+    ],
+    errorCode: [
+      { required: true, message: "故障码不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备故障码列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDeviceErrorCode(queryParams.value);
+  deviceErrorCodeList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  selectedDevice.value = null;
+  deviceSwitchList.value = [];
+  deviceErrorCodeFormRef.value?.resetFields();
+}
+
+/** 获取设备列表 */
+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.deviceType = 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.deviceType = undefined;
+  deviceQueryParams.params.userKeyword = undefined;
+  getDeviceList();
+};
+
+/** 设备分页改变 */
+const handleDevicePaginationChange = () => {
+  getDeviceList();
+};
+
+/** 选择设备 */
+const handleDeviceSelect = async (device: DeviceVO) => {
+  selectedDevice.value = device;
+  form.value.deviceId = device.id;
+  // 清空开关序号
+  form.value.switchIndex = undefined;
+  // 获取该设备的开关列表
+  await loadDeviceSwitchList(device.id);
+  deviceSelectVisible.value = false;
+};
+
+/** 加载设备开关列表 */
+const loadDeviceSwitchList = async (deviceId: string | number) => {
+  try {
+    const res = await listDeviceSwitch({
+      pageNum: 1,
+      pageSize: 1000,
+      deviceId: deviceId
+    });
+    deviceSwitchList.value = res.rows || res.data || [];
+  } catch (error) {
+    deviceSwitchList.value = [];
+  }
+};
+
+/** 取消选择设备 */
+const cancelDeviceSelect = () => {
+  deviceSelectVisible.value = false;
+};
+
+// 监听设备变化，清空开关序号
+watch(() => form.value.deviceId, (newDeviceId, oldDeviceId) => {
+  if (newDeviceId !== oldDeviceId && oldDeviceId !== undefined) {
+    form.value.switchIndex = undefined;
+    deviceSwitchList.value = [];
+  }
+});
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceErrorCodeVO[]) => {
+  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?: DeviceErrorCodeVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDeviceErrorCode(_id);
+  Object.assign(form.value, res.data);
+  
+  // 回显设备信息
+  if (form.value.deviceId) {
+    try {
+      const deviceRes = await listDevice({
+        pageNum: 1,
+        pageSize: 1000
+      });
+      const deviceListData = deviceRes.rows || deviceRes.data || [];
+      const device = deviceListData.find(d => d.id.toString() === form.value.deviceId.toString());
+      if (device) {
+        selectedDevice.value = device;
+        // 加载设备开关列表
+        await loadDeviceSwitchList(device.id);
+      } else {
+        selectedDevice.value = null;
+        deviceSwitchList.value = [];
+      }
+    } catch (error) {
+      selectedDevice.value = null;
+      deviceSwitchList.value = [];
+    }
+  } else {
+    selectedDevice.value = null;
+    deviceSwitchList.value = [];
+  }
+  
+  dialog.visible = true;
+  dialog.title = "修改设备故障码";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceErrorCodeFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDeviceErrorCode(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDeviceErrorCode(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceErrorCodeVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备故障码编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delDeviceErrorCode(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/deviceErrorCode/export', {
+    ...queryParams.value
+  }, `deviceErrorCode_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/deviceSwitch/index.vue b/src/views/fishery/deviceSwitch/index.vue
new file mode 100644
index 0000000..4e0ee43
--- /dev/null
+++ b/src/views/fishery/deviceSwitch/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" label-width="100px">
+            <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="switchName">
+              <el-input v-model="queryParams.switchName" placeholder="请输入开关名称" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <!-- <el-form-item label="塘口id" prop="pondId">
+              <el-input v-model="queryParams.pondId" 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:deviceSwitch:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['fishery:deviceSwitch:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:deviceSwitch:remove']">删除</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:deviceSwitch: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="deviceSwitchList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" />
+         <el-table-column label="塘口名称" align="center" prop="pondName" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" />
+        <el-table-column label="设备编号" align="center" prop="serialNum"  width="150"/>
+                <el-table-column label="开关序号" align="center" prop="index" width="100"/>
+          <el-table-column label="开关名称" align="center" prop="switchName" />
+
+         <el-table-column label="开关状态" align="center" prop="isOpen">
+          <template #default="scope">
+            <dict-tag :options="open_close" :value="scope.row.isOpen"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="当前测定电流" align="center" prop="detectElectricValue" />
+        <el-table-column label="当前测定电压" align="center" prop="detectVoltageValue" />
+        <el-table-column label="接线方式" align="center" prop="connectVoltageType">
+          <template #default="scope">
+            <dict-tag :options="connect_voltage_type" :value="scope.row.connectVoltageType"/>
+          </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"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="联动状态" align="center" prop="isLinkedCtrl">
+          <template #default="scope">
+            <dict-tag :options="is_linked_ctrl" :value="scope.row.isLinkedCtrl"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="上次操作开关时间" align="center" prop="lastTurnTime" width="180">
+        </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="handleUpdate(scope.row)" v-hasPermi="['fishery:deviceSwitch:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:deviceSwitch: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="deviceSwitchFormRef" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="设备" prop="deviceId">
+          <el-input 
+            :value="selectedDevice ? `${selectedDevice.deviceName} (${selectedDevice.serialNum})` : ''" 
+            placeholder="请选择设备" 
+            readonly 
+            @click="openDeviceSelect"
+            style="cursor: pointer;"
+          >
+            <template #append>
+              <el-button icon="Search" @click="openDeviceSelect">选择</el-button>
+            </template>
+          </el-input>
+        </el-form-item>
+                <el-form-item label="开关序号" prop="index">
+          <el-input v-model="form.index" placeholder="请输入开关序号" />
+        </el-form-item>
+        <el-form-item label="开关名称" prop="switchName">
+          <el-input v-model="form.switchName" placeholder="请输入名称" />
+        </el-form-item>
+
+        <el-form-item label="接线方式" prop="connectVoltageType">
+          <el-select v-model="form.connectVoltageType" placeholder="请选择接线方式" clearable style="width: 100%">
+            <el-option
+              v-for="dict in connect_voltage_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="塘口" prop="pondId">
+          <el-input 
+            :value="selectedPondName" 
+            placeholder="请选择设备（塘口将自动关联）" 
+            readonly 
+            disabled
+          />
+        </el-form-item>
+        <el-form-item label="额定电流设置" prop="rateElectricValue">
+          <el-input v-model="form.rateElectricValue" placeholder="请输入额定电流设置" />
+        </el-form-item>
+        <el-form-item label="电流告警开关" prop="electricWarnOpen">
+          <el-select v-model="form.electricWarnOpen" placeholder="请选择电流告警开关" clearable style="width: 100%">
+            <el-option
+              v-for="dict in open_close"
+              :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>
+    
+    <!-- 设备选择对话框 -->
+    <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.deviceKeyword" 
+            placeholder="请输入设备名称或设备编号" 
+            clearable 
+            style="width: 200px"
+            @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="serialNum" width="150" />
+        <el-table-column label="设备名称" align="center" prop="deviceName" width="120" />
+        <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="pondName" 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="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" width="100" fixed="right">
+          <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>
+  </div>
+</template>
+
+<script setup name="DeviceSwitch" lang="ts">
+import { listDeviceSwitch, getDeviceSwitch, delDeviceSwitch, addDeviceSwitch, updateDeviceSwitch } from '@/api/fishery/deviceSwitch';
+import { DeviceSwitchVO, DeviceSwitchQuery, DeviceSwitchForm } from '@/api/fishery/deviceSwitch/types';
+import { listDevice } from '@/api/fishery/device';
+import { DeviceVO } from '@/api/fishery/device/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { aqu_device_type, open_close, connect_voltage_type, is_linked_ctrl } = toRefs<any>(proxy?.useDict('aqu_device_type', 'open_close', 'connect_voltage_type', 'is_linked_ctrl'));
+
+const deviceSwitchList = ref<DeviceSwitchVO[]>([]);
+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 deviceList = ref<DeviceVO[]>([]);
+const selectedDevice = ref<DeviceVO | null>(null);
+const selectedPondName = ref<string>(''); // 保存选中设备的塘口名称
+const deviceSelectVisible = ref(false);
+const deviceQueryParams = reactive<{
+  pageNum: number;
+  pageSize: number;
+  deviceType?: number;
+  params: {
+    deviceKeyword?: string;
+  };
+}>({
+  pageNum: 1,
+  pageSize: 10,
+  deviceType: 2, // 默认查询测控一体机（假设值为2）
+  params: {
+    deviceKeyword: undefined
+  }
+});
+const deviceTotal = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+const deviceSwitchFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: DeviceSwitchForm = {
+  id: undefined,
+  deviceId: undefined,
+  index: undefined,
+  switchName: undefined,
+  detectElectricValue: undefined,
+  detectVoltageValue: undefined,
+  connectVoltageType: undefined,
+  pondId: undefined,
+  rateElectricValue: undefined,
+  isOpen: undefined,
+  linkedCtrlId: undefined,
+  electricWarnOpen: undefined,
+  lastTurnTime: undefined,
+  remark: undefined
+}
+const data = reactive<PageData<DeviceSwitchForm, DeviceSwitchQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    deviceId: undefined,
+    index: undefined,
+    switchName: undefined,
+    connectVoltageType: undefined,
+    pondId: undefined,
+    isOpen: undefined,
+    linkedCtrlId: undefined,
+    lastTurnTime: undefined,
+    params: {
+      deviceKeyword: undefined
+    }
+  },
+  rules: {
+    deviceId: [
+      { required: true, message: "设备名称不能为空", trigger: "blur" }
+    ],
+    index: [
+      { required: true, message: "开关序号不能为空", trigger: "blur" }
+    ],
+    switchName: [
+      { required: true, message: "名称不能为空", trigger: "blur" }
+    ],
+    connectVoltageType: [
+      { required: true, message: "接线方式不能为空", trigger: "change" }
+    ],
+    rateElectricValue: [
+      { required: true, message: "额定电流设置不能为空", trigger: "blur" }
+    ],
+    electricWarnOpen: [
+      { required: true, message: "电流告警开关不能为空", trigger: "blur" }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询测控一体机开关列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listDeviceSwitch(queryParams.value);
+  deviceSwitchList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  selectedDevice.value = null; // 清空设备选择
+  selectedPondName.value = ''; // 清空塘口名称
+  deviceSwitchFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: DeviceSwitchVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  selectedDevice.value = null; // 清空设备选择
+  selectedPondName.value = ''; // 清空塘口名称
+  dialog.visible = true;
+  dialog.title = "添加测控一体机开关";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: DeviceSwitchVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getDeviceSwitch(_id);
+  Object.assign(form.value, res.data);
+  
+  // 回显设备信息
+  if (form.value.deviceId) {
+    try {
+      // 加载设备列表以获取设备信息
+      const deviceRes = await listDevice({
+        pageNum: 1,
+        pageSize: 1000,
+        deviceType: 2 // 测控一体机类型
+      });
+      const deviceListData = deviceRes.rows || deviceRes.data || [];
+      const device = deviceListData.find(d => d.id.toString() === form.value.deviceId.toString());
+      if (device) {
+        selectedDevice.value = device;
+        // 回显塘口名称
+        selectedPondName.value = (device as any).pondName || '';
+      } else {
+        console.warn('未找到设备ID:', form.value.deviceId);
+        selectedDevice.value = null;
+        selectedPondName.value = '';
+      }
+    } catch (error) {
+      console.error('加载设备信息失败:', error);
+      selectedDevice.value = null;
+      selectedPondName.value = '';
+    }
+  } else {
+    selectedDevice.value = null;
+    selectedPondName.value = '';
+  }
+  
+  dialog.visible = true;
+  dialog.title = "修改测控一体机开关";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  deviceSwitchFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateDeviceSwitch(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addDeviceSwitch(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: DeviceSwitchVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除测控一体机开关编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delDeviceSwitch(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/deviceSwitch/export', {
+    ...queryParams.value
+  }, `deviceSwitch_${new Date().getTime()}.xlsx`)
+}
+
+/** 获取设备列表 */
+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.deviceType = 2; // 测控一体机类型
+  deviceQueryParams.params.deviceKeyword = undefined;
+  getDeviceList();
+  deviceSelectVisible.value = true;
+};
+
+/** 搜索设备 */
+const handleDeviceQuery = () => {
+  deviceQueryParams.pageNum = 1;
+  getDeviceList();
+};
+
+/** 重置设备搜索 */
+const resetDeviceQuery = () => {
+  deviceQueryParams.pageNum = 1;
+  deviceQueryParams.deviceType = 2; // 测控一体机类型
+  deviceQueryParams.params.deviceKeyword = undefined;
+  getDeviceList();
+};
+
+/** 设备分页改变 */
+const handleDevicePaginationChange = () => {
+  getDeviceList();
+};
+
+/** 选择设备 */
+const handleDeviceSelect = (device: DeviceVO) => {
+  selectedDevice.value = device;
+  form.value.deviceId = device.id;
+  // 同时赋值塘口ID和塘口名称
+  if (device.pondId) {
+    form.value.pondId = device.pondId;
+    // 使用类型断言获取塘口名称（后端返回的数据中包含此字段）
+    selectedPondName.value = (device as any).pondName || ''; // 显示塘口名称
+  } else {
+    form.value.pondId = undefined;
+    selectedPondName.value = '';
+  }
+  deviceSelectVisible.value = false;
+};
+
+/** 取消选择设备 */
+const cancelDeviceSelect = () => {
+  deviceSelectVisible.value = false;
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/payDevice/index.vue b/src/views/fishery/payDevice/index.vue
new file mode 100644
index 0000000..59b3595
--- /dev/null
+++ b/src/views/fishery/payDevice/index.vue
@@ -0,0 +1,831 @@
+<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="serialNum">
+              <el-input v-model="queryParams.serialNum" 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="payType">
+              <el-select v-model="queryParams.payType" placeholder="请选择续费方式" clearable >
+                <el-option v-for="dict in pay_type" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <!-- <el-form-item label="分润状态" prop="profitStatus">
+              <el-select v-model="queryParams.profitStatus" placeholder="请选择分润状态" clearable >
+                <el-option v-for="dict in profit_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:payDevice:add']">设置有效期</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['fishery:payDevice:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:payDevice:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:payDevice: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="payDeviceList" @selection-change="handleSelectionChange">
+        <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="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="addMonth" />
+        <el-table-column label="到期时间" align="center" prop="deadTime" width="180">
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.deadTime, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="续费金额（元）" align="center" prop="payAmountYuan" />
+        <el-table-column label="续费方式" align="center" prop="payType">
+          <template #default="scope">
+            <dict-tag :options="pay_type" :value="scope.row.payType"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="分润状态" align="center" prop="profitStatus">
+          <template #default="scope">
+            <dict-tag :options="profit_status" :value="scope.row.profitStatus"/>
+          </template>
+        </el-table-column>
+         <el-table-column label="创建时间" align="center" prop="createTime"  width="160"/>
+        <el-table-column label="操作" align="center" fixed="right"  class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-tooltip content="查看订单" placement="top" v-if="scope.row.payType === 1">
+              <el-button link type="primary" icon="View" @click="handleViewOrder(scope.row)" v-hasPermi="['fishery:payDevice:query']"></el-button>
+            </el-tooltip>
+            <!-- <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:payDevice: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="payDeviceFormRef" :model="form" :rules="rules" label-width="80px">
+        
+          <el-form-item label="设备类型" prop="deviceType">
+          <el-select v-model="form.deviceType" placeholder="请选择设备类型">
+            <el-option
+                v-for="dict in aqu_device_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+       
+        <el-form-item label="设备编号" prop="serialNum">
+          <el-input 
+            :value="selectedDevice ? `${selectedDevice.serialNum} (${selectedDevice.deviceName})` : ''" 
+            placeholder="请选择设备" 
+            readonly 
+            @click="openDeviceSelect"
+            style="cursor: pointer;"
+            :disabled="!form.deviceType"
+          >
+            <template #append>
+              <el-button icon="Search" @click="openDeviceSelect" :disabled="!form.deviceType">选择</el-button>
+            </template>
+          </el-input>
+        </el-form-item>
+ <el-form-item label="用户" prop="userId">
+          <el-input 
+            :value="selectedUser ? `${selectedUser.userName} (${selectedUser.mobilePhone})` : ''" 
+            placeholder="请选择用户" 
+            readonly 
+            @click="openUserSelect"
+            style="cursor: pointer;"
+          >
+            <template #append>
+              <el-button icon="Search" @click="openUserSelect">选择</el-button>
+            </template>
+          </el-input>
+        </el-form-item>
+        <!-- <el-form-item label="续费时长" prop="addMonth">
+          <el-input v-model="form.addMonth" placeholder="请输入续费时长" />
+        </el-form-item> -->
+        <el-form-item label="到期时间" prop="deadTime">
+          <el-date-picker clearable
+            v-model="form.deadTime"
+            type="date"
+            value-format="YYYY-MM-DD "
+            placeholder="请选择到期时间">
+          </el-date-picker>
+        </el-form-item>
+        <!-- <el-form-item label="续费金额" prop="payAmount">
+          <el-input v-model="form.payAmount" placeholder="请输入续费金额" />
+        </el-form-item> -->
+        <!-- <el-form-item label="订单id" prop="orderId">
+          <el-input v-model="form.orderId" placeholder="请输入订单id" />
+        </el-form-item> -->
+        <!-- <el-form-item label="续费方式" prop="payType">
+          <el-select v-model="form.payType" placeholder="请选择续费方式">
+            <el-option
+                v-for="dict in pay_type"
+                :key="dict.value"
+                :label="dict.label"
+                :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item> -->
+        <!-- <el-form-item label="分润状态" prop="profitStatus">
+          <el-select v-model="form.profitStatus" placeholder="请选择分润状态">
+            <el-option
+                v-for="dict in profit_status"
+                :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>
+    
+    <!-- 设备选择对话框 -->
+    <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 label="设备类型">
+          <el-select 
+            v-model="deviceQueryParams.deviceType" 
+            placeholder="请选择设备类型" 
+            disabled
+            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>
+          <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="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="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-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 
+            style="width: 180px"
+            @keyup.enter="handleUserQuery"
+          />
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input 
+            v-model="userQueryParams.mobilePhone" 
+            placeholder="请输入手机号" 
+            clearable 
+            style="width: 180px"
+            @keyup.enter="handleUserQuery"
+          />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="Search" @click="handleUserQuery">搜索</el-button>
+          <el-button icon="Refresh" @click="resetUserQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+      
+      <!-- 用户表格 -->
+      <el-table 
+        :data="aquUserList" 
+        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="province" />
+        <el-table-column label="城市" align="center" prop="city" />
+        <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" 
+              @click="handleUserSelect(scope.row)"
+            >
+              选择
+            </el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      
+      <!-- 分页 -->
+      <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>
+        <el-descriptions-item label="用户名">
+          {{ orderDetail.userName || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="手机号">
+          {{ orderDetail.mobilePhone || '-' }}
+        </el-descriptions-item>
+        <el-descriptions-item label="订单金额（元）">
+          {{ (orderDetail.totalAmount / 100).toFixed(2) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="续费时长（月）">
+          {{ orderDetail.addMonth }}
+        </el-descriptions-item>
+        <el-descriptions-item label="设备数量">
+          {{ orderDetail.deviceCount }}
+        </el-descriptions-item>
+        <el-descriptions-item label="实付金额（元）">
+          {{ (orderDetail.payerTotal / 100).toFixed(2) }}
+        </el-descriptions-item>
+        <el-descriptions-item label="支付时间">
+          {{ parseTime(orderDetail.successTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+        </el-descriptions-item>
+        <el-descriptions-item label="订单状态">
+          <dict-tag :options="order_status" :value="orderDetail.orderStatus"/>
+        </el-descriptions-item>
+        <el-descriptions-item label="分润状态">
+          <dict-tag :options="profit_status" :value="orderDetail.profitStatus"/>
+        </el-descriptions-item>
+      </el-descriptions>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button @click="orderDetailVisible = false">关 闭</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="PayDevice" lang="ts">
+import { listPayDevice, getPayDevice, delPayDevice, addPayDevice, updatePayDevice } from '@/api/fishery/payDevice';
+import { PayDeviceVO, PayDeviceQuery, PayDeviceForm } from '@/api/fishery/payDevice/types';
+import { listAquUser } from '@/api/fishery/aquUser';
+import { AquUserVO } from '@/api/fishery/aquUser/types';
+import { listDevice } from '@/api/fishery/device';
+import { DeviceVO } from '@/api/fishery/device/types';
+import { getPayOrder } from '@/api/fishery/payOrder';
+import { PayOrderVO } from '@/api/fishery/payOrder/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { profit_status, pay_type, aqu_device_type, order_status } = toRefs<any>(proxy?.useDict('profit_status', 'pay_type', 'aqu_device_type', 'order_status'));
+
+const payDeviceList = ref<PayDeviceVO[]>([]);
+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 aquUserList = ref<AquUserVO[]>([]);
+const selectedUser = ref<AquUserVO | null>(null);
+const userSelectVisible = ref(false);
+const userQueryParams = reactive<{
+  pageNum: number;
+  pageSize: number;
+  userName?: string;
+  mobilePhone?: string;
+}>({
+  pageNum: 1,
+  pageSize: 10,
+  userName: undefined,
+  mobilePhone: undefined
+});
+const userTotal = ref(0);
+
+// 设备选择相关
+const deviceList = ref<DeviceVO[]>([]);
+const selectedDevice = ref<DeviceVO | null>(null);
+const deviceSelectVisible = ref(false);
+const deviceQueryParams = reactive<{
+  pageNum: number;
+  pageSize: number;
+  userId?: string | number;
+  serialNum?: string;
+  deviceName?: string;
+  deviceType?: number;
+  params: {
+    userKeyword?: string;
+  };
+}>({
+  pageNum: 1,
+  pageSize: 10,
+  userId: undefined,
+  serialNum: undefined,
+  deviceName: undefined,
+  deviceType: undefined,
+  params: {
+    userKeyword: undefined
+  }
+});
+const deviceTotal = ref(0);
+
+// 订单详情相关
+const orderDetailVisible = ref(false);
+const orderDetail = ref<PayOrderVO | null>(null);
+
+const queryFormRef = ref<ElFormInstance>();
+const payDeviceFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: PayDeviceForm = {
+  id: undefined,
+  userId: undefined,
+  serialNum: undefined,
+  deviceType: undefined,
+  addMonth: undefined,
+  deadTime: undefined,
+  payAmount: 0,
+  payType: 2,
+  profitStatus: 0,
+  remark: undefined
+}
+const data = reactive<PageData<PayDeviceForm, PayDeviceQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    userId: undefined,
+    serialNum: undefined,
+    deviceType: undefined,
+    payType: undefined,
+    profitStatus: undefined,
+    params: {
+      userKeyword: undefined
+    }
+  },
+  rules: {
+    userId: [
+      { required: true, message: "用户不能为空", trigger: "blur" }
+    ],
+    serialNum: [
+      { required: true, message: "设备编号不能为空", trigger: "blur" }
+    ],
+    deviceType: [
+      { required: true, message: "设备类型不能为空", trigger: "change" }
+    ],
+    deadTime: [
+      { required: true, message: "到期时间不能为空", trigger: "blur" }
+    ]
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询设备充值记录列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listPayDevice(queryParams.value);
+  payDeviceList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  selectedUser.value = null;
+  selectedDevice.value = null;
+  payDeviceFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: PayDeviceVO[]) => {
+  ids.value = selection.map(item => item.id);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  reset();
+  selectedUser.value = null;
+  selectedDevice.value = null;
+  dialog.visible = true;
+  dialog.title = "添加设备有效期";
+}
+
+/** 修改按钮操作 */
+const handleUpdate = async (row?: PayDeviceVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getPayDevice(_id);
+  Object.assign(form.value, res.data);
+  
+  // 回显用户信息
+  if (form.value.userId) {
+    try {
+      const userRes = await listAquUser({
+        pageNum: 1,
+        pageSize: 1000
+      });
+      const userList = userRes.rows || userRes.data || [];
+      const user = userList.find(u => u.id.toString() === form.value.userId.toString());
+      if (user) {
+        selectedUser.value = user;
+      } else {
+        selectedUser.value = null;
+      }
+    } catch (error) {
+      selectedUser.value = null;
+    }
+  } else {
+    selectedUser.value = null;
+  }
+  
+  // 回显设备信息
+  if (form.value.serialNum) {
+    try {
+      const deviceRes = await listDevice({
+        pageNum: 1,
+        pageSize: 1000,
+        userId: form.value.userId,
+        serialNum: form.value.serialNum
+      });
+      const deviceListData = deviceRes.rows || deviceRes.data || [];
+      const device = deviceListData.find(d => d.serialNum === form.value.serialNum);
+      if (device) {
+        selectedDevice.value = device;
+      } else {
+        selectedDevice.value = null;
+      }
+    } catch (error) {
+      selectedDevice.value = null;
+    }
+  } else {
+    selectedDevice.value = null;
+  }
+  
+  dialog.visible = true;
+  dialog.title = "修改设备充值记录";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  payDeviceFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updatePayDevice(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addPayDevice(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: PayDeviceVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除设备充值记录编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delPayDevice(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/payDevice/export', {
+    ...queryParams.value
+  }, `payDevice_${new Date().getTime()}.xlsx`)
+}
+
+/** 获取用户列表 */
+const getAquUserList = async () => {
+  const res = await listAquUser(userQueryParams);
+  aquUserList.value = res.rows || res.data || [];
+  userTotal.value = res.total || 0;
+};
+
+/** 打开用户选择对话框 */
+const openUserSelect = () => {
+  userQueryParams.pageNum = 1;
+  userQueryParams.userName = undefined;
+  userQueryParams.mobilePhone = undefined;
+  getAquUserList();
+  userSelectVisible.value = true;
+};
+
+/** 搜索用户 */
+const handleUserQuery = () => {
+  userQueryParams.pageNum = 1;
+  getAquUserList();
+};
+
+/** 重置用户搜索 */
+const resetUserQuery = () => {
+  userQueryParams.pageNum = 1;
+  userQueryParams.userName = undefined;
+  userQueryParams.mobilePhone = undefined;
+  getAquUserList();
+};
+
+/** 用户分页改变 */
+const handleUserPaginationChange = () => {
+  getAquUserList();
+};
+
+/** 选择用户 */
+const handleUserSelect = (user: AquUserVO) => {
+  selectedUser.value = user;
+  form.value.userId = user.id;
+  userSelectVisible.value = false;
+};
+
+/** 取消选择用户 */
+const cancelUserSelect = () => {
+  userSelectVisible.value = false;
+};
+
+/** 获取设备列表 */
+const getDeviceList = async () => {
+  const res = await listDevice(deviceQueryParams);
+  deviceList.value = res.rows || res.data || [];
+  deviceTotal.value = res.total || 0;
+};
+
+/** 打开设备选择对话框 */
+const openDeviceSelect = () => {
+  if (!form.value.deviceType) {
+    proxy?.$modal.msgWarning('请先选择设备类型');
+    return;
+  }
+  deviceQueryParams.pageNum = 1;
+  deviceQueryParams.userId = form.value.userId; // 如果已选择用户，则用于初始筛选
+  deviceQueryParams.deviceType = form.value.deviceType; // 使用表单中的设备类型进行筛选
+  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.userId = form.value.userId; // 保留用户过滤（如果有）
+  deviceQueryParams.deviceType = form.value.deviceType; // 保留设备类型过滤（如果有）
+  deviceQueryParams.serialNum = undefined;
+  deviceQueryParams.deviceName = undefined;
+  deviceQueryParams.params.userKeyword = undefined;
+  getDeviceList();
+};
+
+/** 设备分页改变 */
+const handleDevicePaginationChange = () => {
+  getDeviceList();
+};
+
+/** 选择设备 */
+const handleDeviceSelect = (device: DeviceVO) => {
+  selectedDevice.value = device;
+  form.value.serialNum = device.serialNum;
+  // 如果用户未选择，自动填充设备所属用户
+  if (!form.value.userId && device.userId) {
+    form.value.userId = device.userId;
+    // 同步更新用户显示信息
+    listAquUser({
+      pageNum: 1,
+      pageSize: 1000
+    }).then(res => {
+      const userList = res.rows || res.data || [];
+      const user = userList.find(u => u.id.toString() === device.userId.toString());
+      if (user) {
+        selectedUser.value = user;
+      }
+    }).catch(error => {
+      // 忽略错误
+    });
+  }
+  deviceSelectVisible.value = false;
+};
+
+/** 取消选择设备 */
+const cancelDeviceSelect = () => {
+  deviceSelectVisible.value = false;
+};
+
+// 监听设备类型变化，清空设备和用户选择
+watch(() => form.value.deviceType, (newType, oldType) => {
+  if (newType !== oldType && oldType !== undefined) {
+    // 设备类型改变时，清空设备选择
+    selectedDevice.value = null;
+    form.value.serialNum = undefined;
+    // 清空用户选择
+    selectedUser.value = null;
+    form.value.userId = undefined;
+  }
+});
+
+// 监听用户变化，清空设备选择（仅当手动改变用户时）
+watch(() => form.value.userId, (newUserId, oldUserId) => {
+  if (newUserId !== oldUserId && oldUserId !== undefined) {
+    // 如果设备所属用户与新选择的用户不一致，清空设备
+    if (selectedDevice.value && selectedDevice.value.userId.toString() !== newUserId?.toString()) {
+      selectedDevice.value = null;
+      form.value.serialNum = undefined;
+    }
+  }
+});
+
+/** 查看订单详情 */
+const handleViewOrder = async (row: PayDeviceVO) => {
+  if (!row.orderId) {
+    proxy?.$modal.msgWarning('该记录没有关联订单');
+    return;
+  }
+  
+  try {
+    const res = await getPayOrder(row.orderId);
+    orderDetail.value = res.data;
+    orderDetailVisible.value = true;
+  } catch (error) {
+    proxy?.$modal.msgError('加载订单详情失败');
+  }
+};
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/payOrder/index.vue b/src/views/fishery/payOrder/index.vue
new file mode 100644
index 0000000..fa7662d
--- /dev/null
+++ b/src/views/fishery/payOrder/index.vue
@@ -0,0 +1,126 @@
+<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="orderStatus">
+              <el-select v-model="queryParams.orderStatus" placeholder="请选择订单状态" clearable >
+                <el-option v-for="dict in order_status" :key="dict.value" :label="dict.label" :value="dict.value"/>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="分润状态" prop="profitStatus">
+              <el-select v-model="queryParams.profitStatus" placeholder="请选择分润状态" clearable >
+                <el-option v-for="dict in profit_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="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:payOrder: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="payOrderList">
+        <el-table-column label="用户名" align="center" prop="userName" />
+        <el-table-column label="手机号" align="center" prop="mobilePhone" />
+        <el-table-column label="充值总金额（元）" align="center" prop="totalAmountYuan" />
+        <el-table-column label="有效期增加月数" align="center" prop="addMonth" />
+        <el-table-column label="设备数量" align="center" prop="deviceCount" />
+        <el-table-column label="用户支付金额（元）" align="center" prop="payerTotalYuan" />
+        <el-table-column label="支付完成时间" align="center" prop="successTime" width="180">
+        </el-table-column>
+        <el-table-column label="订单状态" align="center" prop="orderStatus">
+          <template #default="scope">
+            <dict-tag :options="order_status" :value="scope.row.orderStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column label="分润状态" align="center" prop="profitStatus">
+          <template #default="scope">
+            <dict-tag :options="profit_status" :value="scope.row.profitStatus"/>
+          </template>
+        </el-table-column>
+          <el-table-column label="创建时间" align="center" prop="createTime"  width="160"/>
+      </el-table>
+
+      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+    </el-card>
+  </div>
+</template>
+
+<script setup name="PayOrder" lang="ts">
+import { listPayOrder } from '@/api/fishery/payOrder';
+import { PayOrderVO, PayOrderQuery } from '@/api/fishery/payOrder/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { profit_status, order_status } = toRefs<any>(proxy?.useDict('profit_status', 'order_status'));
+
+const payOrderList = ref<PayOrderVO[]>([]);
+const loading = ref(true);
+const showSearch = ref(true);
+const total = ref(0);
+
+const queryFormRef = ref<ElFormInstance>();
+
+const queryParams = reactive<PayOrderQuery>({
+  pageNum: 1,
+  pageSize: 10,
+  bankType: undefined,
+  successTime: undefined,
+  tradeState: undefined,
+  tradeType: undefined,
+  transactionId: undefined,
+  orderStatus: undefined,
+  profitStatus: undefined,
+  params: {
+    userKeyword: undefined
+  }
+});
+
+/** 查询充值订单列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listPayOrder(queryParams);
+  payOrderList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/payOrder/export', {
+    ...queryParams
+  }, `payOrder_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>
diff --git a/src/views/fishery/userRelation/index.vue b/src/views/fishery/userRelation/index.vue
new file mode 100644
index 0000000..aef101d
--- /dev/null
+++ b/src/views/fishery/userRelation/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="parentUserId">
+              <el-input v-model="queryParams.parentUserId" placeholder="请输入父级账号id" clearable @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="子账号id" prop="childUserId">
+              <el-input v-model="queryParams.childUserId" 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:userRelation:add']">新增</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['fishery:userRelation:edit']">修改</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['fishery:userRelation:remove']">删除</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['fishery:userRelation: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="userRelationList" @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="parentUserId" />
+        <el-table-column label="子账号id" align="center" prop="childUserId" />
+        <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:userRelation:edit']"></el-button>
+            </el-tooltip>
+            <el-tooltip content="删除" placement="top">
+              <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['fishery:userRelation: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="userRelationFormRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="父级账号id" prop="parentUserId">
+          <el-input v-model="form.parentUserId" placeholder="请输入父级账号id" />
+        </el-form-item>
+        <el-form-item label="子账号id" prop="childUserId">
+          <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-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="UserRelation" lang="ts">
+import { listUserRelation, getUserRelation, delUserRelation, addUserRelation, updateUserRelation } from '@/api/fishery/userRelation';
+import { UserRelationVO, UserRelationQuery, UserRelationForm } from '@/api/fishery/userRelation/types';
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+
+const userRelationList = ref<UserRelationVO[]>([]);
+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 userRelationFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+  visible: false,
+  title: ''
+});
+
+const initFormData: UserRelationForm = {
+  id: undefined,
+  parentUserId: undefined,
+  childUserId: undefined,
+  remark: undefined
+}
+const data = reactive<PageData<UserRelationForm, UserRelationQuery>>({
+  form: {...initFormData},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 10,
+    parentUserId: undefined,
+    childUserId: undefined,
+    params: {
+    }
+  },
+  rules: {
+    id: [
+      { required: true, message: "主键id不能为空", trigger: "blur" }
+    ],
+    parentUserId: [
+      { required: true, message: "父级账号id不能为空", trigger: "blur" }
+    ],
+    childUserId: [
+      { required: true, message: "子账号id不能为空", trigger: "blur" }
+    ],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询养殖用户子账号列表 */
+const getList = async () => {
+  loading.value = true;
+  const res = await listUserRelation(queryParams.value);
+  userRelationList.value = res.rows;
+  total.value = res.total;
+  loading.value = false;
+}
+
+/** 取消按钮 */
+const cancel = () => {
+  reset();
+  dialog.visible = false;
+}
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {...initFormData};
+  userRelationFormRef.value?.resetFields();
+}
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  queryFormRef.value?.resetFields();
+  handleQuery();
+}
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: UserRelationVO[]) => {
+  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?: UserRelationVO) => {
+  reset();
+  const _id = row?.id || ids.value[0]
+  const res = await getUserRelation(_id);
+  Object.assign(form.value, res.data);
+  dialog.visible = true;
+  dialog.title = "修改养殖用户子账号";
+}
+
+/** 提交按钮 */
+const submitForm = () => {
+  userRelationFormRef.value?.validate(async (valid: boolean) => {
+    if (valid) {
+      buttonLoading.value = true;
+      if (form.value.id) {
+        await updateUserRelation(form.value).finally(() =>  buttonLoading.value = false);
+      } else {
+        await addUserRelation(form.value).finally(() =>  buttonLoading.value = false);
+      }
+      proxy?.$modal.msgSuccess("操作成功");
+      dialog.visible = false;
+      await getList();
+    }
+  });
+}
+
+/** 删除按钮操作 */
+const handleDelete = async (row?: UserRelationVO) => {
+  const _ids = row?.id || ids.value;
+  await proxy?.$modal.confirm('是否确认删除养殖用户子账号编号为"' + _ids + '"的数据项？').finally(() => loading.value = false);
+  await delUserRelation(_ids);
+  proxy?.$modal.msgSuccess("删除成功");
+  await getList();
+}
+
+/** 导出按钮操作 */
+const handleExport = () => {
+  proxy?.download('fishery/userRelation/export', {
+    ...queryParams.value
+  }, `userRelation_${new Date().getTime()}.xlsx`)
+}
+
+onMounted(() => {
+  getList();
+});
+</script>