From d484dbad49d891e61bd32962b5cbaee657087293 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Mon, 27 Apr 2026 15:29:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E5=A4=87=E9=9B=86?=
 =?UTF-8?q?=E6=88=90=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/config/DeviceConfigList.vue              | 2 +-
 src/views/device/manager/DeviceManagerList.vue            | 8 ++++----
 .../device/manager/components/integration/CameraList.vue  | 2 +-
 .../manager/components/integration/ElectricityList.vue    | 2 +-
 .../device/manager/components/integration/HumidList.vue   | 2 +-
 .../device/manager/components/integration/NetworkList.vue | 2 +-
 .../device/manager/components/integration/WaterList.vue   | 2 +-
 .../iot/tplink/camera/components/CameraPreviewModal.vue   | 2 +-
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/device/config/DeviceConfigList.vue b/src/views/device/config/DeviceConfigList.vue
index 025e0c9..c18f526 100644
--- a/src/views/device/config/DeviceConfigList.vue
+++ b/src/views/device/config/DeviceConfigList.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="p-2">
     <!--查询区域-->
     <div class="jeecg-basic-table-form-container">
       <a-form ref="formRef" :model="queryParam" :label-col="labelCol"
diff --git a/src/views/device/manager/DeviceManagerList.vue b/src/views/device/manager/DeviceManagerList.vue
index a9adc48..aefbb98 100644
--- a/src/views/device/manager/DeviceManagerList.vue
+++ b/src/views/device/manager/DeviceManagerList.vue
@@ -96,13 +96,13 @@
   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,
-    sm: 20,
+    sm: 16,
   });
 
   /**
diff --git a/src/views/device/manager/components/integration/CameraList.vue b/src/views/device/manager/components/integration/CameraList.vue
index 29159c0..6929b74 100644
--- a/src/views/device/manager/components/integration/CameraList.vue
+++ b/src/views/device/manager/components/integration/CameraList.vue
@@ -11,7 +11,7 @@
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
       <template #deviceStatus="{ record  }">
-        <span v-if="record.deviceStatus === '待集成'" style="color:red">
+        <span v-if="record.deviceStatus === '待标识' || record.deviceStatus === '待集成'" style="color:red">
           {{ record.deviceStatus }}
         </span>
       </template>
diff --git a/src/views/device/manager/components/integration/ElectricityList.vue b/src/views/device/manager/components/integration/ElectricityList.vue
index 3059d80..b17ad1d 100644
--- a/src/views/device/manager/components/integration/ElectricityList.vue
+++ b/src/views/device/manager/components/integration/ElectricityList.vue
@@ -11,7 +11,7 @@
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
       <template #deviceStatus="{ record  }">
-        <span v-if="record.deviceStatus === '待集成'" style="color:red">
+        <span v-if="record.deviceStatus === '待标识' || record.deviceStatus === '待集成'" style="color:red">
           {{ record.deviceStatus }}
         </span>
       </template>
diff --git a/src/views/device/manager/components/integration/HumidList.vue b/src/views/device/manager/components/integration/HumidList.vue
index cac5efb..cfd62a8 100644
--- a/src/views/device/manager/components/integration/HumidList.vue
+++ b/src/views/device/manager/components/integration/HumidList.vue
@@ -11,7 +11,7 @@
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
       <template #deviceStatus="{ record  }">
-        <span v-if="record.deviceStatus === '待集成'" style="color:red">
+        <span v-if="record.deviceStatus === '待标识' || record.deviceStatus === '待集成'" style="color:red">
           {{ record.deviceStatus }}
         </span>
       </template>
diff --git a/src/views/device/manager/components/integration/NetworkList.vue b/src/views/device/manager/components/integration/NetworkList.vue
index 2a4d12f..e1bd302 100644
--- a/src/views/device/manager/components/integration/NetworkList.vue
+++ b/src/views/device/manager/components/integration/NetworkList.vue
@@ -11,7 +11,7 @@
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
       <template #deviceStatus="{ record  }">
-        <span v-if="record.deviceStatus === '待集成'" style="color:red">
+        <span v-if="record.deviceStatus === '待标识' || record.deviceStatus === '待集成'" style="color:red">
           {{ record.deviceStatus }}
         </span>
       </template>
diff --git a/src/views/device/manager/components/integration/WaterList.vue b/src/views/device/manager/components/integration/WaterList.vue
index 5a56913..5d486b3 100644
--- a/src/views/device/manager/components/integration/WaterList.vue
+++ b/src/views/device/manager/components/integration/WaterList.vue
@@ -11,7 +11,7 @@
       <template v-slot:bodyCell="{ column, record, index, text }">
       </template>
       <template #deviceStatus="{ record  }">
-        <span v-if="record.deviceStatus === '待集成'" style="color:red">
+        <span v-if="record.deviceStatus === '待标识' || record.deviceStatus === '待集成'" style="color:red">
           {{ record.deviceStatus }}
         </span>
       </template>
diff --git a/src/views/iot/tplink/camera/components/CameraPreviewModal.vue b/src/views/iot/tplink/camera/components/CameraPreviewModal.vue
index 3206939..c38ddcf 100644
--- a/src/views/iot/tplink/camera/components/CameraPreviewModal.vue
+++ b/src/views/iot/tplink/camera/components/CameraPreviewModal.vue
@@ -263,7 +263,7 @@ async function createPreview() {
     socket: formData.wssUrl, // websocket地址, getPreviewUrl接口获取
     pluginPath: '/static', // 当sdk资源不在根路径下时，需配置pluginPath
     talkEnable: true,
-    useMultitrans: false,
+    useMultitrans: true,
   });
 
   let isPlaying = player.value.isPlaying();