Browse Source

问题修改

release_1.3.0
deartibers 3 years ago
parent
commit
a5f11323f3
  1. 4
      code/VideoAccess-VCMP/web/client/src/sections/openness/containers/mirroring.jsx
  2. 18
      code/VideoAccess-VCMP/web/client/src/sections/openness/containers/mirroringDetail.jsx

4
code/VideoAccess-VCMP/web/client/src/sections/openness/containers/mirroring.jsx

@ -160,7 +160,7 @@ const Mirroring = (props) => {
<div style={{ display: 'flex', padding: '34px 64px 18px 64px', flexWrap: 'wrap', }}> <div style={{ display: 'flex', padding: '34px 64px 18px 64px', flexWrap: 'wrap', }}>
{detailList.current.map((item, index) => { {detailList.current.map((item, index) => {
return ( return (
<div key={index} style={{ marginRight: 100 }}> <div key={index} style={{ marginRight: 84 }}>
<div style={{ position: 'relative', width: '306px', height: 142, boxShadow: '0px 2px 4px 0px rgba(231,231,231,0.5)', }} onMouseOver={() => mouseOver(index)}> <div style={{ position: 'relative', width: '306px', height: 142, boxShadow: '0px 2px 4px 0px rgba(231,231,231,0.5)', }} onMouseOver={() => mouseOver(index)}>
<img <img
src={item.img} src={item.img}
@ -256,7 +256,7 @@ const Mirroring = (props) => {
</Popconfirm> </Popconfirm>
</div> </div>
<div style={{ color: 'rgba(0,0,0,0.45)', marginTop: 10, fontSize: 12 }}> <div style={{ color: 'rgba(0,0,0,0.45)', marginTop: 10, fontSize: 12 }}>
最后编辑于{getTime(item.updateTime)} 最后编辑于{getTime(item.updateTime)||getTime(item.createTime)}
</div> </div>
<div style={{ color: 'rgba(0,0,0,0.45)', marginTop: 8, fontSize: 12 }}> <div style={{ color: 'rgba(0,0,0,0.45)', marginTop: 8, fontSize: 12 }}>
最后发布于{getTime(item.publishTime)} 最后发布于{getTime(item.publishTime)}

18
code/VideoAccess-VCMP/web/client/src/sections/openness/containers/mirroringDetail.jsx

@ -378,6 +378,12 @@ const MirroringDetail = (props) => {
setEditKey('') setEditKey('')
} }
function cameraAdd (item) {// function cameraAdd (item) {//
let myItemArr=[]
if(item.children){
for (let q = 0; q < item.children.length; q++) {
myItemArr.push(item.children[q].cameraId)
}
}
let myplainOptions = JSON.parse(JSON.stringify(plainOptions)) let myplainOptions = JSON.parse(JSON.stringify(plainOptions))
for (let j = 0; j < treeData.length; j++) {// for (let j = 0; j < treeData.length; j++) {//
if (treeData[j].children) {// if (treeData[j].children) {//
@ -389,24 +395,29 @@ const MirroringDetail = (props) => {
if (treeData[j].children[k].children[l].children[p].cameraId) { if (treeData[j].children[k].children[l].children[p].cameraId) {
for (let i = 0; i < myplainOptions.length; i++) { for (let i = 0; i < myplainOptions.length; i++) {
if (myplainOptions[i].value == treeData[j].children[k].children[l].children[p].cameraId) { if (myplainOptions[i].value == treeData[j].children[k].children[l].children[p].cameraId) {
if(myItemArr.indexOf(myplainOptions[i].value)==-1){
myplainOptions.splice(i, 1) myplainOptions.splice(i, 1)
} }
} }
} }
} }
} }
}
else if (treeData[j].children[k].children[l].cameraId) {// else if (treeData[j].children[k].children[l].cameraId) {//
for (let i = 0; i < myplainOptions.length; i++) { for (let i = 0; i < myplainOptions.length; i++) {
if (myplainOptions[i].value == treeData[j].children[k].children[l].cameraId) { if (myplainOptions[i].value == treeData[j].children[k].children[l].cameraId) {
if(myItemArr.indexOf(myplainOptions[i].value)==-1){
myplainOptions.splice(i, 1) myplainOptions.splice(i, 1)
} }
} }
} }
} }
} }
}
else if (treeData[j].children[k].cameraId) {// else if (treeData[j].children[k].cameraId) {//
for (let i = 0; i < myplainOptions.length; i++) { for (let i = 0; i < myplainOptions.length; i++) {
if (myplainOptions[i].value == treeData[j].children[k].cameraId) { if (myplainOptions[i].value == treeData[j].children[k].cameraId) {
if(myItemArr.indexOf(myplainOptions[i].value)==-1){
myplainOptions.splice(i, 1) myplainOptions.splice(i, 1)
} }
} }
@ -414,7 +425,9 @@ const MirroringDetail = (props) => {
} }
} }
} }
setCheckedList([]) }
onChange(myItemArr)
setCheckedList(myItemArr)
setSaveShowList(myplainOptions) setSaveShowList(myplainOptions)
setShowCameraList(myplainOptions) setShowCameraList(myplainOptions)
setAddCamera(true) setAddCamera(true)
@ -570,6 +583,7 @@ const MirroringDetail = (props) => {
let mainData = JSON.parse(JSON.stringify(treeData)) let mainData = JSON.parse(JSON.stringify(treeData))
let nodeKeyArr = addCameraKey.split('-') let nodeKeyArr = addCameraKey.split('-')
if (nodeKeyArr.length == 1) { if (nodeKeyArr.length == 1) {
mainData[nodeKeyArr[0]].children=[]
for (let q = 0; q < plainOptions.length; q++) { for (let q = 0; q < plainOptions.length; q++) {
for (let w = 0; w < checkedList.length; w++) { for (let w = 0; w < checkedList.length; w++) {
if (plainOptions[q].value == checkedList[w]) { if (plainOptions[q].value == checkedList[w]) {
@ -617,6 +631,7 @@ const MirroringDetail = (props) => {
} }
} }
} else if (nodeKeyArr.length == 2) { } else if (nodeKeyArr.length == 2) {
mainData[nodeKeyArr[0]].children[nodeKeyArr[1]].children=[]
for (let q = 0; q < plainOptions.length; q++) { for (let q = 0; q < plainOptions.length; q++) {
for (let w = 0; w < checkedList.length; w++) { for (let w = 0; w < checkedList.length; w++) {
if (plainOptions[q].value == checkedList[w]) { if (plainOptions[q].value == checkedList[w]) {
@ -668,6 +683,7 @@ const MirroringDetail = (props) => {
} }
} }
} else if (nodeKeyArr.length == 3) { } else if (nodeKeyArr.length == 3) {
mainData[nodeKeyArr[0]].children[nodeKeyArr[1]].children[nodeKeyArr[2]].children=[]
for (let q = 0; q < plainOptions.length; q++) { for (let q = 0; q < plainOptions.length; q++) {
for (let w = 0; w < checkedList.length; w++) { for (let w = 0; w < checkedList.length; w++) {
if (plainOptions[q].value == checkedList[w]) { if (plainOptions[q].value == checkedList[w]) {

Loading…
Cancel
Save