调整设备集成状态

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"

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,
   });
 
   /**

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>

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>

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>

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>

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>

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();