free-sun
/
FS-IOT
15
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

nvr摄像头视频流bug解决

release_0.0.2
wenlele 3 years ago
parent
09af37576b
commit
ab2e4dc81a
2 changed files with 29 additions and 37 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 25
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
  2. 35
      code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx

25
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx
View File

@ -19,28 +19,22 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
dispatch(equipmentWarehouse.getCascadeSIP()).then((res) => { dispatch(equipmentWarehouse.getCascadeSIP()).then((res) => {
setSip(res.payload.data); setSip(res.payload.data);
if (cameraData) { if (cameraData) {
let sip=res.payload.data.find((item)=>item.streamid==cameraData.topSerialNo) let sip = res.payload.data.find((item) => item.streamid == cameraData.topSerialNo)
dispatch(equipmentWarehouse.getCascadeStream({ sip: sip.sipip })).then((res) => { dispatch(equipmentWarehouse.getCascadeStream({ sip: sip.sipip })).then((res) => {
console.log(res.payload.data);
let oneData = res.payload.data[0]; let oneData = res.payload.data[0];
let modifyData = res.payload.data.find( let modifyData = res.payload.data.find(
(item) => item.id == cameraData.gbId (item) => item.id == cameraData.gbId
); );
console.log(modifyData)
let data = res.payload.data.map((item, index) => { let data = res.payload.data.map((item, index) => {
if (item.camera) { if (item.camera) {
item.name = item.camera.name; item.name = item.camera.name;
} }
if (item.id == cameraData.gbId) {
item = oneData;
}
if (index == 0) { if (index == 0) {
item = modifyData; item = modifyData;
} }
if (
item.camera&&item.camera.name == cameraData.name
) {
item = oneData;
}
return item; return item;
}) })
setCascadeList(data) setCascadeList(data)
@ -69,7 +63,9 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
console.log(res.payload.data); console.log(res.payload.data);
let chooseList = []; let chooseList = [];
let data = res.payload.data.map((item, index) => { let data = res.payload.data.map((item, index) => {
item.change = false; if (item.camera) {
item.name = item.camera.name;
}
return item; return item;
}) })
setCascadeList(data) setCascadeList(data)
@ -119,7 +115,8 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
function NvrChangeName (e, index, id) { function NvrChangeName (e, index, id) {
//级联摄像头视频流获取修改名称 //级联摄像头视频流获取修改名称
let NvrchangeList = JSON.parse(JSON.stringify(cascadeList)); let NvrchangeList = JSON.parse(JSON.stringify(cascadeList));
if (!cameraData||cameraData.gbId==id) { console.log(!cameraData.gbId)
if (!cameraData.gbId || cameraData.gbId == id) {
NvrchangeList[index].change = true; NvrchangeList[index].change = true;
setCascadeList(NvrchangeList); setCascadeList(NvrchangeList);
} }
@ -158,7 +155,7 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
e.stopPropagation(); e.stopPropagation();
} }
function onDisabled (id) { function onDisabled (id) {
if (id==cameraData.gbId) { if (id == cameraData.gbId||!cameraData.gbId) {
return false; return false;
} else { } else {
return true; return true;
@ -246,7 +243,7 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes
<Radio <Radio
checked={isAllChoose} checked={isAllChoose}
mode="advanced" mode="advanced"
disabled={cameraData ? true : false} disabled={cameraData.gbId ? true : false}
onChange={(e) => allChoose(e)} onChange={(e) => allChoose(e)}
aria-label="全选" aria-label="全选"
> >

35
code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/nvrCamera.jsx
View File

@ -15,6 +15,7 @@ import { IconEdit, IconPlayCircle, IconTickCircle } from "@douyinfe/semi-icons";
import "./cameraModal.less"; import "./cameraModal.less";
import PerfectScrollbar from "perfect-scrollbar"; import PerfectScrollbar from "perfect-scrollbar";
import { isIndexed } from "immutable"; import { isIndexed } from "immutable";
import { useId } from "react";
let equipmentScrollbar; let equipmentScrollbar;
function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }) { function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }) {
@ -52,24 +53,18 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
streamId: cameraDataNvr.serialNo, streamId: cameraDataNvr.serialNo,
}) })
).then((res) => { ).then((res) => {
console.log(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(
(item) => item.camera == null ? false : item.camera.name == cameraData.name (item) =>item.id == cameraData.gbId);
);
let data = res.payload.data.map((item, index) => { let data = res.payload.data.map((item, index) => {
if (index == 0) { if (item.camera) {
item = modifyData; item.name = item.camera.name;
} }
if ( if (item.id == cameraData.gbId) {
item.camera
? item.camera.name == cameraData.name && index > 0
: index < 0
) {
item = oneData; item = oneData;
} }
if (item.camera) { if (index == 0) {
item.name = item.camera.name; item = modifyData;
} }
return item; return item;
}); });
@ -121,10 +116,10 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
} }
}, []); }, []);
function NvrChangeName (e, index, name) { function NvrChangeName (e, index, id) {
//nvr摄像头视频流获取修改名称 //nvr摄像头视频流获取修改名称
let NvrchangeList = JSON.parse(JSON.stringify(NVRcameraList)); let NvrchangeList = JSON.parse(JSON.stringify(NVRcameraList));
if (!cameraDataNvr || cameraData.name == name) { if (!cameraData.gbId || cameraData.gbId == id) {
NvrchangeList[index].change = true; NvrchangeList[index].change = true;
setNVRcameraList(NvrchangeList); setNVRcameraList(NvrchangeList);
} }
@ -209,8 +204,8 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
console.log("22222222222222222"); console.log("22222222222222222");
e.stopPropagation(); e.stopPropagation();
} }
function onDisabled (name) { function onDisabled (id) {
if ((cameraDataNvr && cameraData.name == name) || !cameraDataNvr) { if (cameraData.gbId == id || !cameraData.gbId) {
return false; return false;
} else { } else {
return true; return true;
@ -269,7 +264,7 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
<Radio <Radio
checked={isAllChoose} checked={isAllChoose}
mode="advanced" mode="advanced"
disabled={cameraDataNvr ? true : false} disabled={cameraData.gbId ? true : false}
onChange={(e) => allChoose(e)} onChange={(e) => allChoose(e)}
aria-label="全选" aria-label="全选"
> >
@ -314,7 +309,7 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
> >
<Checkbox <Checkbox
value={item.id} value={item.id}
disabled={onDisabled(item.name)} disabled={onDisabled(item.id)}
extra={ extra={
<div> <div>
<div <div
@ -354,7 +349,7 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
color: "#1859C1", color: "#1859C1",
}} }}
onClick={(e) => onClick={(e) =>
NvrChangeName(e, index, item.name) NvrChangeName(e, index, item.id)
} }
/> />
</div> </div>
@ -378,7 +373,7 @@ function nvrCamera ({ dispatch, actions, nvrRef, cameraData, addNvr, nvrNumber }
<Radio <Radio
checked={item.support} checked={item.support}
mode="advanced" mode="advanced"
disabled={onDisabled(item.name)} disabled={onDisabled(item.id)}
onChange={(e) => toggle(e, index)} onChange={(e) => toggle(e, index)}
aria-label="单选" aria-label="单选"
> >

Write Preview
Loading…
Cancel
Save