Merge branch 'qhse_fix' of shuzhihua/pms-iot-vue into master

src/views/pms/video_center/sip/components/player/DeviceTree.vue

@@ -20,7 +20,7 @@
           <span
             v-if="data.type === 0 && data.online"
             title="在线设备"
-            class="device-online iconfont icon-jiedianleizhukongzhongxin2"
+            class="device-online iconfont icon-jiedianleizhukongzhongxin2 w-5 h-5 rounded-full bg-green-500"
           ></span>
           <span
             v-if="data.type === 0 && !data.online"
@@ -30,7 +30,7 @@
           <span
             v-if="data.type === 3 && data.online"
             title="在线通道"
-            class="device-online iconfont icon-shebeileijiankongdian"
+            class="device-online iconfont icon-shebeileijiankongdian w-5 h-5 rounded-full bg-green-500"
           ></span>
           <span
             v-if="data.type === 3 && !data.online"
@@ -67,9 +67,11 @@
             title="离线通道-枪机"
             class="device-offline iconfont icon-shebeileiqiangjitongdao"
           ></span>
-          <span v-if="data.online" style="padding-left: 1px" class="device-online">{{
-            node.label
-          }}</span>
+
+          <span v-if="data.online" style="padding-left: 1px" class="device-online"
+            >{{ node.label }}
+          </span>
+
           <span v-if="!data.online" style="padding-left: 1px" class="device-offline">{{
             node.label
           }}</span>
@@ -237,7 +239,7 @@ const channelDataHandler = (data, resolve) => {
         id: item.id,
         deviceId: item.deviceId,
         type: type,
-        online: item.status === 3,
+        online: item.basicData.status === 3,
         userData: item.basicData
       }
 

src/views/pms/video_center/sip/splitview.vue

@@ -315,7 +315,9 @@ const clickEvent = async (data) => {
     loading.value = true
     try {
       const channels = await getDeviceChannels(deviceId)
-      const cameraChannels = channels.filter((channel) => channel.basicData.model === 'Camera')
+      const cameraChannels = channels.filter(
+        (channel) => channel.basicData.model === 'Camera' && channel.basicData.status === 3
+      )
       availableChannels.value = cameraChannels
 
       playerInfo.value = []
@@ -339,6 +341,11 @@ const clickEvent = async (data) => {
   }
   // 情况2：点击的是具体的通道节点
   else if (data.userData?.channelSipId) {
+    console.log('点击了通道节点，数据:', data)
+    if (data.online === false) {
+      ElMessage.warning('通道未在线')
+      return
+    }
     // 检查是否有选中的空闲槽位
     let targetIndex = selectedEmptySlot.value !== -1 ? selectedEmptySlot.value : playerIdx.value