diff --git a/code/VideoAccess-VCMP/web/client/index.html b/code/VideoAccess-VCMP/web/client/index.html
index 05414a7..5db6629 100644
--- a/code/VideoAccess-VCMP/web/client/index.html
+++ b/code/VideoAccess-VCMP/web/client/index.html
@@ -5,7 +5,7 @@
-
+
diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
index 67f674f..52fc096 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx
@@ -56,9 +56,9 @@ const VideoPlay = ({ dispatch, actions,
// videoObj = {
// type: 'cascade',
// audio: false,
- // serialNo: '34020000001310000001', // 设备序列号 必须
- // topSerialNo: '34020000001110000077', // 设备顶级序列号 必须
- // playUrlSd: 'http://221.230.55.27:8081/jessica/34020000001110000077/34020000001310000001', // 必须
+ // serialNo: '34020000001310000003', // 设备序列号 必须
+ // topSerialNo: '34020000001110000079', // 设备顶级序列号 必须
+ // playUrlSd: 'http://221.230.55.27:8081/jessica/34020000001110000079/34020000001310000003', // 必须
// // playUrlHd: 'ezopen://open.ys7.com/G75922040/1.hd.live',
// // replayUrl: 'ezopen://open.ys7.com/G75922040/1.rec',
// },
@@ -67,7 +67,7 @@ const VideoPlay = ({ dispatch, actions,
iotVideoServer,
local, //是否本地调用视频
}) => {
- // console.log('1754',videoStyle);
+ // console.log('1754',videoObj);
if (videoObj.type == 'yingshi') {
videoObj = {
...videoObj,
@@ -141,7 +141,6 @@ const VideoPlay = ({ dispatch, actions,
} else {
setWritten('视频异常,问题处理中...')
}
-
});
}
@@ -200,7 +199,7 @@ const VideoPlay = ({ dispatch, actions,
}
}, {
key: 'talk',
- hide: !videoObj.audio,
+ hide: !videoObj.audio,
click: (e) => {
changeSelectState('talk')
}
@@ -227,7 +226,7 @@ const VideoPlay = ({ dispatch, actions,
}
}, {
key: 'histroy',
- hide: !Boolean(videoObj.replayUrl),
+ hide: !Boolean(videoObj.replayUrl),
click: () => {
changeSelectState('histroy')
videoFront = new moment(); //验证前时间
@@ -284,7 +283,7 @@ const VideoPlay = ({ dispatch, actions,
});
document.onkeydown = (e) => {
-
+
}
// const resize_ = () => {
@@ -361,6 +360,7 @@ const VideoPlay = ({ dispatch, actions,
const createPlay = async () => {
if (videoObj.type != 'yingshi') {
+ // console.log(videoObj,iotVideoServer);
try {
// const inviteRes = await IotVideoServerRequest.get(VideoServeApi.invite, {
// id: '36011200002002021114',
@@ -370,8 +370,12 @@ const VideoPlay = ({ dispatch, actions,
// }, err => {.
// console.log(err);
// })
- const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`)
+ const inviteRes_ = await request.get(`${iotVideoServer}/api/gb28181/invite?id=${videoObj.topSerialNo}&channel=${videoObj.serialNo}`).then((res) =>{
+ console.log(11111, res)
+ })
+
} catch (error) {
+ console.log(123151);
console.log(error.response);
}
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx
index cce4ace..6dc8212 100644
--- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx
@@ -141,7 +141,7 @@ const NvrHeader = (props) => {
modalName="revise"
venderList={venderList}
close={() => {
- dispatch(equipmentWarehouse.getNvr(searchb.current));
+ dispatch(equipmentWarehouse.getNvr(searchData.current));
}}
/>