From 6fdb3366e50e92f5a14e431ed3de0f8d83b93f43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Tue, 17 Oct 2023 00:04:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/projectVideo.vue | 107 ++++++++++++++++++++-----------------
 1 file changed, 57 insertions(+), 50 deletions(-)

diff --git a/src/pages/projectVideo.vue b/src/pages/projectVideo.vue
index 326b83a..a306a6e 100644
--- a/src/pages/projectVideo.vue
+++ b/src/pages/projectVideo.vue
@@ -3,7 +3,7 @@
             <div class="screen-content">
                 <!-- <div class="analyse-equipment analyse-equipment-position">视频监控</div> -->
                 <el-row>
-                    <el-col :span="6">
+                    <!-- <el-col :span="6">
                         <module-one-1-1 label="视频概况" :amplify="true" name="amplify-spjk">
                             <div class="equipment-list-max">
                                 <el-row>
@@ -63,27 +63,24 @@
                                 </div>
                             </div>
                         </module-one-2-1>                        
-                    </el-col>
+                    </el-col> -->
                     <el-col :span="3">
                         <module-one-3-1 label="视频列表">
                             <div class="video-list-max">
                                 <div class="video-list-min">
                                     <div class="video-list-for" v-for="item in videoListData">
-                                        <div class="video-list-title">{{item.project_abbreviation}}</div>
-                                        <el-collapse-transition>
-                                            <ul class="video-list-ul" v-show="item.type">
-                                                <li :class="video.type==true?'active':''" v-for="(video,idx) in item.videoList" @click.stop="handlePlay(video,idx)">
-                                                    <button :class="video.signalState == 1?'video-state-zx':'video-state-lx'"></button>
-                                                    <span>{{video.videoName}}</span>
-                                                </li>
-                                            </ul>
-                                        </el-collapse-transition>
+                                        <ul class="video-list-ul" v-show="item.type">
+                                            <li :class="video.type==true?'active':''" v-for="(video,idx) in item.videoList" @click.stop="handlePlay(video,idx)">
+                                                <button :class="video.signalState == 1?'video-state-zx':'video-state-lx'"></button>
+                                                <span>{{video.videoName}}</span>
+                                            </li>
+                                        </ul>
                                     </div>
                                 </div>
                             </div>
                         </module-one-3-1>
                     </el-col>
-                    <el-col :span="15">
+                    <el-col :span="21">
                         <module-one-video>
                             <div class="video-enlarge-max" v-if="videoType">
                                 <div class="video-enlarge-title">
@@ -1431,52 +1428,52 @@ export default {
             this.request.replace("{{videoDvrNumber}}", it.videoDvrNumber)
             );
         },
-            //查询视频通道
-    initVideo(videoDvrNumber, url) {
-      let that = this;
-      this.$api.video.getVideoPassage(videoDvrNumber).then((response) => {
-        let data = response.data;
-        this.videoPassageList = data;
-        that.showVideo = true;
-        data.forEach((it, idx) => {
-          if (idx == 0) {
-            that.url0 = url.replace("{{passage}}", it.passageValue);
-          }
-          if (idx == 1) {
-            that.url1 = url.replace("{{passage}}", it.passageValue);
-          }
-          if (idx == 2) {
-            that.url2 = url.replace("{{passage}}", it.passageValue);
-          }
-          if (idx == 3) {
-            that.url3 = url.replace("{{passage}}", it.passageValue);
-          }
+        //查询视频通道
+        initVideo(videoDvrNumber, url) {
+        let that = this;
+        this.$api.video.getVideoPassage(videoDvrNumber).then((response) => {
+            let data = response.data;
+            this.videoPassageList = data;
+            that.showVideo = true;
+            data.forEach((it, idx) => {
+            if (idx == 0) {
+                that.url0 = url.replace("{{passage}}", it.passageValue);
+            }
+            if (idx == 1) {
+                that.url1 = url.replace("{{passage}}", it.passageValue);
+            }
+            if (idx == 2) {
+                that.url2 = url.replace("{{passage}}", it.passageValue);
+            }
+            if (idx == 3) {
+                that.url3 = url.replace("{{passage}}", it.passageValue);
+            }
+            });
         });
-      });
-    },
+        },
         handleOnError0(error) {
-        this.showVideoView0 = false;
-        console.log("error: ", error);
-        this.updatePassageState(this.videoPassageList[0].id);
+            //this.showVideoView0 = false;
+            console.log("error: ", error);
+            //this.updatePassageState(this.videoPassageList[0].id);
         },
         handleOnError1(error) {
-        this.showVideoView1 = false;
-        console.log("error: ", error);
-        this.updatePassageState(this.videoPassageList[1].id);
+            //this.showVideoView1 = false;
+            console.log("error: ", error);
+            //this.updatePassageState(this.videoPassageList[1].id);
         },
         handleOnError2(error) {
-        this.showVideoView2 = false;
-        console.log("error: ", error);
-        this.updatePassageState(this.videoPassageList[2].id);
+            //this.showVideoView2 = false;
+            console.log("error: ", error);
+            //this.updatePassageState(this.videoPassageList[2].id);
         },
         handleOnError3(error) {
-        this.showVideoView3 = false;
-        console.log("error: ", error);
-        this.updatePassageState(this.videoPassageList[3].id);
+            //this.showVideoView3 = false;
+            console.log("error: ", error);
+            //this.updatePassageState(this.videoPassageList[3].id);
         },
         updatePassageState(id) {
-        //没有好思路，这里先注释
-        //this.$api.video.editPassageState(id,this.videoDvrNumber,"2");
+            //没有好思路，这里先注释
+            //this.$api.video.editPassageState(id,this.videoDvrNumber,"2");
         },
 
     },
@@ -1490,12 +1487,22 @@ export default {
 .videoView {
     color: aliceblue;
     float: left;
-    width: 50%;
-    height: 452.5px;
+    width: 49.5%;
+    height: 458px;
+    margin-bottom:2px;
+    margin-top:2px;
+    margin-left:5px;
+    margin-right:3px;
 }
 .videoViewError {
     background-color: #575e65;
     text-align: center;
     line-height: 420px;
 }
+.video-enlarge-max{
+    padding:0 !important;
+}
+.video-enlarge-content{
+    overflow: hidden;
+}
 </style>
\ No newline at end of file