From 766935ed752f4c6f7957696d4c464c095bee543d Mon Sep 17 00:00:00 2001
From: wenlele <wen.lele@free-sun.com.cn>
Date: Wed, 6 Jul 2022 20:59:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=B7=BB=E5=8A=A0=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/client/src/components/videoPlayer/voiceHeader.jsx      | 2 +-
 .../sections/equipmentWarehouse/components/cascadeCamera.jsx   | 3 +--
 .../src/sections/equipmentWarehouse/components/nvrCamera.jsx   | 1 +
 .../src/sections/equipmentWarehouse/containers/camera.jsx      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
index db1ba54..a1a1e36 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
@@ -78,7 +78,7 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
             </Col>
             <Col span={15} style={{}}>
                <div style={{ paddingRight: 12 }}>
-                  <TextScroll content={[]} duration={6} />
+                  <TextScroll content={content||[]} duration={6} />
                </div>
             </Col>
          </Row>
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
index 7a014f1..759ff45 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
@@ -23,7 +23,6 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
             setSip(res.payload.data);
             if (cameraData.id) {
                 let sip = res.payload.data.find((item) => item.streamid == cameraData.topSerialNo)
-                console.log(sip);
                 dispatch(equipmentWarehouse.getCascadeStream({ streamId: sip.streamid })).then((res) => {
                     let oneData = res.payload.data[0];
                     let modifyData = res.payload.data.find(
@@ -156,13 +155,13 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
         //nvr播放视频
         if (cameraData.gbId == id || !cameraData.gbId) {
             let data = cascadeList.find((item) => item.id == id)
-            console.log(formData);
             setVideoObj({
                 type: 'cascade',
                 audio: false,
                 serialNo: data.streamid,
                 topSerialNo: cameraData.id ? cameraData.topSerialNo : formData?.streamId,
                 playUrlSd: data?.playUrl?.liveUrl?.sd["WS-RAW"],
+                content: data?.camera?.cameraRemarks.map((item) => item.remark),
             })
             setVideoPlay(true);
         }
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
index 004d111..917e437 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
@@ -212,6 +212,7 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber,
                 serialNo: data.streamid,
                 topSerialNo: cameraDataNvr ? cameraDataNvr.serialNo : addNvr ? nvrNumber : equipmentNum,
                 playUrlSd: data?.playUrl?.liveUrl?.sd["WS-RAW"],
+                content:data?.camera?.cameraRemarks.map((item) => item.remark)
             })
             setVideoPlay(true);
         }
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
index 3298f75..8552198 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx
@@ -194,7 +194,6 @@ const CameraHeader = (props) => {
                             theme="borderless"
                             onClick={() => {
                                 let data = row?.cameraRemarks.map((item)=>item.remark)
-                                console.log((data));
                                 if (row.type == "yingshi") {
                                     setVideoObj({
                                         type: row.type,
@@ -211,6 +210,7 @@ const CameraHeader = (props) => {
                                         serialNo: row.serialNo,
                                         topSerialNo: row.topSerialNo,
                                         playUrlSd: row.gbCamera?.playUrl?.liveUrl?.sd["WS-RAW"],
+                                        content:data,
                                     })
                                 }
                                 setVideoPlay(true)