From 5726546700e3e8d098efec2d503ca20713db1b7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E9=91=AB?= <zhangxin@zhehekeji.com>
Date: Tue, 22 Dec 2020 19:41:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E8=A7=86=E9=A2=91=E6=B5=81in?=
 =?UTF-8?q?dex=E9=A1=B5=E5=AE=BD=E9=AB=98=E6=AF=94=E6=94=B9=E4=B8=BA400*22?=
 =?UTF-8?q?5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/realTimeMonitoring/index.vue | 12 ++++++------
 src/views/realTimeMonitoring/model.vue | 11 ++++++++++-
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/views/realTimeMonitoring/index.vue b/src/views/realTimeMonitoring/index.vue
index 40d5c2e..5f61227 100644
--- a/src/views/realTimeMonitoring/index.vue
+++ b/src/views/realTimeMonitoring/index.vue
@@ -20,7 +20,7 @@
             <div class="video-list" v-for="(item,index) in realTimeListData" :key="index+1">
                 <!-- 对应全部的-->
                 <div v-if="tabKey == 0" class="video-item">
-                    <div class="video-box" width="480" height="270" v-for="i in item.cameras" :key="i.id" @click="showModel(i)">
+                    <div class="video-box" width="400" height="225" v-for="i in item.cameras" :key="i.id" @click="showModel(i)">
                         <canvas :class="['video',i.id?'video'+i.id:'']">
 
                         </canvas>
@@ -31,7 +31,7 @@
                 </div>
                 <!--对应各个巷道的-->
                 <div v-if="tabKey == index+1" class="video-item">
-                    <div class="video-box" width="480" height="270" v-for="i in item.cameras" :key="i.id" @click="showModel(i)">
+                    <div class="video-box" width="400" height="225" v-for="i in item.cameras" :key="i.id" @click="showModel(i)">
                         <canvas :class="['video',i.id?'video'+i.id:'']">
 
                         </canvas>
@@ -192,8 +192,8 @@ export default {
         position: fixed;
         z-index: 999;
         border: solid 1px skyblue;
-        width: 480px;
-        height: 270px;
+        width: 400px;
+        height: 225px;
     }
     .flex-layouts{
         display: flex;
@@ -220,8 +220,8 @@ export default {
                 .video{
                     border: solid 1px #000000;
                     background: #001529;
-                    width: 480px;
-                    height: 270px;
+                    width: 400px;
+                    height: 225px;
                 }
             }
         }
diff --git a/src/views/realTimeMonitoring/model.vue b/src/views/realTimeMonitoring/model.vue
index 46bb074..14c906c 100644
--- a/src/views/realTimeMonitoring/model.vue
+++ b/src/views/realTimeMonitoring/model.vue
@@ -119,6 +119,13 @@ export default {
         console.log('mounted执行了')
     },
     methods: {
+        pauseEvent(e){
+            if(e.stopPropagation) e.stopPropagation();
+            if(e.preventDefault) e.preventDefault();
+            e.cancelBubble=true;
+            e.returnValue=false;
+            return false;
+        },
         zoomDecStart(){
             console.log('变倍-按下')
             this.$axios.post('/camera/control/zoomDec/start/'+this.id, {
@@ -310,8 +317,10 @@ export default {
 
             })
         },
-        leftStop(){
+        leftStop(e){
             console.log('左转鼠标抬起')
+            // e.unbind('mousemove')
+            console.log(e)
             this.$axios.post('/camera/control/left/stop/'+this.id, {
                 data: {}
             }).then(res => {