From 4f0bd551c176928fa9fe24489ae18f8726578f37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Wed, 8 Apr 2026 17:45:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E8=81=94=E8=AE=BE=E5=A4=87=E5=90=8C?=
=?UTF-8?q?=E6=AD=A5=E6=8E=A8=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/biz/nuBaseInfo/QyxxList.vue | 1 +
.../components/BaseWlsbListForm.vue | 2 +-
.../nuBaseInfo/devicesBind/DevicesForm.vue | 21 +++++++++++++------
src/views/iot/manager/DeviceManagerList.vue | 21 ++++++++++++-------
.../manager/components/DeviceBrokenForm.vue | 1 +
.../iot/manager/components/DeviceGhForm.vue | 1 +
.../components/preview/DevicePreviewForm.vue | 1 +
src/views/iot/manager/manager.data.ts | 17 +++++++++++++++
8 files changed, 51 insertions(+), 14 deletions(-)
diff --git a/src/views/biz/nuBaseInfo/QyxxList.vue b/src/views/biz/nuBaseInfo/QyxxList.vue
index 1cc7156..af800e4 100644
--- a/src/views/biz/nuBaseInfo/QyxxList.vue
+++ b/src/views/biz/nuBaseInfo/QyxxList.vue
@@ -179,6 +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/components/BaseWlsbListForm.vue b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
index 79af49d..c443a03 100644
--- a/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
+++ b/src/views/biz/nuBaseInfo/components/BaseWlsbListForm.vue
@@ -287,7 +287,7 @@
- 提示：请联系平台运维组技术人员绑定物联设备！
+ 提示：请在【物联设备】功能中绑定物联设备！
diff --git a/src/views/biz/nuBaseInfo/devicesBind/DevicesForm.vue b/src/views/biz/nuBaseInfo/devicesBind/DevicesForm.vue
index f4d1bcd..f8ebc73 100644
--- a/src/views/biz/nuBaseInfo/devicesBind/DevicesForm.vue
+++ b/src/views/biz/nuBaseInfo/devicesBind/DevicesForm.vue
@@ -1,12 +1,12 @@
-
- 摄像头
- 电表
- 水表
- 温湿度计
-
+
+
+
+
+
+
@@ -15,6 +15,15 @@
+
+
+
+ 提示：请在【物联设备】功能中绑定物联设备！
+
+
diff --git a/src/views/iot/manager/DeviceManagerList.vue b/src/views/iot/manager/DeviceManagerList.vue
index 62f2146..52ef193 100644
--- a/src/views/iot/manager/DeviceManagerList.vue
+++ b/src/views/iot/manager/DeviceManagerList.vue
@@ -98,7 +98,7 @@
pageSizeOptions: ['15', '50', '70', '100'],
},
actionColumn: {
- width: 290,
+ width: 180,
fixed:'right'
},
beforeFetch: (params) => {
@@ -110,9 +110,9 @@
const [registerTable, {reload},{ rowSelection, selectedRowKeys }] = tableContext
const labelCol = reactive({
xs:24,
- sm:4,
- xl:6,
- xxl:4
+ sm:8,
+ xl:8,
+ xxl:8
});
const wrapperCol = reactive({
xs: 24,
@@ -151,14 +151,21 @@
function getTableAction(record){
return [
{
- label: '损坏',
+ label: '绑定区域',
onClick: handleDeviceBroken.bind(null, record),
- ifShow: (record.onlineStatus!='待集成' && record.deviceStatus != '损坏')
+ // ifShow: record.onlineStatus!='待集成' && record.dimension == '区域维度' && record.nuId == null
+ ifShow: record.dimension == '区域维度' && record.nuId == null
},
{
label: '更换',
onClick: handleDeviceGh.bind(null, record),
- ifShow: (record.onlineStatus!='待集成' && record.dimension == '区域维度' && record.deviceStatus != '损坏')
+ // ifShow: (record.onlineStatus!='待集成' && record.dimension == '区域维度') && record.nuId != null
+ ifShow: (record.dimension == '区域维度') && record.nuId != null
+ },
+ {
+ label: '损坏',
+ onClick: handleDeviceBroken.bind(null, record),
+ // ifShow: record.onlineStatus!='待集成'
},
]
}
diff --git a/src/views/iot/manager/components/DeviceBrokenForm.vue b/src/views/iot/manager/components/DeviceBrokenForm.vue
index 315274f..18eb016 100644
--- a/src/views/iot/manager/components/DeviceBrokenForm.vue
+++ b/src/views/iot/manager/components/DeviceBrokenForm.vue
@@ -44,6 +44,7 @@ const formData = reactive>({
deviceModel: undefined,
factory: undefined,
sn: undefined,
+ ywId: undefined,
optType: '损坏'
});
const { createMessage } = useMessage();
diff --git a/src/views/iot/manager/components/DeviceGhForm.vue b/src/views/iot/manager/components/DeviceGhForm.vue
index df4f12b..e609bbf 100644
--- a/src/views/iot/manager/components/DeviceGhForm.vue
+++ b/src/views/iot/manager/components/DeviceGhForm.vue
@@ -57,6 +57,7 @@ const formData = reactive>({
deviceModel: undefined,
factory: undefined,
sn: undefined,
+ ywId: undefined,
optType: '换绑'
});
const { createMessage } = useMessage();
diff --git a/src/views/iot/manager/components/preview/DevicePreviewForm.vue b/src/views/iot/manager/components/preview/DevicePreviewForm.vue
index 604b1a6..67a2a57 100644
--- a/src/views/iot/manager/components/preview/DevicePreviewForm.vue
+++ b/src/views/iot/manager/components/preview/DevicePreviewForm.vue
@@ -47,6 +47,7 @@ const emit = defineEmits(['register', 'ok']);
const formData = reactive>({
id: undefined,
sn: undefined,
+ ywId: undefined,
remarks: undefined,
});
const { createMessage } = useMessage();
diff --git a/src/views/iot/manager/manager.data.ts b/src/views/iot/manager/manager.data.ts
index 935e5c9..8760c8f 100644
--- a/src/views/iot/manager/manager.data.ts
+++ b/src/views/iot/manager/manager.data.ts
@@ -37,6 +37,11 @@ export const columns: BasicColumn[] = [
align: "center",
dataIndex: 'sn',
},
+ {
+ title: '设备名称',
+ align: "center",
+ dataIndex: 'deviceName',
+ },
{
title: '设备类型',
align: "center",
@@ -56,11 +61,23 @@ export const columns: BasicColumn[] = [
title: '设备状态',
align: "center",
dataIndex: 'deviceStatus',
+ customRender:({record})=>{
+ if(record.deviceStatus==null || record.deviceStatus==''){
+ return "-";
+ }else{
+ return record.deviceStatus;
+ }
+ },
},
];
//列表数据
export const previewColumns: BasicColumn[] = [
+ {
+ title: '设备名称',
+ align: "center",
+ dataIndex: 'deviceName',
+ },
{
title: '设备类型',
align: "center",