From 55e84412221f13e89c8729894804cfa95f8b9c39 Mon Sep 17 00:00:00 2001
From: qiushui <wangyiming1031@aliyun.com>
Date: Mon, 10 Jan 2022 17:37:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=91=8A=E8=AD=A6=E5=BD=95=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/alarmVideos/alarmLog.vue | 53 ++++++++++--------------------
 src/views/alarmVideos/index.vue    | 40 ++++++++--------------
 src/views/alarmVideos/model.vue    | 38 ++++++++++++++++-----
 3 files changed, 60 insertions(+), 71 deletions(-)

diff --git a/src/views/alarmVideos/alarmLog.vue b/src/views/alarmVideos/alarmLog.vue
index 3bf74ae..b88205a 100644
--- a/src/views/alarmVideos/alarmLog.vue
+++ b/src/views/alarmVideos/alarmLog.vue
@@ -65,26 +65,18 @@
                  {{ text.status == null ? ' ' : text.status == 0 ? '正常' : '告警' }}
               </span>
           </span>
-            <span slot="videoPath1" slot-scope="row">
-              <a-button type="link" v-if="row.videoPath1" @click="showModel(row.videoPath1, row.cmd1)">
+            <span slot="videoPath1" slot-scope="text">
+              <a-button type="link" @click="showModel(text)">
                   查看视频
               </a-button>
-              <span v-else>
-                --
-              </span>
-          </span>
-            <span slot="videoPath2" slot-scope="row">
-              <a-button type="link" v-if="row.videoPath2" @click="showModel(row.videoPath2, row.cmd2)">
-                  查看视频
-              </a-button>
-              <span v-else>
-                --
-              </span>
+              
           </span>
+
         </a-table>
         <Model
             :visible.sync="visible"
-            :vid.sync="vid"
+            :vid1.sync="vid1"
+            :vid2.sync="vid2"
             @close="closeModel"
         />
     </div>
@@ -148,22 +140,18 @@ export default {
                 },
                 // TODO 日志合并
                 {
-                    title: "视频时长",
+                    title: "告警时长",
                     dataIndex: "timeLength",
                 },
                 {
-                    title: "球机1",
+                    title: "录像视频",
                     // dataIndex: "videoPath1",
                     scopedSlots: {customRender: 'videoPath1'}
-                },
-                {
-                    title: "球机2",
-                    // dataIndex: "videoPath2",
-                    scopedSlots: {customRender: 'videoPath2'}
                 }
             ],
             visible: false,
-            vid: '',
+            vid1: '',
+            vid2: '',
             streetList:[]
         }
     },
@@ -249,23 +237,16 @@ export default {
             this.time = []
             this.handleGetalarmLog()
         },
-        showModel(path, cmd) {
-            // 使用第三方软件打开海康视频
-            if(cmd) {
-                let params = {
-                    openCmd: cmd
-                };
-                this.$api.httpNodeApi.viewVideoAPI({params}).then(res=> {
-                    console.log(res);
-                })
-            }else {
-                this.visible = true
-                this.vid = videoUrl + path;
-            }
+        showModel(text) {
+        
+            this.visible = true
+            this.vid1 = videoUrl + text.videoPath1;
+            this.vid2 = videoUrl + text.videoPath2;
+            console.log(this.vid1)
         },
         closeModel(visible, data) {
             this.visible = visible
-            this.vid = data
+            this.vid1 = data
         },
     },
     components: {
diff --git a/src/views/alarmVideos/index.vue b/src/views/alarmVideos/index.vue
index a0975b5..d8af5a3 100644
--- a/src/views/alarmVideos/index.vue
+++ b/src/views/alarmVideos/index.vue
@@ -31,25 +31,16 @@
             @change="handleGetalarmList"
         >
           <span slot="videoPath1" slot-scope="text">
-              <a-button type="link" v-if="text.videoPath1" @click="showModel(text.videoPath1)">
+              <a-button type="link"  @click="showModel(text)">
                   查看视频
               </a-button>
-              <span v-else>
-                --
-              </span>
-          </span>
-            <span slot="videoPath2" slot-scope="text">
-              <a-button type="link" v-if="text.videoPath2" @click="showModel(text.videoPath2)">
-                  查看视频
-              </a-button>
-              <span v-else>
-                --
-              </span>
-          </span>
+              
+          </span> 
         </a-table>
         <Model
             :visible.sync="visible"
-            :vid.sync="vid"
+            :vid1.sync="vid1"
+            :vid2.sync="vid2"
             @close="closeModel"
         />
     </div>
@@ -96,22 +87,18 @@ export default {
                     dataIndex: "streetName",
                 },
                 {
-                    title: "视频时长",
+                    title: "告警时长",
                     dataIndex: "timeLength",
                 },
                 {
-                    title: "球机1",
+                    title: "视频录像",
                     // dataIndex: "videoPath1",
                     scopedSlots: {customRender: 'videoPath1'}
-                },
-                {
-                    title: "球机2",
-                    // dataIndex: "videoPath2",
-                    scopedSlots: {customRender: 'videoPath2'}
-                },
+                }
             ],
             visible: false,
-            vid: ''
+            vid1: '',
+            vid2:'',
         };
     },
     mounted() {
@@ -167,13 +154,14 @@ export default {
             this.queryParam.startTime = ""
             this.queryParam.endTime = ""
         },
-        showModel(data) {
+        showModel(text) {
             this.visible = true
-            this.vid = videoUrl + data
+            this.vid1 = videoUrl + text.videoPath1
+            this.vid2 = videoUrl + text.videoPath2
         },
         closeModel(visible, data) {
             this.visible = visible
-            this.vid = data
+            this.vid1 = data
         },
         reset() {
             this.queryParam.startTime = moment().subtract(1, "days").format('YYYY-MM-DD HH:mm:ss')
diff --git a/src/views/alarmVideos/model.vue b/src/views/alarmVideos/model.vue
index 0521fbf..8a8591c 100644
--- a/src/views/alarmVideos/model.vue
+++ b/src/views/alarmVideos/model.vue
@@ -16,13 +16,23 @@
             </div>
             <div class="test_two_box">
                 <video
-                    id="myVideo"
                     class="video-js"
                     :autoplay="true"
                     controls
                 >
                     <source
-                        :src="video"
+                        :src="video1"
+                        type="video/mp4"
+                    >
+                </video>
+                <video
+                   
+                    class="video-js"
+                    :autoplay="true"
+                    controls
+                >
+                    <source
+                        :src="video2"
                         type="video/mp4"
                     >
                 </video>
@@ -64,17 +74,26 @@
 </style>
 <script>
 export default {
-    props: ['visible', 'vid'],
+    props: ['visible', 'vid1', 'vid2'],
     watch: {
         //监听并接收父组件的visible并赋值给isShow（子组件接收父组件props传过来的值时不能起一样的类名，会报重复定义的错）
         visible: function (newVal) {
             this.isShow = newVal;  //newVal即是visible
             // newVal && this.showConfirm(); //newVal存在的话执行showConfirm函数
         },
-        vid: function (newVal) {
-            console.log(newVal)
-            console.log(1111111)
-            this.video = newVal
+        vid1: function (newVal) {
+            
+            this.video1 = newVal
+            console.log(this.video1)
+            this.$nextTick(() => {   //this.$nextTick解决不能在表单渲染之前赋值的报错问题
+
+            })
+
+        },
+        vid2: function (newVal) {
+            
+            this.video2 = newVal
+            console.log(this.video2)
             this.$nextTick(() => {   //this.$nextTick解决不能在表单渲染之前赋值的报错问题
 
             })
@@ -85,11 +104,12 @@ export default {
         return {
             isShow: false,
             confirmLoading: false,
-            video: '',
+            video1: '',
+            video2: '',
         };
     },
     mounted() {
-        console.log('mounted执行了')
+        
     },
     methods: {
         handleCancel() {