From 01a17de0f90a53abfbc88790beedec60882e8c7e Mon Sep 17 00:00:00 2001
From: jl-zhoujl2 <jl-zhoujl2@chinaunicom.cn>
Date: Thu, 25 Aug 2022 14:57:59 +0800
Subject: [PATCH] =?UTF-8?q?8.25=20=E5=9B=9E=E6=94=BE=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Screen/ScreenVideoPlay.tsx            |  3 +--
 src/pages/MonitorScreen/ProjectMonitorRoom/index.tsx | 10 +++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/components/Screen/ScreenVideoPlay.tsx b/src/components/Screen/ScreenVideoPlay.tsx
index 72306f6..d6d0ed0 100644
--- a/src/components/Screen/ScreenVideoPlay.tsx
+++ b/src/components/Screen/ScreenVideoPlay.tsx
@@ -84,7 +84,7 @@ const ScreenVideoPlay: React.FC<ScreenVideoPlayProps> = (props) => {
             var layout = "1x1";                                //playMode指定模式的布局
             var enableHTTPS = 1;                               //是否启用HTTPS协议与综合安防管理平台交互，这里总是填1
             var encryptedFields = 'secret';					   //加密字段，默认加密领域为secret
-            var showToolbar = status;                               //是否显示工具栏，0-不显示，非0-显示
+            var showToolbar = 0;                               //是否显示工具栏，0-不显示，非0-显示
             var showSmart = 1;                                 //是否显示智能信息（如配置移动侦测后画面上的线框），0-不显示，非0-显示
             // var buttonIDs = "0,16,256,257,258,259,260,512,513,514,515,516,517,768,769";  //自定义工具条按钮
             var buttonIDs = "";  //自定义工具条按钮
@@ -194,7 +194,6 @@ const ScreenVideoPlay: React.FC<ScreenVideoPlayProps> = (props) => {
 
     //视频回放
     function videoPlayback(caremaCode: any, startTime: any, endTime: any) {
-
         var cameraIndexCode = caremaCode;         //获取输入的监控点编号值，必填
         var startTimeStamp = new Date(startTime?.replace('-', '/').replace('-', '/')).getTime();    //回放开始时间戳，必填
         var endTimeStamp = new Date(endTime?.replace('-', '/').replace('-', '/')).getTime();        //回放结束时间戳，必填
diff --git a/src/pages/MonitorScreen/ProjectMonitorRoom/index.tsx b/src/pages/MonitorScreen/ProjectMonitorRoom/index.tsx
index 6c0af83..8dbc794 100644
--- a/src/pages/MonitorScreen/ProjectMonitorRoom/index.tsx
+++ b/src/pages/MonitorScreen/ProjectMonitorRoom/index.tsx
@@ -140,7 +140,11 @@ export default (props: any) => {
     const onCaremaPlay = (item: any) => {
         setCameraSelect(item.id);
         setCameraParams(item.platform);
-        videoRef.current.play(item.deviceCode);
+        if (basicInfo?.status == "2") {//回看
+            videoRef.current?.back(item.deviceCode, basicInfo?.startDate, basicInfo?.endDate);
+        } else {
+            videoRef.current?.play(item.deviceCode);
+        }
     }
     //获取基本信息数据
     const getRoomData = () => {
@@ -159,7 +163,7 @@ export default (props: any) => {
                 if (data.sectionPayerList?.length > 0) {
                     let length = 0
                     for (const ite of data.sectionPayerList) {
-                        length += ite.payerNumber;
+                        length += Number(ite.payerNumber);
                     }
                     data["supplierLength"] = length;
                 } else {
@@ -197,7 +201,7 @@ export default (props: any) => {
                     setCameraSelect(data[0].id);
                     setCameraParams(data[0].platform);
                     setTimeout(() => {
-                        if (data.status == "2") {//回看
+                        if (baseData.status == "2") {//回看
                             videoRef.current?.back(data[0].deviceCode, baseData.startDate, baseData.endDate);
                         } else {
                             videoRef.current?.play(data[0].deviceCode);