删除无用代码

apps/web-antd/src/views/sis/acAdmin/index.vue

@@ -1,7 +1,9 @@
 <template>
   <Page :auto-content-height="true">
     <div class="flex h-full gap-[8px]">
-      <DpTree class="h-full w-[300px]" @checked="onNodeChecked" />
+      <div class="h-full tree-box">
+        <DpTree class="h-full w-[300px]" @checked="onNodeChecked" />
+      </div>
       <div class="bg-background flex-1">
         <div class="video-play-area flex h-full flex-wrap">
           <div

apps/web-antd/src/views/sis/video/channel-tree.vue

@@ -46,7 +46,7 @@ onMounted(loadChannelTree);
 </script>
 
 <template>
-  <div :class="$attrs.class">
+  <div class="h-[800px]" :class="$attrs.class">
     <Skeleton
       :loading="showTreeSkeleton"
       :paragraph="{ rows: 8 }"
@@ -54,12 +54,12 @@ onMounted(loadChannelTree);
       class="p-[8px]"
     >
       <div
-        class="bg-background flex h-full flex-col overflow-y-auto rounded-lg"
+        class="flex h-full flex-col overflow-y-auto rounded-lg"
       >
         <!-- 固定在顶部 必须加上bg-background背景色 否则会产生'穿透'效果 -->
-        <div
+        <divx
           v-if="showSearch"
-          class="bg-background z-100 sticky left-0 top-0 p-[8px]"
+          class="z-100 sticky left-0 top-0 p-[8px]"
         >
           <InputSearch
             v-model:value="searchValue"
@@ -72,7 +72,7 @@ onMounted(loadChannelTree);
               </a-button>
             </template>
           </InputSearch>
-        </div>
+        </divx>
         <div class="h-full overflow-x-hidden px-[8px]">
           <Tree
             v-bind="$attrs"

apps/web-antd/src/views/sis/video/index.vue

@@ -2,7 +2,12 @@
   <Page class="h-full w-full">
     <!--  设备分组区域  -->
     <div class="flex h-full gap-[8px]">
-      <ChannelTree class="h-full w-[300px]" @check="onNodeChecked" />
+      <div class="h-full pb-[5px] c-tree bg-background">
+        <ChannelTree
+          class="w-[300px]"
+          @check="onNodeChecked"
+        />
+      </div>
 
       <!--  设备分组区域  -->
       <div class="bg-background flex-1">
@@ -287,13 +292,12 @@ function streamProxy(nodeData: any, cb: Function) {
       pwd: nodeData.devicePwd,
       channelId: nodeData.channelNo,
     };
-
-    if (isSupportH265) {
-      addStreamProxy(params).then((res) => cb(res));
-    } else {
-      // addFFmpegStreamProxy(params).then((res) => cb(res));
-      addStreamProxy(params).then((res) => cb(res));
-    }
+  }
+  if (isSupportH265) {
+    addStreamProxy(params).then((res) => cb(res));
+  } else {
+    addFFmpegStreamProxy(params).then((res) => cb(res));
+    // addStreamProxy(params).then((res) => cb(res));
   }
 }
 
@@ -306,7 +310,7 @@ function doPlayer(nodeData: any, index: number = 0) {
   console.log('index=', index);
   if (mpegts.isSupported()) {
     streamProxy(nodeData, (res: AddStreamProxyResult) => {
-      const url = res.flv;
+      const url = res.wsFlv;
       // 将url 绑定到 nodeData
       nodeData.url = url;
       closePlayer(index);