类型：开发

描述：

package-lock.json

@@ -25,7 +25,7 @@
         "vue-router": "^4.4.5",
         "vue3-seamless-scroll": "^2.0.1",
         "vuedraggable": "^4.1.0",
-        "whepts": "^1.0.2"
+        "whepts": "^1.1.12"
       },
       "devDependencies": {
         "@vitejs/plugin-vue": "^5.2.1",
@@ -3335,6 +3335,12 @@
       "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==",
       "license": "MIT"
     },
+    "node_modules/eventemitter3": {
+      "version": "5.0.4",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-5.0.4.tgz",
+      "integrity": "sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==",
+      "license": "MIT"
+    },
     "node_modules/events": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
@@ -4324,6 +4330,21 @@
         "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
+    "node_modules/nanostores": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/nanostores/-/nanostores-1.1.0.tgz",
+      "integrity": "sha512-yJBmDJr18xy47dbNVlHcgdPrulSn1nhSE6Ns9vTG+Nx9VPT6iV1MD6aQFp/t52zpf82FhLLTXAXr30NuCnxvwA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "engines": {
+        "node": "^20.0.0 || >=22.0.0"
+      }
+    },
     "node_modules/neo-async": {
       "version": "2.6.2",
       "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
@@ -6167,10 +6188,14 @@
       "license": "MIT"
     },
     "node_modules/whepts": {
-      "version": "1.0.2",
+      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/whepts/-/whepts-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/whepts/-/whepts-1.1.12.tgz",
-      "integrity": "sha512-9P0OP514Z2ZR2ev7qMOApplw6ERMChqgPi6eWWn6HTlTpDV0gW7Zqs4kLAKIV7xqxXCDNDCorxNz8ekOYAEp5g==",
+      "integrity": "sha512-KllGslriMAhD6BDBbG6X653M8XgeYqxnjuEyaB7U/1nIZN6NoAGSWP3Av46g690r2UaaI69bNzfPn4efJBd+kA==",
-      "license": "MIT"
+      "license": "MIT",
+      "dependencies": {
+        "eventemitter3": "^5.0.4",
+        "nanostores": "^1.1.0"
+      }
     },
     "node_modules/which": {
       "version": "2.0.2",

package.json

@@ -26,7 +26,7 @@
     "vue-router": "^4.4.5",
     "vue3-seamless-scroll": "^2.0.1",
     "vuedraggable": "^4.1.0",
-    "whepts": "^1.0.2"
+    "whepts": "^1.1.12"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.1",

src/components/HlsPlayer/index.vue

@@ -159,20 +159,26 @@ export default {
 
     initializePlayer() {
       if (!this.isActive || !this.url) return
-
       // 如果是重新初始化播放器，先清理已存在的资源
-      if (this.hls) {
-        this.immediateCleanup()
-      }
       if(this.url.startsWith('http://192.168.77.200:8050/')){
         this.hls = new WebRTCWhep({
           url: this.url, // WHEP 服务器地址
           container: this.video, // 视频播放容器
-          onError: (error) => {
+          iceServers: [{ urls: 'turn:192.168.77.200:3478',username: 'ZLMediaKit',credential: 'ZLMediaKit'}]
-            console.error('播放错误:', error)
+        })
+        this.hls.on('error', (error) => {
+          console.error('错误:', error.message, error.type)
+          if(error.type ==='REQUEST_ERROR' || error.type ==='NOT_FOUND_ERROR'){
+            this.initializePlayer();
           }
         })
+        this.hls.on('play:failed', (err) => {
+          // this.initializePlayer();
+        })
       }else{
+        if (this.hls) {
+          this.immediateCleanup()
+        }
         this.hls = new Hls({
           // 内存优化配置
           maxBufferSize: 0, // 降低缓冲区大小（15MB）

src/components/Title3/index.vue

@@ -16,7 +16,7 @@
 <style scoped lang="scss">
   .title-3 {
     position: relative;
-    min-width: vw(400);
+    // min-width: vw(400);
     height: vh(22);
     margin-top: vh(20);
     background-image: url('@/assets/images/title-6.png');

src/layout/components/CoreVideo/allList.vue

@@ -122,17 +122,25 @@
   const createPlayer = (cameraIndexCode,videoElement) => {
     getPreviewUrlApi({
       type: 'hls',
-      cameraIndexCode: cameraIndexCode
+      cameraIndexCode: cameraIndexCode,
+      subStream:1
     }).then(res=>{
       const url = res.data.url;
       if(url.startsWith('http://192.168.77.200:8050/')){
         const player = new WebRTCWhep({
           url: url, // WHEP 服务器地址
           container: videoElement, // 视频播放容器
-          onError: (error) => {
+          iceServers: [{ urls: 'turn:192.168.77.200:3478',username: 'ZLMediaKit',credential: 'ZLMediaKit'}]
-            console.error('播放错误:', error)
+        })
+        player.on('error', (error) => {
+          console.error('错误:', error.message, error.type)
+          if(error.type ==='REQUEST_ERROR' || error.type ==='NOT_FOUND_ERROR'){
+            createPlayer(cameraIndexCode,videoElement);
           }
         })
+        player.on('play:failed', (err) => {
+          // createPlayer(cameraIndexCode,videoElement);
+        })
         webrtcRefs.push(player)
       }
       else{

src/layout/components/CoreVideo/index.vue

@@ -92,7 +92,8 @@ let isCollect = ref(0)
   const getPreviewUrl = async (code) => {
     let res = await getPreviewUrlApi({
       cameraIndexCode: code,
-      type: 'hls'
+      type: 'hls',
+      subStream:1
     })
     src.value = res.data.url
     videoShow.value = true

src/views/collect/components/video-box.vue

@@ -246,7 +246,8 @@ const handleCamera = async (itemCode,resource,index) => {
   show.value = true
   let res = await getPreviewUrlApi({
     type: 'hls',
-    cameraIndexCode:itemCode
+    cameraIndexCode:itemCode,
+    sub_stream: 0
   })
   cameraIndexCode.value = itemCode;
   isCollect.value = resource.isCollect
@@ -297,17 +298,25 @@ const handleItemVideo = (url, type, code,item) => {
 const createPlayer = (cameraIndexCode,videoElement) => {
   getPreviewUrlApi({
     type: 'hls',
-    cameraIndexCode: cameraIndexCode
+    cameraIndexCode: cameraIndexCode,
+    subStream:1
   }).then(res=>{
     const url = res.data.url;
     if(url.startsWith('http://192.168.77.200:8050/')){
       const player = new WebRTCWhep({
         url: url, // WHEP 服务器地址
         container: videoElement, // 视频播放容器
-        onError: (error) => {
+        iceServers: [{ urls: 'turn:192.168.77.200:3478',username: 'ZLMediaKit',credential: 'ZLMediaKit'}]
-          console.error('播放错误:', error)
+      })
+      player.on('error', (error) => {
+        console.error('错误:', error.message, error.type)
+        if(error.type ==='REQUEST_ERROR' || error.type ==='NOT_FOUND_ERROR'){
+          createPlayer(cameraIndexCode,videoElement);
         }
       })
+      player.on('play:failed', (err) => {
+        // createPlayer(cameraIndexCode,videoElement);
+      })
       webrtcRefs.push(player)
     }
     else{

src/views/home/components/box-1.vue

@@ -31,8 +31,9 @@
             <span v-else class="statistic-value">暂无</span>
           </div>
         </div>
-        <div class="flex rela">
+        <div class=" rela">
-          <Title3 title="景区排队人数" />
+          <Title3 title="景区排队人数"/>
+		  
         </div>
         <div class="pt-20">
           <Line

src/views/home/components/box-2.vue

@@ -65,7 +65,7 @@
 		</div>
 		<div style="display: flex;">
 			<!-- 车船信息 -->
-			<div class="flex" style="flex:1;margin-left: 14px;">
+			<div class="flex" style="flex:1;">
 			  <div class="car-ship">
 			    <div class="mb-6">
 			      <div class="car">
@@ -149,8 +149,7 @@
 			</div>
 			<!-- 酒店入住 -->
 			<div class="hotel" >
-
+			  <div>
-			  <div >
 			    <div class="item">
 			      <div class="label">接入总数</div>
 			      <countup class="value" :end-val="homeStore.hotelData?.info?.hotel_count || 0" />
@@ -895,8 +894,8 @@
 		top:vh(110);
 	}
     .header {
-	 
+
-	 
+
       height: vh(128);
       padding: 0 vw(40);
       box-sizing: border-box;
@@ -1113,11 +1112,11 @@
           }
           &-tag--important {
             @extend .item-tag;
-            background: #feae00;
+            background: #d9011b;
           }
           &-tag--warn {
             @extend .item-tag;
-            background: #d9011b;
+            background: #feae00;
           }
           &-tag--normal {
             @extend .item-tag;

src/views/hotel/components/video-box.vue

@@ -146,7 +146,7 @@
 	          class="item"
 	          v-for="(item, index) in videoList"
 	          :key="index"
-	          @click="handleItemVideo(item.hlsUrl, 101, item.handleItemVideo,item)"
+	          @click="handleItemVideo(item.hlsUrl, 101, item.cameraIndexCode,item)"
 	        >
 	          <div>
 	            <p class="item-title--primary">
@@ -303,7 +303,8 @@ const handleCamera = async (itemCode,resource) => {
   show.value = true
   let res = await getPreviewUrlApi({
     type: 'hls',
-    cameraIndexCode:itemCode
+    cameraIndexCode:itemCode,
+    subStream:0
   })
   cameraIndexCode.value = itemCode;
   isCollect.value = resource.isCollect
@@ -339,17 +340,25 @@ const currentChange = (e) => {
 const createPlayer = (cameraIndexCode,videoElement) => {
   getPreviewUrlApi({
     type: 'hls',
-    cameraIndexCode: cameraIndexCode
+    cameraIndexCode: cameraIndexCode,
+    subStream:1
   }).then(res=>{
     const url = res.data.url;
     if(url.startsWith('http://192.168.77.200:8050/')){
       const player = new WebRTCWhep({
         url:url, // WHEP 服务器地址
         container: videoElement, // 视频播放容器
-        onError: (error) => {
+        iceServers: [{ urls: 'turn:192.168.77.200:3478',username: 'ZLMediaKit',credential: 'ZLMediaKit'}]
-          console.error('播放错误:', error)
+      })
+      player.on('error', (error) => {
+        console.error('错误:', error.message, error.type)
+        if(error.type ==='REQUEST_ERROR' || error.type ==='NOT_FOUND_ERROR'){
+          createPlayer(cameraIndexCode,videoElement);
         }
       })
+      player.on('play:failed', (err) => {
+        // createPlayer(cameraIndexCode,videoElement);
+      })
       webrtcRefs.push(player)
     }
     else{
@@ -419,7 +428,8 @@ let thisVideo = ref(null)
 const handleItemVideo = async (url, type, code, item) => {
   let res = await getPreviewUrlApi({
     cameraIndexCode: code,
-    type: 'hls'
+    type: 'hls',
+    subStream:0
   })
   url = res.data.url
   thisVideo.value = item
@@ -430,10 +440,17 @@ const handleItemVideo = async (url, type, code, item) => {
       hlsRef = new WebRTCWhep({
         url: url, // WHEP 服务器地址
         container: videoRef.value, // 视频播放容器
-        onError: (error) => {
+        iceServers: [{ urls: 'turn:192.168.77.200:3478',username: 'ZLMediaKit',credential: 'ZLMediaKit'}]
-          console.error('播放错误:', error)
+      })
+      hlsRef.on('error', (error) => {
+        console.error('错误:', error.message, error.type)
+        if(error.type ==='REQUEST_ERROR' || error.type ==='NOT_FOUND_ERROR'){
+          handleItemVideo(url, type, code, item);
         }
       })
+      hlsRef.on('play:failed', (err) => {
+        // handleItemVideo(url, type, code, item);
+      })
     } else {
       hlsRef = new Hls({
         maxBufferLength: 10, // 最大缓冲长度（秒）

src/views/monitor/components/box-2.vue

@@ -165,7 +165,7 @@
             class="item"
             v-for="(item, index) in videoList"
             :key="index"
-            @click="handleItemVideo(item.hlsUrl, 101, item.handleItemVideo,item)"
+            @click="handleItemVideo(item.hlsUrl, 101, item.cameraIndexCode,item)"
           >
             <div>
               <p class="item-title--primary">
@@ -258,17 +258,25 @@
   const createPlayer = (cameraIndexCode,videoElement) => {
     getPreviewUrlApi({
       type: 'hls',
-      cameraIndexCode: cameraIndexCode
+      cameraIndexCode: cameraIndexCode,
+      subStream:1
     }).then(res=>{
       const url = res.data.url;
       if(url.startsWith('http://192.168.77.200:8050/')){
         const player = new WebRTCWhep({
           url: url, // WHEP 服务器地址
           container: videoElement, // 视频播放容器
-          onError: (error) => {
+          iceServers: [{ urls: 'turn:192.168.77.200:3478',username: 'ZLMediaKit',credential: 'ZLMediaKit'}]
-            console.error('播放错误:', error)
+        })
+        player.on('error', (error) => {
+          console.error('错误:', error.message, error.type)
+          if(error.type ==='REQUEST_ERROR' || error.type ==='NOT_FOUND_ERROR'){
+            createPlayer(cameraIndexCode,videoElement);
           }
         })
+        player.on('play:failed', (err) => {
+          // createPlayer(cameraIndexCode,videoElement);
+        })
         webrtcRefs.push(player)
       }
       else{
@@ -389,7 +397,8 @@
   const handleItemVideo = async (url, type, code, item) => {
     let res = await getPreviewUrlApi({
       cameraIndexCode: code,
-      type: 'hls'
+      type: 'hls',
+      subStream:0
     })
     url = res.data.url
     thisVideo.value = item
@@ -400,10 +409,17 @@
         hlsRef = new WebRTCWhep({
           url: url, // WHEP 服务器地址
           container: videoRef.value, // 视频播放容器
-          onError: (error) => {
+          iceServers: [{ urls: 'turn:192.168.77.200:3478',username: 'ZLMediaKit',credential: 'ZLMediaKit'}]
-            console.error('播放错误:', error)
+        })
+        hlsRef.on('error', (error) => {
+          console.error('错误:', error.message, error.type)
+          if(error.type ==='REQUEST_ERROR' || error.type ==='NOT_FOUND_ERROR'){
+            handleItemVideo(url, type, code, item);
           }
         })
+        hlsRef.on('play:failed', (err) => {
+          // handleItemVideo(url, type, code, item);
+        })
       } else {
         hlsRef = new Hls({
           maxBufferLength: 10, // 最大缓冲长度（秒）
@@ -451,7 +467,8 @@
     show.value = true
     let res = await getPreviewUrlApi({
       type: 'hls',
-      cameraIndexCode: itemCode
+      cameraIndexCode: itemCode,
+      subStream: 0
     })
     cameraIndexCode.value = itemCode;
     isCollect.value = resource.isCollect
@@ -708,7 +725,7 @@
 
       .tree-box {
         position: relative;
-        // height: vh(490);
+         height: vh(1080);
         padding: 0 vw(20);
 		padding-right:0;
 		padding-bottom:vw(10);

src/views/traffic/components/box-2.vue

@@ -191,7 +191,8 @@
   const getPreviewUrl = async (code) => {
     let res = await getPreviewUrlApi({
       cameraIndexCode: code,
-      type: 'hls'
+      type: 'hls',
+      subStream:0
     })
     src.value = res.data.url
     videoShow.value = true