diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/blackBackground.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blackBackground.png new file mode 100644 index 0000000..77b7bde Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/blackBackground.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/blacktitleBottom.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blacktitleBottom.png new file mode 100644 index 0000000..6ecbcb6 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/blacktitleBottom.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/background.png b/code/VideoAccess-VCMP/web/client/assets/images/application/buleBackground.png similarity index 100% rename from code/VideoAccess-VCMP/web/client/assets/images/application/background.png rename to code/VideoAccess-VCMP/web/client/assets/images/application/buleBackground.png diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/titleBottom.png b/code/VideoAccess-VCMP/web/client/assets/images/application/buletitleBottom.png similarity index 100% rename from code/VideoAccess-VCMP/web/client/assets/images/application/titleBottom.png rename to code/VideoAccess-VCMP/web/client/assets/images/application/buletitleBottom.png diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/whiteBackground.png b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteBackground.png new file mode 100644 index 0000000..5c6451b Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteBackground.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/whitetitleBottom.png b/code/VideoAccess-VCMP/web/client/assets/images/application/whitetitleBottom.png new file mode 100644 index 0000000..08e10d7 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/whitetitleBottom.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/openness/black1.5.png b/code/VideoAccess-VCMP/web/client/assets/images/openness/black1.5.png new file mode 100644 index 0000000..0179213 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/openness/black1.5.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/openness/black2.png b/code/VideoAccess-VCMP/web/client/assets/images/openness/black2.png new file mode 100644 index 0000000..2e76847 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/openness/black2.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/openness/grey1.5.png b/code/VideoAccess-VCMP/web/client/assets/images/openness/grey1.5.png new file mode 100644 index 0000000..2122ed6 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/openness/grey1.5.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/openness/grey2.png b/code/VideoAccess-VCMP/web/client/assets/images/openness/grey2.png new file mode 100644 index 0000000..186c8f0 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/openness/grey2.png differ diff --git a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/container.jsx b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/container.jsx index 9c93378..fe83e85 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/container.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/container.jsx @@ -32,19 +32,16 @@ const Container = ({ videoObj, pageSize, showHeader, videoPlay }) => { {videoWidth && videoHeight ? videoPlay ? : : ""}
{videoObj?.label}
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx index 90a6331..0aab5cd 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.jsx @@ -9,10 +9,10 @@ import PerfectScrollbar from "perfect-scrollbar"; let timing let projectScrollbar; const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, showHeader }) => { - // console.log({ 视频: treeData }); + console.log({ 视频: treeData }); // console.log(filterGroup); // console.log(headerName); - console.log(videoPlay); + // console.log(videoPlay); // console.log(template); // console.log(showHeader); @@ -164,6 +164,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s } }, [queryValue]) //查询参数改变时 + useEffect(() => { let playVideo = [] const videoPlay = (data, values) => { @@ -177,8 +178,8 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s vv.children.map(c => { if (c.camera) playVideo.push(c) if (c.children) { - vv.children.map(cc => { - if (c.camera) playVideo.push(cc) + c.children.map(cc => { + if (cc.camera) playVideo.push(cc) }) } }) @@ -191,6 +192,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s } }) } + console.log(leftTree, leftValue); videoPlay(leftTree, leftValue) console.log(playVideo); setPlayData(playVideo); @@ -226,7 +228,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s }) } }) - console.log(videoData); + // console.log(videoData); if (searchs?.name) { videoData = videoData?.filter(v => v.label.includes(searchs.name)) @@ -246,7 +248,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s if (searchs?.field4) { videoData = videoData?.filter(({ cameraId }) => searchs?.field4.some(v => v == cameraId)) } - console.log(videoData); + // console.log(videoData); setPlayData(videoData) }, [searchs]) @@ -322,14 +324,26 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s // console.log(playData); + const mould = (blue, white, black) => { + switch (template) { + case 'blue': + return blue + case 'white': + return white + case 'black': + return black + default: + break; + } + } + return ( <>
@@ -345,10 +359,10 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s fontSize: '36px', fontFamily: 'SourceHanSansCN - Heavy, SourceHanSansCN', fontWeight: 800, - color: '#FFFFFF', + color: mould('#FFFFFF', 'rgba(0,0,0,0.65)', '#FFFFFF'), lineHeight: '70px', letterSpacing: '5px', - background: 'url(/assets/images/application/titleBottom.png) 100% 100%', + background: `url(/assets/images/application/${mould('buletitleBottom', "whitetitleBottom", "blacktitleBottom")}.png)`, backgroundSize: '100% 100%', }} >{headerName}
: ""} @@ -357,11 +371,11 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
-
+
查询: { // console.log(e); setLeftValue(e) @@ -407,7 +421,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s 全选
@@ -421,10 +435,10 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s 设备搜索:} field="name" maxLength="36" placeholder="请输入设备名称" labelPosition="left" style={{ width: 125, color: "#fff", }} /> {filterGroup?.map(v => { return {`${v.name.substr(0,2)}...:`}} + label={{`${v.name.substr(0, 2)}...:`}} labelPosition="left" field={"field" + v.num} - style={{ width: 75, color: "#fff", background: "#01185f", boxShadow: " inset 0px 0px 5px 1px rgba(28, 96, 254, 0.4)" }} + style={{ width: 75, background: mould('#01185f', ' #FFFFFF', '#ECECEC'), boxShadow: `inset 0px 0px 5px 1px ${mould('rgba(28, 96, 254, 0.4)', ' rgba(151,151,151,0.5)', 'rgba(39,39,39,0.2)')} ` }} placeholder="全部" showClear > @@ -475,7 +489,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
{/* 视频 */} -
+
{playData?.slice((page - 1) * pageSize, page * pageSize)?.map(v => { return @@ -505,10 +519,10 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
{/* 视频设置 */}
{[{ img: 'gongge', value: '宫格设置', screen: [{ img: 'screen1', value: '单屏' }, { img: 'screen4', value: '4分屏' }, { img: 'screen6', value: '6分屏' }, { img: 'screen12', value: '12分屏' },] }, - { img: 'polling', value: '轮询设置' }, + { img: 'polling', value: '轮询设置', }, { img: 'back', value: '背投', }, { img: 'monitor', value: '监控地图' },].map((v, index) => { return
@@ -531,9 +545,9 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s { console.log(v); setPolling(v) - }} aria-label="a switch for demo" style={{ border: ' 1px solid #D9D9D9', }} checked={polling} /> + }} aria-label="a switch for demo" style={{ border: ' 1px solid #D9D9D9', backgroundColor: polling ? '#2f53ea' : '' }} checked={polling} /> 轮询间隔 - { setPollingTime(Number(value.replace(/[^0-9]/ig, ''))) }} /> @@ -544,7 +558,10 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s } }} > - + { + if (v.value == '背投') document.getElementById('rearProjection').requestFullscreen() + }} />
{v.value}
diff --git a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.less b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.less index bfb7c13..8850b30 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.less +++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoScreen.less @@ -1,4 +1,5 @@ -.KJBlue { +.blue { + background-size: 100% 100% !important; .semi-tree-option, .semi-icon, .semi-checkbox-addon, //全选文字 @@ -7,28 +8,115 @@ span { color: #fff; } - .semi-page-item-active{ - color: rgb(17, 17, 17); + .semi-page-item-active { + color: rgb(17, 17, 17); } .semi-checkbox-inner-display { //树状多选框 border: 1px solid rgba(255, 255, 255, 0.488); } input { - color: #fff !important; + color: #fff !important; background: #01185f; box-shadow: inset 0px 0px 5px 1px rgba(28, 96, 254, 0.4); } - input::placeholder, - .semi-input-wrapper::-ms-value{ + input::placeholder{ + color: #fff; + } +// .semi-input-wrapper-disabled { +// background-color: #fff; +// } + .semi-form-field { + padding-right: 6px; + } + .semi-input-wrapper,.semi-input-wrapper-default //轮询输入框文字 + { color: #fff; } +} + +.white { + background-size: 100% 100% !important; + .semi-tree-option, + .semi-icon, + .semi-checkbox-addon, //全选文字 + .semi-form-field-label-text, + .semi-page-item, + span { + color: rgba(0, 0, 0, 0.65); + } + .semi-page-item-active { + color: rgb(17, 17, 17); + } + .semi-icon-checkbox_tick, //树状多选框勾选颜色 + .semi-checkbox-inner-display { + background-color: rgba(255, 255, 255, 0.65); + } + .semi-checkbox-inner-display { + //树状多选框 + border: 1px solid rgba(255, 255, 255, 0.488); + } + input { + color: rgba(0, 0, 0, 0.45) !important; + background: #ffffff; + box-shadow: 1px solid rgba(151, 151, 151, 0.5); + } + input::placeholder, + .semi-input-wrapper::-ms-value { + color: rgba(0, 0, 0, 0.65); + } + .semi-input-wrapper-disabled { + background-color: #fff; + } + .semi-form-field { + padding-right: 6px; + } + .semi-input-wrapper,.semi-input-wrapper-default //轮询输入框文字 + { + color: rgba(0, 0, 0, 0.65); + } +} +.black { + background-size: 100% 100% !important; + .semi-tree-option, + .semi-checkbox-addon, //全选文字 + .semi-form-field-label-text, + .semi-page-item, + span { + color: #fff; + } + .semi-icon { + color: black; + } + .semi-page-item-active { + color: rgb(17, 17, 17); + } + .semi-icon-checkbox_tick, //树状多选框勾选颜色 + .semi-checkbox-inner-display { + background-color: #ffffff; + } + .semi-checkbox-inner-display { + //树状多选框 + border: 1px solid rgba(255, 255, 255, 0.488); + } + input { + color: #fff !important; + background: #01185f; + box-shadow: inset 0px 0px 5px 1px rgba(28, 96, 254, 0.4); + } + input::placeholder, + .semi-input-wrapper::-ms-value { + color: #fff; + } + .semi-input-wrapper-disabled { + background-color: #fff; + } .semi-form-field { padding-right: 6px; } .semi-input-wrapper,.semi-input-wrapper-default //轮询输入框文字 - { + { color: #fff; } }