From 206fec9c18666ab6f61fdf9249eda6ac42bb3021 Mon Sep 17 00:00:00 2001
From: qiudan <1044775178@qq.com>
Date: Thu, 23 Nov 2023 13:48:11 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/flv/index.html                 | 55 ++++++++++++++++++++-------
 src/components/chart/detailDialog.vue |  4 +-
 src/components/chart/regionTable.vue  |  4 +-
 src/components/chart/tableShow.vue    |  4 +-
 src/views/AnalysisMain.vue            |  6 ++-
 5 files changed, 52 insertions(+), 21 deletions(-)
diff --git a/public/flv/index.html b/public/flv/index.html
index bc123c4..20f5538 100644
--- a/public/flv/index.html
+++ b/public/flv/index.html
@@ -1,6 +1,6 @@
-
 <!DOCTYPE html>
 <html lang="en">
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -10,58 +10,67 @@
     video::-webkit-media-controls-timeline {
         display: block;
     }
+
     /* 播放按钮 */
     video::-webkit-media-controls-play-button {
         display: none;
     }
+
     /* //进度条 */
     video::-webkit-media-controls-timeline {
         display: none;
     }
+
     /* //观看的当前时间 */
-    video::-webkit-media-controls-current-time-display{
-        display: none;            
+    video::-webkit-media-controls-current-time-display {
+        display: none;
     }
+
     /* //剩余时间 */
     video::-webkit-media-controls-time-remaining-display {
-        display: none;            
+        display: none;
     }
+
     /* //音量按钮 */
     video::-webkit-media-controls-mute-button {
-        display: none;            
+        display: none;
     }
+
     video::-webkit-media-controls-toggle-closed-captions-button {
-        display: none;            
+        display: none;
     }
+
     /* //音量的控制条 */
     video::-webkit-media-controls-volume-slider {
-        display: none;            
+        display: none;
     }
+
     video::-webkit-media-controls-overflow-button {
         display: none;
     }
 </style>
+
 <body>
     <script src="flv.min.js"></script>
-    <video id="videoElement" style="width: 381px;height: 214px;" muted controls="controls" ></video>
+    <video id="videoElement" style="width: 381px;height: 214px;" muted controls="controls"></video>
 
     <script>
         var ip = window.location.host;
         if (flvjs.isSupported()) {
-            console.log(getParam('src'),"getParam('src')");
+            console.log("getParam('src')-",getParam('src'));
             var videoElement = document.getElementById('videoElement');
             var flvPlayer = flvjs.createPlayer({
                 type: 'flv',
                 isLive: true,
-                // url: 'ws://172.16.1.168:12309/rtsp/1/a/?url='+getParam('src').replace(/\s+/g, '')
-                // url:getParam('src')
-                url:'ws://'+ip.split(':')[0]+':12309/rtsp/1/a/?url='+getParam('src').replace(/\s+/g, '')
+                url:getNewurl(),//新逻辑
+                // url: 'ws://172.16.1.168:12309/rtsp/1/a/?url=' + getParam('src').replace(/\s+/g, '')
+                // url:'ws://'+ip.split(':')[0]+':12309/rtsp/1/a/?url='+getParam('src').replace(/\s+/g, '')
             });
             flvPlayer.attachMediaElement(videoElement);
             flvPlayer.load();
             flvPlayer.play();
             // 监听 video 标签的事件，防止用户手动暂停
-            videoElement.addEventListener('pause', function(e) {
+            videoElement.addEventListener('pause', function (e) {
                 e.preventDefault();
                 videoElement.play(); // 重新播放视频
             });
@@ -73,6 +82,24 @@
             var r = location.search.substr(1).match(reg);
             if (r != null) return decodeURI(decodeURI(r[2]));
         }
+
+        function getNewurl() {
+            let src = getParam('src').replace(/\s+/g, '');
+            let url='ws://'+ip.split(':')[0]+':12309/rtsp';
+            // let url = 'ws://172.16.1.168:12309/rtsp';
+            // console.log('getNewurl',src)
+            if (src.includes("?")) {
+                let splitArray = src.split("?");
+                if (splitArray && splitArray.length > 0) {
+                    url = url + '/2/' + splitArray[1] + '/?url=' + splitArray[0]
+                }
+            } else {
+                url = url + '/1/a/?url=' + src;
+            }
+            console.log('getNewurl-return',url)
+            return url;
+        }
     </script>
 </body>
-</html>
+
+</html>
\ No newline at end of file
diff --git a/src/components/chart/detailDialog.vue b/src/components/chart/detailDialog.vue
index e3cf73b..67e84f8 100644
--- a/src/components/chart/detailDialog.vue
+++ b/src/components/chart/detailDialog.vue
@@ -1,13 +1,13 @@
 <template>
     <div>
-        <div class="down">
+        <!-- <div class="down">
             <el-dropdown trigger="click" @command="handleCommand">
                 <span class="moreIcon"></span>
                 <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item command="show">查看详情</el-dropdown-item>
                 </el-dropdown-menu>
             </el-dropdown>
-        </div>
+        </div> -->
         <el-dialog title="编辑" :visible.sync="dialogVisible" width="40%" :before-close="handleClose">
             <el-form label-width="80px">
                 <el-form-item label="val1">
diff --git a/src/components/chart/regionTable.vue b/src/components/chart/regionTable.vue
index d04b6e6..fe1941f 100644
--- a/src/components/chart/regionTable.vue
+++ b/src/components/chart/regionTable.vue
@@ -1,14 +1,14 @@
 <template>
     <!-- 区域的表格 -->
     <div class="tableContent">
-        <div class="down">
+        <!-- <div class="down">
             <el-dropdown trigger="click" @command="handleCommand">
                 <span class="moreIcon"></span>
                 <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item command="show">查看详情</el-dropdown-item>
                 </el-dropdown-menu>
             </el-dropdown>
-        </div>
+        </div> -->
 
         <div v-if="msg" class="regionBox">
             <!-- 实时触发 -->
diff --git a/src/components/chart/tableShow.vue b/src/components/chart/tableShow.vue
index 383d235..5697c89 100644
--- a/src/components/chart/tableShow.vue
+++ b/src/components/chart/tableShow.vue
@@ -1,14 +1,14 @@
 <template>
     <!-- 断面的表格 -->
     <div class="tableContent">
-        <div class="down">
+        <!-- <div class="down">
             <el-dropdown trigger="click" @command="handleCommand">
                 <span class="moreIcon"></span>
                 <el-dropdown-menu slot="dropdown">
                     <el-dropdown-item command="show">查看详情</el-dropdown-item>
                 </el-dropdown-menu>
             </el-dropdown>
-        </div>
+        </div> -->
         <!-- 实时触发 -->
 
         <!-- 实时触发 -->
diff --git a/src/views/AnalysisMain.vue b/src/views/AnalysisMain.vue
index 2aee10d..04ccc58 100644
--- a/src/views/AnalysisMain.vue
+++ b/src/views/AnalysisMain.vue
@@ -965,9 +965,13 @@ export default {
     padding: 0;
     float: right;
 }
-
+/* .imageBox{
+    width: 100%;
+    height: 210px;
+} */
 .image {
     width: 100%;
+    height: 213px;
     display: block;
 }
 
