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 @@
         </div>
 
         <div style="margin-top: 10px;padding: 14px;background-color: white;">
-          <span style="font-size: 16px;color:red;font-weight: 700;">提示：请联系平台运维组技术人员绑定物联设备！</span>
+          <span style="font-size: 16px;color:red;font-weight: 700;">提示：请在【物联设备】功能中绑定物联设备！</span>
         </div>
       </a-col>
     </a-row>
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 @@
 <template>
   <a-spin :spinning="confirmLoading">
     <a-row>
-      <a-col :span="24">
-        <a-button type="primary" @click="checkSxt" preIcon="ant-design:plus-outlined" style="margin-left:10px;"> 摄像头</a-button>
-        <a-button type="primary" @click="checkDb" preIcon="ant-design:plus-outlined" style="margin-left:10px;"> 电表</a-button>
-        <a-button type="primary" @click="checkSb" preIcon="ant-design:plus-outlined" style="margin-left:10px;"> 水表</a-button>
-        <a-button type="primary" @click="checkWsdj" preIcon="ant-design:plus-outlined" style="margin-left:10px;"> 温湿度计</a-button>
-      </a-col>
+<!--      <a-col :span="24">-->
+<!--        <a-button type="primary" @click="checkSxt" preIcon="ant-design:plus-outlined" style="margin-left:10px;"> 摄像头</a-button>-->
+<!--        <a-button type="primary" @click="checkDb" preIcon="ant-design:plus-outlined" style="margin-left:10px;"> 电表</a-button>-->
+<!--        <a-button type="primary" @click="checkSb" preIcon="ant-design:plus-outlined" style="margin-left:10px;"> 水表</a-button>-->
+<!--        <a-button type="primary" @click="checkWsdj" preIcon="ant-design:plus-outlined" style="margin-left:10px;"> 温湿度计</a-button>-->
+<!--      </a-col>-->
       <a-col :span="24">
         <a-row>
             <SxtList :tableData="dataList.cameraInfoList" @ok="hadleSuccess"></SxtList>
@@ -15,6 +15,15 @@
             <WsdjList :tableData="dataList.humidDeviceList" @ok="hadleSuccess"></WsdjList>
         </a-row>
       </a-col>
+      <a-col v-if="dataList?.cameraInfoList.length == 0 && dataList?.electricityMeterList.length == 0 && dataList?.waterMeterList.length == 0 && dataList?.humidDeviceList.length == 0"
+             span="24">
+        <div style="margin: 30px auto;">
+          <a-empty />
+        </div>
+        <div style="margin-top: 10px;padding: 14px;background-color: white;">
+          <span style="font-size: 16px;color:red;font-weight: 700;">提示：请在【物联设备】功能中绑定物联设备！</span>
+        </div>
+      </a-col>
     </a-row>
     <CheckSxtModal ref="checkSxtModal" @success="handleSuccess"/>
     <CheckDbModal ref="checkDbModal" @success="handleSuccess"/>
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<Record<string, any>>({
   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<Record<string, any>>({
   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<Record<string, any>>({
   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",