diff --git a/src/api/fishery/callNotice/types.ts b/src/api/fishery/callNotice/types.ts index bde6697..ba58aad 100644 --- a/src/api/fishery/callNotice/types.ts +++ b/src/api/fishery/callNotice/types.ts @@ -84,6 +84,36 @@ export interface CallNoticeVO { */ voiceType: string; + /** + * 呼叫时间 + */ + callTime?: string; + + /** + * 用户名（关联查询） + */ + userName?: string; + + /** + * 设备编号（关联查询） + */ + serialNum?: string; + + /** + * 设备类型（关联查询） + */ + deviceType?: number; + + /** + * 告警类型 + */ + warnType?: number; + + /** + * 告警标题 + */ + warnTitle?: string; + } export interface CallNoticeForm extends BaseEntity { diff --git a/src/api/fishery/device/types.ts b/src/api/fishery/device/types.ts index 1310cdc..46e6e0b 100644 --- a/src/api/fishery/device/types.ts +++ b/src/api/fishery/device/types.ts @@ -214,6 +214,26 @@ export interface DeviceVO { */ batteryWarnLower: number; + /** + * 用户名（关联查询） + */ + userName?: string; + + /** + * 手机号（关联查询） + */ + mobilePhone?: string; + + /** + * 塘口名称（关联查询） + */ + pondName?: string; + + /** + * 创建时间（激活时间） + */ + createTime?: string; + } export interface DeviceForm extends BaseEntity { diff --git a/src/api/fishery/messageWarn/types.ts b/src/api/fishery/messageWarn/types.ts index f397574..86ea3db 100644 --- a/src/api/fishery/messageWarn/types.ts +++ b/src/api/fishery/messageWarn/types.ts @@ -69,6 +69,11 @@ export interface MessageWarnVO { */ createTime?: string; + /** + * 电话通知次数 + */ + callNoticeCount?: number; + } export interface MessageWarnForm extends BaseEntity { diff --git a/src/types/components.d.ts b/src/types/components.d.ts index 5fffbe6..5403130 100644 --- a/src/types/components.d.ts +++ b/src/types/components.d.ts @@ -19,6 +19,7 @@ declare module 'vue' { ElButton: typeof import('element-plus/es')['ElButton'] ElButtonGroup: typeof import('element-plus/es')['ElButtonGroup'] ElCard: typeof import('element-plus/es')['ElCard'] + ElCheckbox: typeof import('element-plus/es')['ElCheckbox'] ElCol: typeof import('element-plus/es')['ElCol'] ElColorPicker: typeof import('element-plus/es')['ElColorPicker'] ElConfigProvider: typeof import('element-plus/es')['ElConfigProvider'] @@ -34,7 +35,6 @@ declare module 'vue' { ElFormItem: typeof import('element-plus/es')['ElFormItem'] ElIcon: typeof import('element-plus/es')['ElIcon'] ElInput: typeof import('element-plus/es')['ElInput'] - ElInputNumber: typeof import('element-plus/es')['ElInputNumber'] ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] diff --git a/src/views/fishery/callNotice/index.vue b/src/views/fishery/callNotice/index.vue index ec9d6a1..f4372a2 100644 --- a/src/views/fishery/callNotice/index.vue +++ b/src/views/fishery/callNotice/index.vue @@ -56,7 +56,7 @@ - + @@ -108,6 +108,64 @@ + +
+
+ +
+ + +
+
+ + {{ item.callTime || '-' }} +
+ +
+ + +
+
+
用户名{{ item.userName || '-' }}
+
设备编号{{ item.serialNum || '-' }}
+
设备类型
+
呼叫电话{{ item.mobilePhone || '-' }}
+
主叫号码{{ item.caller || '-' }}
+
+
+ + +
+
告警信息
+
+
+ 告警类型 + +
+
+ 告警标题 + {{ item.warnTitle || '-' }} +
+
+
+ + +
+
呼叫结果
+
+ {{ item.statusMsg }} +
+
+ + +
+ + 删除 + +
+ +
+ @@ -336,6 +394,19 @@ const handleSelectionChange = (selection: CallNoticeVO[]) => { multiple.value = !selection.length; } +/** 移动端选择 */ +const handleMobileSelect = (item: CallNoticeVO, checked: boolean | string | number) => { + if (checked) { + if (!ids.value.includes(item.id)) { + ids.value.push(item.id); + } + } else { + ids.value = ids.value.filter(id => id !== item.id); + } + single.value = ids.value.length != 1; + multiple.value = !ids.value.length; +} + /** 新增按钮操作 */ const handleAdd = () => { reset(); @@ -390,3 +461,185 @@ onMounted(() => { getList(); }); + + diff --git a/src/views/fishery/device/index.vue b/src/views/fishery/device/index.vue index 79244ce..e7e5bac 100644 --- a/src/views/fishery/device/index.vue +++ b/src/views/fishery/device/index.vue @@ -52,7 +52,8 @@ - + + @@ -163,6 +164,118 @@ + +
+
+ +
+ + +
+
+ {{ item.deviceName || '-' }} + +
+ +
+ + +
+
基础信息
+
+
用户名{{ item.userName || '-' }}
+
手机号{{ item.mobilePhone || '-' }}
+
设备编号{{ item.serialNum || '-' }}
+
塘口名称{{ item.pondName || '-' }}
+
物联网卡号{{ item.iccId || '-' }}
+
设备分类{{ item.category || '-' }}
+
绑定时间{{ parseTime(item.bindTime, '{y}-{m}-{d}') }}
+
激活时间{{ item.createTime || '-' }}
+
到期时间{{ parseTime(item.deadTime, '{y}-{m}-{d}') }}
+
溶解氧启用
+
+
+ + +
+
传感器数据
+
+
溶解氧{{ item.valueDissolvedOxygen ?? '-' }}
+
水温{{ item.valueTemperature ?? '-' }}
+
饱和度{{ item.valueSaturability ?? '-' }}
+
PH{{ item.valuePh ?? '-' }}
+
盐度{{ item.valueSalinity ?? '-' }}
+
参比值{{ item.treference ?? '-' }}
+
荧光值{{ item.tfluorescence ?? '-' }}
+
告警码{{ item.warnCode ?? '-' }}
+
+
+ + +
+
溶解氧告警设置
+
+
电话告警开关
+
免打扰
+
告警下限{{ item.oxyWarnLower ?? '-' }}
+
+
+ + +
+
温度告警设置
+
+
电话告警开关
+
免打扰
+
告警上限{{ item.tempWarnUpper ?? '-' }}
+
告警下限{{ item.tempWarnLower ?? '-' }}
+
+
+ + +
+
电量告警设置
+
+
电话告警开关
+
免打扰
+
告警下限{{ item.batteryWarnLower ?? '-' }}
+
+
+ + +
+
补偿设置
+
+
盐度补偿{{ item.salinityCompensation ?? '-' }}
+
线性系数补偿{{ item.phaseCompensation ?? '-' }}
+
相位差补偿{{ item.phasedifCompensation ?? '-' }}
+
温度补偿{{ item.temperatureCompensation ?? '-' }}
+
输入额定电压{{ item.inputVoltage ?? '-' }}
+
电压告警开关
+
+
+ + +
+ + 曲线图 + + + 开关 + + + 联动 + + + 校时 + + + 修改 + +
+ +
+ @@ -1199,6 +1312,19 @@ const handleSelectionChange = (selection: DeviceVO[]) => { multiple.value = !selection.length; } +/** 移动端选择 */ +const handleMobileSelect = (item: DeviceVO, checked: boolean | string | number) => { + if (checked) { + if (!ids.value.includes(item.id)) { + ids.value.push(item.id); + } + } else { + ids.value = ids.value.filter(id => id !== item.id); + } + single.value = ids.value.length != 1; + multiple.value = !ids.value.length; +} + /** 新增按钮操作 */ const handleAdd = () => { reset(); @@ -1713,3 +1839,202 @@ onMounted(() => { getList(); }); + + diff --git a/src/views/fishery/messageWarn/index.vue b/src/views/fishery/messageWarn/index.vue index 9d326a2..2ddf7c8 100644 --- a/src/views/fishery/messageWarn/index.vue +++ b/src/views/fishery/messageWarn/index.vue @@ -48,7 +48,7 @@ - + @@ -92,6 +92,55 @@ + +
+
+ +
+ + +
+ + +
+ + +
+
+
告警标题{{ item.title || '-' }}
+
告警时间{{ item.createTime || '-' }}
+
是否已读
+
用户名{{ item.userName || '-' }}
+
手机号{{ item.mobilePhone || '-' }}
+
设备编号{{ item.serialNum || '-' }}
+
设备名称{{ item.deviceName || '-' }}
+
+
+ + +
+
告警内容
+
{{ item.message || '-' }}
+
+ + +
+ 电话通知 + {{ item.callNoticeCount }}次 +
+ + +
+ + 查看 + + + 删除 + +
+ +
+ @@ -339,6 +388,19 @@ const handleSelectionChange = (selection: MessageWarnVO[]) => { multiple.value = !selection.length; } +/** 移动端选择 */ +const handleMobileSelect = (item: MessageWarnVO, checked: boolean | string | number) => { + if (checked) { + if (!ids.value.includes(item.id)) { + ids.value.push(item.id); + } + } else { + ids.value = ids.value.filter(id => id !== item.id); + } + single.value = ids.value.length != 1; + multiple.value = !ids.value.length; +} + /** 新增按钮操作 */ const handleAdd = () => { reset(); @@ -403,3 +465,150 @@ onMounted(() => { getList(); }); + + diff --git a/vite.config.ts b/vite.config.ts index 21cc9d0..cf25af9 100644 --- a/vite.config.ts +++ b/vite.config.ts @@ -25,7 +25,7 @@ export default defineConfig(({ mode, command }) => { proxy: { [env.VITE_APP_BASE_API]: { // target: 'http://localhost:8080', - target: 'https://www.qdintc.com/fishery-api/', + target: 'https://api.yuceyun.cn/test-api/', changeOrigin: true, ws: true, rewrite: (path) => path.replace(new RegExp('^' + env.VITE_APP_BASE_API), '')