From 8374ffd4ee2ec2438e091d9a04c7bd48db29f7e4 Mon Sep 17 00:00:00 2001 From: deartibers <947466799@qq.com> Date: Thu, 25 Aug 2022 11:19:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E7=AD=9B=E9=80=89=E7=BB=84?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/assets/images/imageImg/addtext.png | Bin 0 -> 483 bytes .../client/assets/images/imageImg/delete.png | Bin 0 -> 438 bytes .../assets/images/imageImg/generate.png | Bin 0 -> 1246 bytes .../client/assets/images/imageImg/install.png | Bin 0 -> 533 bytes .../client/assets/images/imageImg/numBg.png | Bin 0 -> 3666 bytes .../client/assets/images/imageImg/save.png | Bin 718 -> 730 bytes .../client/assets/images/imageImg/toright.png | Bin 0 -> 372 bytes .../client/assets/images/imageImg/upload.png | Bin 1473 -> 1482 bytes .../sections/openness/actions/mirroring.js | 11 + .../openness/containers/mirroringDetail.jsx | 243 +++++++++++++++--- .../client/src/sections/openness/style.less | 8 + 11 files changed, 228 insertions(+), 34 deletions(-) create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/imageImg/addtext.png create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/imageImg/delete.png create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/imageImg/generate.png create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/imageImg/install.png create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/imageImg/numBg.png create mode 100644 code/VideoAccess-VCMP/web/client/assets/images/imageImg/toright.png diff --git a/code/VideoAccess-VCMP/web/client/assets/images/imageImg/addtext.png b/code/VideoAccess-VCMP/web/client/assets/images/imageImg/addtext.png new file mode 100644 index 0000000000000000000000000000000000000000..32444fe27c7be1b869b7c9f064e8da829c9445c6 GIT binary patch literal 483 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 literal 0 HcmV?d00001 diff --git a/code/VideoAccess-VCMP/web/client/assets/images/imageImg/save.png b/code/VideoAccess-VCMP/web/client/assets/images/imageImg/save.png index 632ec53c4ab83f894630fb1cf5dbc493d2da9371..e974d2ea8745c223dbde8ddc1039b9b5850ef3ea 100644 GIT binary patch delta 693 zcmV;m0!sbP1=}~7>1=IN` z(nwMS(pU&aY!pP1_$WkBuu&1T75oP*Y(h*Sh!G!15FZE{P>-B23zN+?ckgDFy@8$L zUUqlpo8Nx-%-yqdL}+HV6gUm^09%2@*|nO!CxO?%1K@(BUw_Ua|1h&%z(Zh1O>pg| z9RrR^8dY%iMHj(lV!@XRi6g+HNbDJKP|}|=&}Oy}cnTbd#vhjSI2Euzl|BHT zAZ2Y7cn)+5?XdfSosrg0V7;WTNr1y@9Rx0wakRjgL4Qe?TlF)u&O;&qF9;c(heyih zq1GemZ&Kh)%*;*#=YfrLq<#mSk#u)9ozf1+qGslKwC5b2#ZBeZ9W+k`CM3NnGA0Rd zk%?0EX@FBX`9Gb;;l|;d15HRYA<=|H)iIFDVKZAE_6HUvX8sMlmGmQ7wq|B4fm6V; z#ITv1Cx7raC4I~5m-<^Xvwgs!ieNL@Cz5mI{fY;#Kr(fU9sd)@H;>i<3PL(FjX?}f{Yht;+8MU)WPgUnJ&$_iHGK2*(*F0=1*ZUv%HH-xA%dI bS?Ts43NIF3+a%(m00000NkvXXu0mjfxmZFH delta 681 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 diff --git a/code/VideoAccess-VCMP/web/client/src/sections/openness/actions/mirroring.js b/code/VideoAccess-VCMP/web/client/src/sections/openness/actions/mirroring.js index 248e8a1..c388c3e 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/openness/actions/mirroring.js +++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/actions/mirroring.js @@ -13,4 +13,15 @@ export function getCamera(query) { msg: { option: "获取摄像头列表信息" }, reducer: { name: "equipmentWarehouseCamera", params: { noClear: true } }, }); +} +export function getCameraListAll() {//获取摄像头能力列表 + return (dispatch) => + basicAction({ + type: "get", + dispatch: dispatch, + actionType: "GET_CAMERA_LIST_ALL", + url: `${ApiTable.getCameraListAll}`, + msg: { option: "" }, + reducer: { name: "" }, + }); } \ No newline at end of file diff --git a/code/VideoAccess-VCMP/web/client/src/sections/openness/containers/mirroringDetail.jsx b/code/VideoAccess-VCMP/web/client/src/sections/openness/containers/mirroringDetail.jsx index 906f219..c6a9c8c 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/openness/containers/mirroringDetail.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/containers/mirroringDetail.jsx @@ -1,7 +1,7 @@ import React, { useEffect, useState, useRef } from 'react'; import { connect } from 'react-redux'; import '../style.less' -import { Tree, Popconfirm, Typography, Input, Switch, Modal, Checkbox, CheckboxGroup } from "@douyinfe/semi-ui" +import { Tree, Popconfirm, Typography, Input, Switch, Modal, Checkbox, CheckboxGroup,Select } from "@douyinfe/semi-ui" import VideoScreen from '../components/videoScreen'; @@ -30,8 +30,12 @@ const MirroringDetail = (props) => { const [checkedList, setCheckedList] = useState([]);//选中的摄像头列表 const [mykeyword, setMykeyword] = useState('');//摄像头搜索 const [showCameraList, setShowCameraList] = useState([])//展示的摄像头列表 + const [saveShowList, setSaveShowList] = useState([])//展示的摄像头列表 const [addCamera, setAddCamera] = useState(false);//添加视频弹框 const [addCameraKey, setAddCameraKey] = useState('');//添加视频弹框 + const [addScreen, setAddScreen] = useState(false)//筛选项设置弹框 + const [addLabel, setAddLabel] = useState(false)//标签组设置弹框 + const [filterGroup,setFilterGroup] = useState([])//筛选项数据 function onCheckAllChange (e) {//全选 if (e.target.checked) { @@ -48,14 +52,15 @@ const MirroringDetail = (props) => { setCheckall(e.target.checked); } function equipmentGetCamera () {//查询摄像头 - dispatch(openness.getCamera()).then((res) => { - let resList = res.payload.data.data + dispatch(openness.getCameraListAll()).then((res) => { + let resList = res.payload.data let optionsList = [] for (let i = 0; i < resList.length; i++) { optionsList.push({ label: resList[i].name, value: resList[i].id, extra: 'DID:' + resList[i].gbCamera.did || '', + did: resList[i].gbCamera.did || '' }) } setShowCameraList(optionsList) @@ -80,32 +85,49 @@ const MirroringDetail = (props) => { })), 1) } else if (nodeKeyArr.length == 2) { for (let index = 0; index < mainData.length; index++) { - mainData[index].children.splice( - mainData[index].children.indexOf(mainData[index].children.find(function (element) { - return element.key === item.key - })), 1) + if (mainData[index].children) { + for (let j = 0; j < mainData[index].children.length; j++) { + if (item.key == mainData[index].children[j].key) { + mainData[index].children.splice(j, 1) + } + } + } } } else if (nodeKeyArr.length == 3) { for (let j = 0; j < mainData.length; j++) { - for (let i = 0; i < mainData[j].children.length; i++) { - mainData[j].children[i].children.splice( - mainData[j].children[i].children.indexOf(mainData[j].children[i].children.find(function (element) { - return element.key === item.key - })), 1) + if (mainData[j].children) { + for (let i = 0; i < mainData[j].children.length; i++) { + if (mainData[j].children[i].children) { + for (let k = 0; k < mainData[j].children[i].children.length; k++) { + if (item.key == mainData[j].children[i].children[k].key) { + mainData[j].children[i].children.splice(k, 1) + } + } + } + + } } } } else if (nodeKeyArr.length == 4) { for (let k = 0; k < mainData.length; k++) { - for (let j = 0; j < mainData[k].children.length; j++) { - for (let i = 0; i < mainData[k].children[j].children.length; i++) { - mainData[k].children[j].children[i].children.splice( - mainData[k].children[j].children[i].children.indexOf(mainData[k].children[j].children[i].children.find(function (element) { - return element.key === item.key - })), 1) + if (mainData[k].children) { + for (let j = 0; j < mainData[k].children.length; j++) { + if (mainData[k].children[j].children) { + for (let i = 0; i < mainData[k].children[j].children.length; i++) { + if (mainData[k].children[j].children[i].children) { + for (let w = 0; w < mainData[k].children[j].children[i].children.length; w++) { + if (item.key == mainData[k].children[j].children[i].children[w].key) { + mainData[k].children[j].children[i].children.splice(w, 1) + } + } + } + } + } } } } } + setAddCamera(false) setTreeData(mainData) } function nodeAdd (item) {//添加树状子节点 @@ -230,8 +252,8 @@ const MirroringDetail = (props) => { } } } - console.log('myplainOptionsmyplainOptions', myplainOptions); setCheckedList([]) + setSaveShowList(myplainOptions) setShowCameraList(myplainOptions) setAddCamera(true) setAddCameraKey(item.key) @@ -318,7 +340,7 @@ const MirroringDetail = (props) => { { - keyArr.length > 2||(item.children&&item.children[0].cameraId) ? ('') : ( + (item.children && item.children.length > 0 && item.children[0].cameraId) || keyArr.length > 2 ? ('') : (
nodeAdd(item)}> { history.goBack() } function tochange (index) {//节点样式功能切换 - setChooseNum(index) + setChooseNum(index); + setAddCamera(false); + setMykeyword(''); + setAddScreen(false); + setAddLabel(false); } function addMainNode () {//增加主要节点 let mainData = JSON.parse(JSON.stringify(treeData)) @@ -360,15 +386,19 @@ const MirroringDetail = (props) => { } function searchCamera () {//查询摄像头 if (mykeyword !== '') { - console.log('111111111', mykeyword); + let myfindList = [] + for (let index = 0; index < showCameraList.length; index++) { + if (showCameraList[index].label.indexOf(mykeyword) != -1 || showCameraList[index].did.indexOf(mykeyword) != -1) { + myfindList.push(showCameraList[index]) + } + } + setShowCameraList(myfindList); } else { - console.log('22222222222', mykeyword); - // setShowCameraList(plainOptions) + setShowCameraList(saveShowList); } } function finishAdd () {//完成添加摄像头 - console.log('checkedList', checkedList); let mainData = JSON.parse(JSON.stringify(treeData)) let nodeKeyArr = addCameraKey.split('-') if (nodeKeyArr.length == 1) { @@ -479,8 +509,12 @@ const MirroringDetail = (props) => { } setTreeData(mainData); setAddCamera(false); + setMykeyword('') setAddCameraKey(''); } + function addScreenGroup () { + setAddScreen(true) + } return (
{
+
+ 设置 +
{ })}
{/* 节点 */} -
+
{ 增加主要节点
- {/*
*/} - {/*
*/}
{/* 添加视频 */} {addCamera ? ( -
+
添加视频
-
{ setAddCamera(false); setAddCameraKey('') }}> +
{ setAddCamera(false); setAddCameraKey(''); setMykeyword('') }}> 设置 { style={{ width: 140, marginLeft: 10 }} value={mykeyword} onChange={(value) => { setMykeyword(value) }} - placeholder="请输入摄像头名称" + placeholder="摄像头名称或DID" showClear>
@@ -607,7 +647,7 @@ const MirroringDetail = (props) => {
-
+
{
+ {/* 功能 */} +
+
+
+ 筛选项组 +
+
+ 设置 +
+
+
+ {addScreen ? ( +
+
+
+
筛选项组设置
+
+ 1/5 +
+
+
{ setAddScreen(false);setAddLabel(false); }}> + 设置 +
+
+
+
{ }}> + 设置 +
+
{ }}> + 添加筛选项 +
+
+
+
+
+
+ 我的筛选项八个字 +
+
+ 设置 +
+
+ 设置 +
+
{setAddLabel(true)}}> + 设置 +
+
+
+ console.log(v)} size="small" aria-label="是否禁用"> +
+
+
+
+ ) : ('')} + { addLabel?( +
+
+
筛选项组设置
+
{ setAddLabel(false); }}> + 设置 +
+
+
+
{ }}> + 设置 +
+
{ }}> + 添加标签组 +
+
+
+
+
+
标签组六个字
+
+ 设置 +
+
+ 设置 +
+
+
+ +
+
+
+
+ ):('') + }
- +