Browse Source

fix: 路外视频监控

tags/PMS_V1.0.0_Alpha5
chenglb 1 year ago
parent
commit
c274e70ef9
  1. 9
      src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx
  2. 23
      src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx

9
src/pages/OutRoadMgm/OutDeviceMgm/OutMonitorMgm/loadable.jsx

@ -207,7 +207,8 @@ function OutMonitorMgm(props) {
res=>{
if(res.status == 20000 && res.data.url){
setVideoModalVisible(true)
setOneVideoRealtimeUrlInfo({id: item.id, url: res.data.url})
// setOneVideoRealtimeUrlInfo({id: item.id, url: res.data.url})
videoRef.current.setVideoUrl(res.data.url)
startIntervalToPlay()
}else{
message.error(`播放数据暂未对接`);
@ -897,11 +898,7 @@ function OutMonitorMgm(props) {
{
playType == '1' ?
<div>
{
rowData.id == oneVideoRealtimeUrlInfo.id ?
<VideoPlay videoType="flv" ref={videoRef} videoUrl={oneVideoRealtimeUrlInfo.url} ></VideoPlay>
: null
}
<VideoPlay videoType="mp4" ref={videoRef} ></VideoPlay>
</div>
:
<div >

23
src/pages/OutRoadMgm/OutDeviceMgm/OutNvrMgm/loadable.jsx

@ -431,17 +431,20 @@ function OutNvrMgm(props) {
let pattern = /^([0-9]{1,3}\.){3}[0-9]{1,3}$/;
let duankou = /^([1-9][0-9]{0,3}|[1-5][0-9]{4}|6[0-4][0-9]{3}|65[0-4][0-9]{2}|655[0-2][0-9]|6553[0-5])$/;
let shiping_duan_kou = /^\+?[1-9][0-9]*$/
if (!pattern.test(values.ip_address)) {
message.warning("请输入合理格式的ip地址")
return false
} else if (!duankou.test(values.port)) {
message.warning("请输入合适的端口号")
return false
}
else if (!shiping_duan_kou.test(values.video_port)) {
message.warning("请输入合适的视频端口号")
return false
if(values.nvr_type == 1){
if (!pattern.test(values.ip_address)) {
message.warning("请输入合理格式的ip地址")
return false
} else if (!duankou.test(values.port)) {
message.warning("请输入合适的端口号")
return false
}
else if (!shiping_duan_kou.test(values.video_port)) {
message.warning("请输入合适的视频端口号")
return false
}
}
console.log(values, rowData?.id);
ajax[rowData?.id ? "doEditOutNvr" : "doAddOutNvr"](values).then(
(res) => {

Loading…
Cancel
Save