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,
- +
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)