Browse Source

表格添加备注功能

release_0.0.2
wenlele 3 years ago
parent
commit
766935ed75
  1. 2
      code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
  2. 3
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
  3. 1
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
  4. 2
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx

2
code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx

@ -78,7 +78,7 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
</Col> </Col>
<Col span={15} style={{}}> <Col span={15} style={{}}>
<div style={{ paddingRight: 12 }}> <div style={{ paddingRight: 12 }}>
<TextScroll content={[]} duration={6} /> <TextScroll content={content||[]} duration={6} />
</div> </div>
</Col> </Col>
</Row> </Row>

3
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); setSip(res.payload.data);
if (cameraData.id) { if (cameraData.id) {
let sip = res.payload.data.find((item) => item.streamid == cameraData.topSerialNo) let sip = res.payload.data.find((item) => item.streamid == cameraData.topSerialNo)
console.log(sip);
dispatch(equipmentWarehouse.getCascadeStream({ streamId: sip.streamid })).then((res) => { dispatch(equipmentWarehouse.getCascadeStream({ streamId: sip.streamid })).then((res) => {
let oneData = res.payload.data[0]; let oneData = res.payload.data[0];
let modifyData = res.payload.data.find( let modifyData = res.payload.data.find(
@ -156,13 +155,13 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
//nvr //nvr
if (cameraData.gbId == id || !cameraData.gbId) { if (cameraData.gbId == id || !cameraData.gbId) {
let data = cascadeList.find((item) => item.id == id) let data = cascadeList.find((item) => item.id == id)
console.log(formData);
setVideoObj({ setVideoObj({
type: 'cascade', type: 'cascade',
audio: false, audio: false,
serialNo: data.streamid, serialNo: data.streamid,
topSerialNo: cameraData.id ? cameraData.topSerialNo : formData?.streamId, topSerialNo: cameraData.id ? cameraData.topSerialNo : formData?.streamId,
playUrlSd: data?.playUrl?.liveUrl?.sd["WS-RAW"], playUrlSd: data?.playUrl?.liveUrl?.sd["WS-RAW"],
content: data?.camera?.cameraRemarks.map((item) => item.remark),
}) })
setVideoPlay(true); setVideoPlay(true);
} }

1
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, serialNo: data.streamid,
topSerialNo: cameraDataNvr ? cameraDataNvr.serialNo : addNvr ? nvrNumber : equipmentNum, topSerialNo: cameraDataNvr ? cameraDataNvr.serialNo : addNvr ? nvrNumber : equipmentNum,
playUrlSd: data?.playUrl?.liveUrl?.sd["WS-RAW"], playUrlSd: data?.playUrl?.liveUrl?.sd["WS-RAW"],
content:data?.camera?.cameraRemarks.map((item) => item.remark)
}) })
setVideoPlay(true); setVideoPlay(true);
} }

2
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx

@ -194,7 +194,6 @@ const CameraHeader = (props) => {
theme="borderless" theme="borderless"
onClick={() => { onClick={() => {
let data = row?.cameraRemarks.map((item)=>item.remark) let data = row?.cameraRemarks.map((item)=>item.remark)
console.log((data));
if (row.type == "yingshi") { if (row.type == "yingshi") {
setVideoObj({ setVideoObj({
type: row.type, type: row.type,
@ -211,6 +210,7 @@ const CameraHeader = (props) => {
serialNo: row.serialNo, serialNo: row.serialNo,
topSerialNo: row.topSerialNo, topSerialNo: row.topSerialNo,
playUrlSd: row.gbCamera?.playUrl?.liveUrl?.sd["WS-RAW"], playUrlSd: row.gbCamera?.playUrl?.liveUrl?.sd["WS-RAW"],
content:data,
}) })
} }
setVideoPlay(true) setVideoPlay(true)

Loading…
Cancel
Save