From f858a4ce13d8146fd13367d4c583bea9dc92f955 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Thu, 2 Apr 2026 14:49:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=BA=E5=9F=9F=E7=BB=91=E5=AE=9A=E7=89=A9?= =?UTF-8?q?=E8=81=94=E8=AE=BE=E5=A4=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/biz/nuBaseInfo/QyxxList.vue | 7 +- .../nuBaseInfo/devicesBind/CheckDbForm.vue | 98 ++++++++ .../nuBaseInfo/devicesBind/CheckDbModal.vue | 70 ++++++ .../nuBaseInfo/devicesBind/CheckSbForm.vue | 98 ++++++++ .../nuBaseInfo/devicesBind/CheckSbModal.vue | 70 ++++++ .../nuBaseInfo/devicesBind/CheckSxtForm.vue | 98 ++++++++ .../nuBaseInfo/devicesBind/CheckSxtModal.vue | 71 ++++++ .../nuBaseInfo/devicesBind/CheckWsdjForm.vue | 90 +++++++ .../nuBaseInfo/devicesBind/CheckWsdjModal.vue | 70 ++++++ .../biz/nuBaseInfo/devicesBind/DbList.vue | 224 +++++++++++++++++ .../nuBaseInfo/devicesBind/DevicesBind.api.ts | 25 ++ .../devicesBind/DevicesBind.data.ts | 134 +++++++++++ .../nuBaseInfo/devicesBind/DevicesForm.vue | 165 +++++++++++++ .../nuBaseInfo/devicesBind/DevicesModal.vue | 83 +++++++ .../devicesBind/DevicesPriviewForm.vue | 133 +++++++++++ .../devicesBind/DevicesPriviewModal.vue | 70 ++++++ .../biz/nuBaseInfo/devicesBind/SbList.vue | 226 ++++++++++++++++++ .../biz/nuBaseInfo/devicesBind/SxtList.vue | 131 ++++++++++ .../biz/nuBaseInfo/devicesBind/WsdjList.vue | 163 +++++++++++++ src/views/iot/manager/DeviceManagerList.vue | 4 +- .../iot/tq/electricity/apilog/ApiLogList.vue | 2 +- 21 files changed, 2026 insertions(+), 6 deletions(-) create mode 100644 src/views/biz/nuBaseInfo/devicesBind/CheckDbForm.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/CheckDbModal.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/CheckSbForm.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/CheckSbModal.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/CheckSxtForm.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/CheckSxtModal.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/CheckWsdjForm.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/CheckWsdjModal.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/DbList.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/DevicesBind.api.ts create mode 100644 src/views/biz/nuBaseInfo/devicesBind/DevicesBind.data.ts create mode 100644 src/views/biz/nuBaseInfo/devicesBind/DevicesForm.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/DevicesModal.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/DevicesPriviewForm.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/DevicesPriviewModal.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/SbList.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/SxtList.vue create mode 100644 src/views/biz/nuBaseInfo/devicesBind/WsdjList.vue diff --git a/src/views/biz/nuBaseInfo/QyxxList.vue b/src/views/biz/nuBaseInfo/QyxxList.vue index 351cd33..1cc7156 100644 --- a/src/views/biz/nuBaseInfo/QyxxList.vue +++ b/src/views/biz/nuBaseInfo/QyxxList.vue @@ -103,7 +103,8 @@ import { saveOrUpdate, hldyQyty } from './NuBaseInfo.api'; import NuBaseInfoModal from './components/NuBaseInfoModal.vue' import NuBaseInfoAddModal from './components/NuBaseInfoAddModal.vue' - import BaseWlsbListModal from './components/BaseWlsbListModal.vue' + // import BaseWlsbListModal from './components/BaseWlsbListModal.vue' + import BaseWlsbListModal from '/@/views/biz/nuBaseInfo/devicesBind/DevicesModal.vue' import QyghListModal from './components/QyghListModal.vue' import EwmModal from './components/EwmModal.vue' import IotDevicesModall from '/@/views/biz/nuBaseInfo/iotDevices/IotDevicesModal.vue' @@ -157,7 +158,7 @@ const { createMessage } = useMessage(); } /** * 二维码 - * @param record + * @param record */ function handleEwm(record) { ewmModal.value.disableSubmit = true; @@ -178,7 +179,7 @@ function handleJcfy(record) { //查看物联设备 function handleWlsb(record) { wlsbModal.value.disableSubmit = true; - wlsbModal.value.edit(record); + wlsbModal.value.add(record); } /** diff --git a/src/views/biz/nuBaseInfo/devicesBind/CheckDbForm.vue b/src/views/biz/nuBaseInfo/devicesBind/CheckDbForm.vue new file mode 100644 index 0000000..1313bda --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/CheckDbForm.vue @@ -0,0 +1,98 @@ + + + + + + + + + 拉闸 + + + 合闸 + + + + 选择 + + + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/CheckDbModal.vue b/src/views/biz/nuBaseInfo/devicesBind/CheckDbModal.vue new file mode 100644 index 0000000..5d96278 --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/CheckDbModal.vue @@ -0,0 +1,70 @@ + + + + + 关闭 + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/CheckSbForm.vue b/src/views/biz/nuBaseInfo/devicesBind/CheckSbForm.vue new file mode 100644 index 0000000..1540482 --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/CheckSbForm.vue @@ -0,0 +1,98 @@ + + + + + + + + + 关阀 + + + 开阀 + + + + 选择 + + + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/CheckSbModal.vue b/src/views/biz/nuBaseInfo/devicesBind/CheckSbModal.vue new file mode 100644 index 0000000..c8a185d --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/CheckSbModal.vue @@ -0,0 +1,70 @@ + + + + + 关闭 + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/CheckSxtForm.vue b/src/views/biz/nuBaseInfo/devicesBind/CheckSxtForm.vue new file mode 100644 index 0000000..4610dd3 --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/CheckSxtForm.vue @@ -0,0 +1,98 @@ + + + + + + + + 预览 + + + 选择 + + + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/CheckSxtModal.vue b/src/views/biz/nuBaseInfo/devicesBind/CheckSxtModal.vue new file mode 100644 index 0000000..18436d7 --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/CheckSxtModal.vue @@ -0,0 +1,71 @@ + + + + + 关闭 + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/CheckWsdjForm.vue b/src/views/biz/nuBaseInfo/devicesBind/CheckWsdjForm.vue new file mode 100644 index 0000000..0d9ad87 --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/CheckWsdjForm.vue @@ -0,0 +1,90 @@ + + + + + + + + 选择 + + + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/CheckWsdjModal.vue b/src/views/biz/nuBaseInfo/devicesBind/CheckWsdjModal.vue new file mode 100644 index 0000000..e1d878f --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/CheckWsdjModal.vue @@ -0,0 +1,70 @@ + + + + + 关闭 + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/DbList.vue b/src/views/biz/nuBaseInfo/devicesBind/DbList.vue new file mode 100644 index 0000000..7b41050 --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/DbList.vue @@ -0,0 +1,224 @@ + + + + + + + SN:{{item.sn}} + + + + {{item.relayState=='1'?'合闸':'拉闸'}} + + + + + + + + + NUID: {{item.nuId?item.nuId:'未配置'}} + + + {{item.eleValue?item.eleValue:'0.00'}} + + + KWH + 用电量 + + + 设备类型:电表 + + + + 正常 + 损坏 + + 维修状态 + + + + + + + + 抄表 + + + + 拉闸 + + + + 合闸 + + + + 清零 + + + + 日志 + + + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/DevicesBind.api.ts b/src/views/biz/nuBaseInfo/devicesBind/DevicesBind.api.ts new file mode 100644 index 0000000..009e95b --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/DevicesBind.api.ts @@ -0,0 +1,25 @@ +import { defHttp } from '/@/utils/http/axios'; + +enum Api { + bindedList = '/iot/device/manager/bindedList', + cameraInfoUnbindList = '/iot/device/manager/cameraInfoUnbindList', + electricityMeterUnbindList = '/iot/device/manager/electricityMeterUnbindList', + waterMeterUnbindList = '/iot/device/manager/waterMeterUnbindList', + humidDeviceUnbindList = '/iot/device/manager/humidDeviceUnbindList', + bindDevice = '/iot/device/manager/bindDevice', + + +} + +/** + * 获取已绑定设备列表 + * @returns + */ +export const bindedList = (params) => defHttp.get({ url: Api.bindedList, params }); +export const cameraInfoUnbindList = (params) => defHttp.get({ url: Api.cameraInfoUnbindList, params }); +export const electricityMeterUnbindList = (params) => defHttp.get({ url: Api.electricityMeterUnbindList, params }); +export const waterMeterUnbindList = (params) => defHttp.get({ url: Api.waterMeterUnbindList, params }); +export const humidDeviceUnbindList = (params) => defHttp.get({ url: Api.humidDeviceUnbindList, params }); + +export const bindDevice = (params) => defHttp.post({ url: Api.bindDevice, params }); + diff --git a/src/views/biz/nuBaseInfo/devicesBind/DevicesBind.data.ts b/src/views/biz/nuBaseInfo/devicesBind/DevicesBind.data.ts new file mode 100644 index 0000000..c388fc1 --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/DevicesBind.data.ts @@ -0,0 +1,134 @@ +import {BasicColumn} from '/@/components/Table'; + +//列表数据 +export const baseSxtColumns: BasicColumn[] = [ + { + title: '设备维度', + align: "center", + dataIndex: 'dimension', + }, + { + title: '设备标识', + align: "center", + dataIndex: 'sn', + }, + { + title: '规格型号', + align: "center", + dataIndex: 'deviceModel' + }, + { + title: '在线状态', + align: "center", + dataIndex: 'deviceStatus', + customRender:({record})=>{ + return record.deviceStatus?(record.deviceStatus=='1'?'在线':'离线'):'待集成'; + }, + }, + { + title: '操作', + align: "center", + dataIndex: 'action', + width: 180, + }, +]; + +//列表数据 +export const baseDbColumns: BasicColumn[] = [ + { + title: '设备维度', + align: "center", + dataIndex: 'dimension', + }, + { + title: '设备标识', + align: "center", + dataIndex: 'sn', + }, + { + title: '规格型号', + align: "center", + dataIndex: 'deviceModel' + }, + { + title: '在线状态', + align: "center", + dataIndex: 'relayState', + customRender:({record})=>{ + return record.relayState?(record.relayState=='1'?'合闸':'拉闸'):'待集成'; + }, + }, + { + title: '操作', + align: "center", + dataIndex: 'action', + width: 180, + }, +]; + + +//列表数据 +export const baseSbColumns: BasicColumn[] = [ + { + title: '设备维度', + align: "center", + dataIndex: 'dimension', + }, + { + title: '设备标识', + align: "center", + dataIndex: 'sn', + }, + { + title: '规格型号', + align: "center", + dataIndex: 'deviceModel' + }, + { + title: '设备状态', + align: "center", + dataIndex: 'relayState', + customRender:({record})=>{ + return record.relayState?(record.relayState=='1'?'开阀':'关阀'):'待集成'; + }, + }, + { + title: '操作', + align: "center", + dataIndex: 'action', + width: 180, + }, +]; + +//列表数据 +export const baseWsdColumns: BasicColumn[] = [ + { + title: '设备维度', + align: "center", + dataIndex: 'dimension', + }, + { + title: '设备标识', + align: "center", + dataIndex: 'sn' + }, + { + title: '规格型号', + align: "center", + dataIndex: 'deviceModel' + }, + { + title: '在线状态', + align: "center", + dataIndex: 'status', + customRender:({record})=>{ + return record.status?(record.status=='0'?'在线':'离线'):'待集成'; + }, + }, + { + title: '操作', + align: "center", + dataIndex: 'action', + width: 180, + }, +]; diff --git a/src/views/biz/nuBaseInfo/devicesBind/DevicesForm.vue b/src/views/biz/nuBaseInfo/devicesBind/DevicesForm.vue new file mode 100644 index 0000000..f4d1bcd --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/DevicesForm.vue @@ -0,0 +1,165 @@ + + + + + 摄像头 + 电表 + 水表 + 温湿度计 + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/DevicesModal.vue b/src/views/biz/nuBaseInfo/devicesBind/DevicesModal.vue new file mode 100644 index 0000000..b297280 --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/DevicesModal.vue @@ -0,0 +1,83 @@ + + + + + 关闭 + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/DevicesPriviewForm.vue b/src/views/biz/nuBaseInfo/devicesBind/DevicesPriviewForm.vue new file mode 100644 index 0000000..57c138b --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/DevicesPriviewForm.vue @@ -0,0 +1,133 @@ + + + + + + NUID:{{item.nuId}} + {{itemA.sn}}[摄像头] + {{itemB.cid}}[电表] + {{itemC.sn}}[温湿度计] + {{itemD.cid}}[水表] + + 暂无数据 + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/DevicesPriviewModal.vue b/src/views/biz/nuBaseInfo/devicesBind/DevicesPriviewModal.vue new file mode 100644 index 0000000..299fa10 --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/DevicesPriviewModal.vue @@ -0,0 +1,70 @@ + + + + + 关闭 + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/SbList.vue b/src/views/biz/nuBaseInfo/devicesBind/SbList.vue new file mode 100644 index 0000000..92ae7bb --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/SbList.vue @@ -0,0 +1,226 @@ + + + + + + + SN:{{item.cid}} + + + + {{item.relayState=='1'?'开阀':'关阀'}} + + + + + + + + + NUID: {{item.nuId?item.nuId:'未配置'}} + + + {{item.waterValue?item.waterValue:'0.00'}} + + + m³ + 用水量 + + + 设备类型:水表 + + + + 正常 + 损坏 + + 维修状态 + + + + + + + + 抄表 + + + + 开阀 + + + + 关阀 + + + + 清零 + + + + 日志 + + + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/SxtList.vue b/src/views/biz/nuBaseInfo/devicesBind/SxtList.vue new file mode 100644 index 0000000..921e0cc --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/SxtList.vue @@ -0,0 +1,131 @@ + + + + + + + SN:{{item.sn}} + + + + {{item.deviceStatus =='1'?'在线':'离线'}} + + + + + + + + + NUID: {{item.nuId?item.nuId:'未配置'}} + + + + + + 设备类型:摄像头 + + + + 正常 + 损坏 + + 维修状态 + + + + + + + + 预览 + + + + + + + + + + + diff --git a/src/views/biz/nuBaseInfo/devicesBind/WsdjList.vue b/src/views/biz/nuBaseInfo/devicesBind/WsdjList.vue new file mode 100644 index 0000000..4cf0980 --- /dev/null +++ b/src/views/biz/nuBaseInfo/devicesBind/WsdjList.vue @@ -0,0 +1,163 @@ + + + + + + + SN:{{item.sn}} + + + + {{item.status=='0'?'在线':'离线'}} + + + + + + + + + NUID: {{item.nuId?item.nuId:'未配置'}} + + + + + + {{item.temperature?item.temperature:'-'}} + ℃ + + + + + + + {{item.humidity?item.humidity:'-'}} + % + + + + + 设备类型:温湿度计 + + + + 正常 + 损坏 + + 维修状态 + + + + + + + + 抄表 + + + + 日志 + + + + + + + + + + + diff --git a/src/views/iot/manager/DeviceManagerList.vue b/src/views/iot/manager/DeviceManagerList.vue index 7eace25..62f2146 100644 --- a/src/views/iot/manager/DeviceManagerList.vue +++ b/src/views/iot/manager/DeviceManagerList.vue @@ -153,12 +153,12 @@ { label: '损坏', onClick: handleDeviceBroken.bind(null, record), - ifShow: record.deviceStatus != '损坏' + ifShow: (record.onlineStatus!='待集成' && record.deviceStatus != '损坏') }, { label: '更换', onClick: handleDeviceGh.bind(null, record), - ifShow: (record.dimension == '区域维度' && record.deviceStatus != '损坏') + ifShow: (record.onlineStatus!='待集成' && record.dimension == '区域维度' && record.deviceStatus != '损坏') }, ] } diff --git a/src/views/iot/tq/electricity/apilog/ApiLogList.vue b/src/views/iot/tq/electricity/apilog/ApiLogList.vue index 61ae1c4..4cd5eae 100644 --- a/src/views/iot/tq/electricity/apilog/ApiLogList.vue +++ b/src/views/iot/tq/electricity/apilog/ApiLogList.vue @@ -39,7 +39,7 @@ function getDataList(type, record) { console.log("🚀 ~ getDataList ~ type, record:", type, record) var params = { type: type, - cid: record.cid + cid: record.sn } if (type == '9') { ApiRequestLogListModal9.value.init(params);