From 6b6b9540fa5c84997833f03a5b660f7060a19c55 Mon Sep 17 00:00:00 2001
From: DIAMOND <276397553@qq.com>
Date: Thu, 15 Dec 2022 16:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=91=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components.d.ts                               |   1 +
 .../page/VideoControl/VideoControlSimple.vue  | 140 +++++++++---------
 src/views/page/aside/cameraLeftMenu.vue       |   1 +
 src/views/page/cameraCenter.vue               |   3 +-
 4 files changed, 75 insertions(+), 70 deletions(-)

diff --git a/components.d.ts b/components.d.ts
index 703e50a..7b1d57f 100644
--- a/components.d.ts
+++ b/components.d.ts
@@ -10,6 +10,7 @@ declare module '@vue/runtime-core' {
     ADropdown: typeof import('ant-design-vue/es')['Dropdown']
     AMenu: typeof import('ant-design-vue/es')['Menu']
     AMenuItem: typeof import('ant-design-vue/es')['MenuItem']
+    ARow: typeof import('ant-design-vue/es')['Row']
     ATree: typeof import('ant-design-vue/es')['Tree']
     Draggable: typeof import('./src/components/Draggable.vue')['default']
     RouterLink: typeof import('vue-router')['RouterLink']
diff --git a/src/views/page/VideoControl/VideoControlSimple.vue b/src/views/page/VideoControl/VideoControlSimple.vue
index e429685..23829e4 100644
--- a/src/views/page/VideoControl/VideoControlSimple.vue
+++ b/src/views/page/VideoControl/VideoControlSimple.vue
@@ -6,35 +6,33 @@
   */
   -->
 <template>
-    <div class="camera-control" @mousewheel="wheel">
-
-        
-        <a-row>
-           <!--上-->
-          <div class="upButton" @mousedown="upStart()" @mouseup="stopMove()">
-          </div>
-        </a-row>
-         <a-row>
-          <!--左-->
-          <div class="leftButton"  @mousedown="leftStart()" @mouseup="stopMove()">
-          </div>
-        
-          <!--右-->
-          <div class="rightButton" @mousedown="rightStart()"
-            @mouseup="stopMove()">
-          </div>
-         </a-row>
-         <a-row>
-          <!--下-->
-          <div class="downButton"  @mousedown="downStart()"
-            @mouseup="stopMove()">
-          </div>
-         </a-row>
-          
-
-          
-      
-        <!-- <div class="camera-function">
+  <div class="camera-control" @mousewheel="wheel">
+
+
+    <a-row>
+      <!--上-->
+      <div class="upButton" @mousedown="upStart()" @mouseup="stopMove()">
+      </div>
+    </a-row>
+    <a-row>
+      <!--左-->
+      <div class="leftButton" @mousedown="leftStart()" @mouseup="stopMove()">
+      </div>
+
+      <!--右-->
+      <div class="rightButton" @mousedown="rightStart()" @mouseup="stopMove()">
+      </div>
+    </a-row>
+    <a-row>
+      <!--下-->
+      <div class="downButton" @mousedown="downStart()" @mouseup="stopMove()">
+      </div>
+    </a-row>
+
+
+
+
+    <!-- <div class="camera-function">
           <div class="function-box">
             <div class="function-item"
               style="background-position:-128px 0;border-right: 1px rgba(179, 177, 177, 0.97) dotted;"
@@ -44,7 +42,7 @@
               title="变倍-">
             </div>
           </div> -->
-          <!-- <div class="function-box">
+    <!-- <div class="function-box">
             <div class="function-item"
               style="background-position:-128px -30px;border-right:1px rgba(179, 177, 177, 0.97) dotted; "
               @mousedown="focusIn()" @mouseup="focusStop()" title="变焦+">
@@ -53,7 +51,7 @@
               @mouseup="focusStop()" title="变焦-">
             </div>
           </div> -->
-          <!-- <div class="function-box">
+    <!-- <div class="function-box">
             <div class="function-item"
               style="background-position:-202px 0; border-right:1px rgba(179, 177, 177, 0.97) dotted;"
               @mousedown="handleScreenSnap()" title="抓拍">
@@ -62,8 +60,8 @@
               title="抓拍列表">
             </div>
           </div> -->
-  
-      </div>
+
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -238,11 +236,11 @@ async function zoomIn() {
   let params = { cameraId: ip.value }
   let ptzParams = createPtzParam(instruct, step)
   Object.assign(params, ptzParams)
-  onvifOperateHandler(url.value.ptzMove, 'post', params, (res:any)=>{
-    setTimeout(()=>{
+  onvifOperateHandler(url.value.ptzMove, 'post', params, (res: any) => {
+    setTimeout(() => {
       // console.log("回调");
       stopMove()
-    },400) 
+    }, 400)
   })
 
 }
@@ -253,11 +251,11 @@ function zoomOut() {
   let params = { cameraId: ip.value }
   let ptzParams = createPtzParam(instruct, step)
   Object.assign(params, ptzParams)
-  onvifOperateHandler(url.value.ptzMove, 'post', params,(res:any)=>{
-    setTimeout(()=>{
+  onvifOperateHandler(url.value.ptzMove, 'post', params, (res: any) => {
+    setTimeout(() => {
       // console.log("回调");
       stopMove()
-    },400) 
+    }, 400)
   })
 }
 
@@ -281,23 +279,23 @@ function focusStop() {
 }
 
 //抓拍
-function handleScreenSnap(){
+function handleScreenSnap() {
 
 }
-function openImgListDialog(){
+function openImgListDialog() {
 
 
 }
 
-function wheel(e:any){
+function wheel(e: any) {
   console.log(e);
   e.stopPropagation()
-  if(e.wheelDelta==120){
+  if (e.wheelDelta == 120) {
     zoomIn();
     // stopMove();
-    
+
   }
-  else if(e.wheelDelta== -120 ){
+  else if (e.wheelDelta == -120) {
     zoomOut();
     // stopMove();
   }
@@ -454,7 +452,7 @@ input[type='range']::-webkit-slider-thumb:active {
 }
 
 
-.upButton{
+.upButton {
   position: fixed;
   left: 50%;
   transform: translateX(-50%);
@@ -462,44 +460,48 @@ input[type='range']::-webkit-slider-thumb:active {
   width: 60vw;
   // background: red;
 }
-.upButton:hover{
-  background: linear-gradient(to top, transparent,80%,rgba(59, 59, 238, 0.637));
-  transition:all 1s ease-out;
-  cursor:pointer
+
+.upButton:hover {
+  background: linear-gradient(to top, transparent, 80%, rgba(59, 59, 238, 0.637));
+  transition: all 1s ease-out;
+  cursor: pointer
 }
-.leftButton{
+
+.leftButton {
   position: fixed;
   top: 50%;
   transform: translateY(-50%);
-  height: 80vh; 
+  height: 80vh;
   width: 50px;
   // background: green;
 }
-.leftButton:hover{
-  background: linear-gradient(to left, transparent,80%,rgba(59, 59, 238, 0.637));
-  transition:all 1s ease-out;
-  cursor:pointer
+
+.leftButton:hover {
+  background: linear-gradient(to left, transparent, 80%, rgba(59, 59, 238, 0.637));
+  transition: all 1s ease-out;
+  cursor: pointer
 }
 
-.rightButton{
+.rightButton {
   position: fixed;
-  left: 85%;
+  left: 97.4%;
   transform: translateY(-50%);
   top: 50%;
-  height: 80vh; 
+  height: 80vh;
   width: 50px;
   // background: url("@/assets/images/ptzIcons/a.png") center no-repeat;
   // background-size: contain;
   // transition:1s
 }
-.rightButton:hover{
-  background: linear-gradient(to right, transparent,80%,rgba(59, 59, 238, 0.637));
-  transition:all 1s ease-out;
-  cursor:pointer
+
+.rightButton:hover {
+  background: linear-gradient(to right, transparent, 80%, rgba(59, 59, 238, 0.637));
+  transition: all 1s ease-out;
+  cursor: pointer
 }
 
 
-.downButton{
+.downButton {
   position: fixed;
   left: 50%;
   transform: translateX(-50%);
@@ -509,10 +511,10 @@ input[type='range']::-webkit-slider-thumb:active {
   width: 60vw;
   // background: yellow;
 }
-.downButton:hover{
-  background: linear-gradient( transparent,80%,rgba(59, 59, 238, 0.637));
-  transition:all 1s ease-out;
-  cursor:pointer
-}
 
+.downButton:hover {
+  background: linear-gradient(transparent, 80%, rgba(59, 59, 238, 0.637));
+  transition: all 1s ease-out;
+  cursor: pointer
+}
 </style>
diff --git a/src/views/page/aside/cameraLeftMenu.vue b/src/views/page/aside/cameraLeftMenu.vue
index 7b16830..050307e 100644
--- a/src/views/page/aside/cameraLeftMenu.vue
+++ b/src/views/page/aside/cameraLeftMenu.vue
@@ -152,6 +152,7 @@ function loadTreeData() {
     height: 21vw;
     background: url(@/assets/images/loginBG.png);
     background-size: 100% 100%;
+    z-index: 1;
 }
 
 .messageTitle {
diff --git a/src/views/page/cameraCenter.vue b/src/views/page/cameraCenter.vue
index e2f95e7..fbc18f0 100644
--- a/src/views/page/cameraCenter.vue
+++ b/src/views/page/cameraCenter.vue
@@ -35,7 +35,7 @@
 
         <CameraLeftMenu></CameraLeftMenu>
         <CameraRightMenu></CameraRightMenu>
-
+        <VideoControlSimple></VideoControlSimple>
     </div>
 </template>
 
@@ -54,6 +54,7 @@ import CameraLeftMenu from '@/views/page/Aside/cameraLeftMenu.vue'
 import CameraRightMenu from '@/views/page/Aside/cameraRightMenu.vue'
 import LabelEditModel from '@/views/page/Model/LabelEditModel.vue'
 import popup from "@/utils/popup";
+import VideoControlSimple from './VideoControl/VideoControlSimple.vue';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 let piniaStore = useStore();
 let player = <HTMLVideoElement>document.querySelector('#videoPlayer')