From 4fc2a7e97e8c2e77f7c58bc747a776e17682458a Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sat, 29 Jan 2022 13:24:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=91=84=E5=83=8F=E5=A4=B4?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cameraControlVideo/cameraControlVideo.html       |  5 ++---
 .../cameraControlVideo/cameraControlVideo.js         | 12 +++++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/public/components/property/cameraControlVideo/cameraControlVideo.html b/public/components/property/cameraControlVideo/cameraControlVideo.html
index 4685f43c6..a4a712af6 100644
--- a/public/components/property/cameraControlVideo/cameraControlVideo.html
+++ b/public/components/property/cameraControlVideo/cameraControlVideo.html
@@ -7,7 +7,6 @@
             <button type="button" class="btn-white btn btn-sm margin-right-sm" v-on:click="_changeCameras()">摄像头
             </button>
             <div class="btn-group" role="group" aria-label="Basic example">
-
                 <button type="button" class="btn btn-light btn-sm" v-bind:class="{'btn-primary': cameraControlVideoInfo.cameraCount == 4}" v-on:click="_changeCount(4)">四路
             </button>
                 <button type="button" class="btn btn-light btn-sm" v-bind:class="{'btn-primary': cameraControlVideoInfo.cameraCount == 6}" v-on:click="_changeCount(6)">六路
@@ -19,13 +18,13 @@
         <!-- 2*2-->
         <div class="col-md-6" v-if="cameraControlVideoInfo.cameraCount == 4" v-for="(item,index) in cameraControlVideoInfo.machines">
             <div class="form-group">
-                <video :id="item.machineId" controls autoplay="autoplay" muted width="100%" height="400px"></video>
+                <video :id="item.machineId" controls autoplay="autoplay" muted width="100%" height="400px" style="background-color: #000;"></video>
                 <span>摄像头：{{item.machineName}}</span>
             </div>
         </div>
         <div class="col-md-4" v-if="cameraControlVideoInfo.cameraCount == 6" v-for="(item,index) in cameraControlVideoInfo.machines">
             <div class="form-group">
-                <video :id="item.machineId" controls autoplay="autoplay" muted width="100%" height="400px"></video>
+                <video :id="item.machineId" controls autoplay="autoplay" muted width="100%" height="400px" style="background-color: #000;"></video>
                 <span>摄像头：{{item.machineName}}</span>
             </div>
         </div>
diff --git a/public/components/property/cameraControlVideo/cameraControlVideo.js b/public/components/property/cameraControlVideo/cameraControlVideo.js
index 0e2c13774..fbfe5fc99 100644
--- a/public/components/property/cameraControlVideo/cameraControlVideo.js
+++ b/public/components/property/cameraControlVideo/cameraControlVideo.js
@@ -14,6 +14,10 @@
             }
         },
         _initMethod: function() {
+            let _cameraCount = vc.getParam('cameraCount');
+            if (_cameraCount) {
+                $that.cameraControlVideoInfo.cameraCount = _cameraCount;
+            }
             $that._listMachines(1, 500);
             $that._initMachineVideo();
         },
@@ -102,8 +106,8 @@
                     communityId: vc.getCurrentCommunity().communityId,
                 }
                 vc.http.apiPost(
-                    '/machine.playCameraCmd',
-                    JSON.stringify(vc.component.deleteShopTypeInfo), {
+                    '/machine.playCamera',
+                    JSON.stringify(data), {
                         emulateJSON: true
                     },
                     function(json, res) {
@@ -141,10 +145,11 @@
                 let data = {
                     callIds: _callIds,
                     communityId: vc.getCurrentCommunity().communityId,
+                    machineId: _machines[0].machineId
                 }
                 vc.http.apiPost(
                     '/machine.heartbeatCamera',
-                    JSON.stringify(vc.component.deleteShopTypeInfo), {
+                    JSON.stringify(data), {
                         emulateJSON: true
                     },
                     function(json, res) {
@@ -154,6 +159,7 @@
             },
             _changeCount: function(_count) {
                 $that.cameraControlVideoInfo.cameraCount = _count;
+                vc.jumpToPage('/video.html#/pages/property/videoControl?cameraCount=' + _count)
             }
         }
     });