diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/blackBack.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blackBack.png new file mode 100644 index 0000000..ad30218 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/blackBack.png differ 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/blackGongge.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blackGongge.png new file mode 100644 index 0000000..0ea4b44 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/blackGongge.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/blackMonitor.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blackMonitor.png new file mode 100644 index 0000000..142ddfb Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/blackMonitor.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/blackPolling.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blackPolling.png new file mode 100644 index 0000000..dc4e87c Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/blackPolling.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen1.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen1.png new file mode 100644 index 0000000..6995026 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen1.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen12.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen12.png new file mode 100644 index 0000000..e2a0688 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen12.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen4.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen4.png new file mode 100644 index 0000000..a922fd1 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen4.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen6.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen6.png new file mode 100644 index 0000000..f2c6026 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/blackScreen6.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/back.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blueBackr.png similarity index 100% rename from code/VideoAccess-VCMP/web/client/assets/images/application/back.png rename to code/VideoAccess-VCMP/web/client/assets/images/application/blueBackr.png diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/gongge.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blueGongge.png similarity index 100% rename from code/VideoAccess-VCMP/web/client/assets/images/application/gongge.png rename to code/VideoAccess-VCMP/web/client/assets/images/application/blueGongge.png diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/monitor.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blueMonitor.png similarity index 100% rename from code/VideoAccess-VCMP/web/client/assets/images/application/monitor.png rename to code/VideoAccess-VCMP/web/client/assets/images/application/blueMonitor.png diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/polling.png b/code/VideoAccess-VCMP/web/client/assets/images/application/bluePolling.png similarity index 100% rename from code/VideoAccess-VCMP/web/client/assets/images/application/polling.png rename to code/VideoAccess-VCMP/web/client/assets/images/application/bluePolling.png diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/screen1.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blueScreen1.png similarity index 100% rename from code/VideoAccess-VCMP/web/client/assets/images/application/screen1.png rename to code/VideoAccess-VCMP/web/client/assets/images/application/blueScreen1.png diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/screen12.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blueScreen12.png similarity index 100% rename from code/VideoAccess-VCMP/web/client/assets/images/application/screen12.png rename to code/VideoAccess-VCMP/web/client/assets/images/application/blueScreen12.png diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/screen4.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blueScreen4.png similarity index 100% rename from code/VideoAccess-VCMP/web/client/assets/images/application/screen4.png rename to code/VideoAccess-VCMP/web/client/assets/images/application/blueScreen4.png diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/screen6.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blueScreen6.png similarity index 100% rename from code/VideoAccess-VCMP/web/client/assets/images/application/screen6.png rename to code/VideoAccess-VCMP/web/client/assets/images/application/blueScreen6.png 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/whiteBack.png b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteBack.png new file mode 100644 index 0000000..ad30218 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteBack.png differ 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/whiteGongge.png b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteGongge.png new file mode 100644 index 0000000..0ea4b44 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteGongge.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/whiteMonitor.png b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteMonitor.png new file mode 100644 index 0000000..142ddfb Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteMonitor.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/whitePolling.png b/code/VideoAccess-VCMP/web/client/assets/images/application/whitePolling.png new file mode 100644 index 0000000..8d7f6f3 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/whitePolling.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen1.png b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen1.png new file mode 100644 index 0000000..8610a57 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen1.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen12.png b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen12.png new file mode 100644 index 0000000..8669d0c Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen12.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen4.png b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen4.png new file mode 100644 index 0000000..8a9a05c Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen4.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen6.png b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen6.png new file mode 100644 index 0000000..0603347 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/application/whiteScreen6.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/white1.5.png b/code/VideoAccess-VCMP/web/client/assets/images/openness/white1.5.png new file mode 100644 index 0000000..2122ed6 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/openness/white1.5.png differ diff --git a/code/VideoAccess-VCMP/web/client/assets/images/openness/white2.png b/code/VideoAccess-VCMP/web/client/assets/images/openness/white2.png new file mode 100644 index 0000000..186c8f0 Binary files /dev/null and b/code/VideoAccess-VCMP/web/client/assets/images/openness/white2.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..a19cdb4 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 @@ -5,7 +5,7 @@ import { VideoPlay } from "$components"; import { useState } from 'react'; -const Container = ({ videoObj, pageSize, showHeader, videoPlay }) => { +const Container = ({ videoObj, pageSize, showHeader, videoPlay ,mould}) => { const [videoWidth, setVideoWidth] = useState() const [videoHeight, setVideoHeight] = useState() // console.log(videoObj); @@ -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/videoCard.jsx b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoCard.jsx index 3f44c54..b69d499 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoCard.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/openness/components/videoCard.jsx @@ -4,7 +4,7 @@ import { TreeSelect, Tree, Form, Button, Popover, Tag, Switch, Input, Row, Col } import Container from "./container"; -const VideoCard = ({ data, pageSize ,showHeader, key,videoPlay}) => { +const VideoCard = ({ data, pageSize ,showHeader, key,videoPlay,mould}) => { let span = 8 @@ -35,6 +35,7 @@ const VideoCard = ({ data, pageSize ,showHeader, key,videoPlay}) => { pageSize={pageSize} showHeader={showHeader} videoPlay={videoPlay} + mould={mould} /> 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..c216ae5 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 @@ -10,9 +10,9 @@ let timing let projectScrollbar; const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, showHeader }) => { // console.log({ 视频: treeData }); - // console.log(filterGroup); + console.log(filterGroup); // console.log(headerName); - console.log(videoPlay); + // console.log(videoPlay); // console.log(template); // console.log(showHeader); @@ -115,17 +115,28 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s const [polling, setPolling] = useState(false) //轮询 const [pollingTime, setPollingTime] = useState(1) //轮询时间 const [reminder, setReminder] = useState(false); //提醒弹框 + const [formWidth, setFormWidth] = useState(840); const api = useRef(); const pageRef = useRef(page); const GONGGESCREEN = 'gonggeScreen' - const chooseAll = useRef(true); useEffect(() => { projectScrollbar = new PerfectScrollbar("#tree", { suppressScrollX: true, }); + + const resize_ = () => { + setFormWidth(document.getElementById('formSearch').scrollWidth) + console.log(document.getElementById('formSearch').scrollWidth) + } + resize_() + window.addEventListener('resize', resize_); + return () => { + window.removeEventListener('resize', resize_); + } + }, []) useEffect(() => { const domProject = document.getElementById("tree"); @@ -133,8 +144,9 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s projectScrollbar.update(); } }) + + useEffect(() => { - console.log(45464); let query = [] treeData?.map(v => [ query.push({ label: v.label, value: v.value, key: v.key }) @@ -144,6 +156,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s videoData(treeData, values) setLefTtree(treeData) setLeftValue(treeData.map(v => v.value)) + api.current?.reset() }, [treeData, filterGroup]) useEffect(() => { @@ -164,6 +177,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s } }, [queryValue]) //查询参数改变时 + useEffect(() => { let playVideo = [] const videoPlay = (data, values) => { @@ -177,8 +191,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 +205,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s } }) } + console.log(leftTree, leftValue); videoPlay(leftTree, leftValue) console.log(playVideo); setPlayData(playVideo); @@ -231,20 +246,20 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s if (searchs?.name) { videoData = videoData?.filter(v => v.label.includes(searchs.name)) } - if (searchs?.field0) { - videoData = videoData?.filter(({ cameraId }) => searchs?.field0.some(v => v == cameraId)) + if (searchs.hasOwnProperty('field0')) { + videoData = videoData?.filter(({ cameraId }) => filterGroup[0].filters.find(v => v.num == searchs?.field0).cameraIds.some(v => v == cameraId)) } - if (searchs?.field1) { - videoData = videoData?.filter(({ cameraId }) => searchs?.field1.some(v => v == cameraId)) + if (searchs.hasOwnProperty('field1')) { + videoData = videoData?.filter(({ cameraId }) => filterGroup[1].filters.find(v => v.num == searchs?.field1).cameraIds.some(v => v == cameraId)) } - if (searchs?.field2) { - videoData = videoData?.filter(({ cameraId }) => searchs?.field2.some(v => v == cameraId)) + if (searchs.hasOwnProperty('field2')) { + videoData = videoData?.filter(({ cameraId }) => filterGroup[2].filters.find(v => v.num == searchs?.field2).cameraIds.some(v => v == cameraId)) } - if (searchs?.field3) { - videoData = videoData?.filter(({ cameraId }) => searchs?.field3.some(v => v == cameraId)) + if (searchs.hasOwnProperty('field3')) { + videoData = videoData?.filter(({ cameraId }) => filterGroup[3].filters.find(v => v.num == searchs?.field3).cameraIds.some(v => v == cameraId)) } - if (searchs?.field4) { - videoData = videoData?.filter(({ cameraId }) => searchs?.field4.some(v => v == cameraId)) + if (searchs.hasOwnProperty('field4')) { + videoData = videoData?.filter(({ cameraId }) => filterGroup[4].filters.find(v => v.num == searchs?.field4).cameraIds.some(v => v == cameraId)) } console.log(videoData); setPlayData(videoData) @@ -267,7 +282,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s setPage(pages) pageRef.current = pages } - }, pollingTimes * 1000 * 5) + }, pollingTimes * 1000 * 60) } }, [polling, playData, pollingTime]) @@ -322,14 +337,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 +372,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 +384,12 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
-
+
查询: { // console.log(e); setLeftValue(e) @@ -407,10 +436,10 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s 全选
-
+
console.log(values)} // onValueChange={values=>console.log(values)} @@ -420,16 +449,61 @@ 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)}...:`}} + let nameLength = 2 + let OptionWidth = 75 + console.log(formWidth); + console.log(filterGroup.filter(v => v.forbidden).length); + if (formWidth > 910) { + switch (filterGroup.filter(v => v.forbidden).length) { + case 1: + nameLength = 9 + OptionWidth = 130 + break; + case 2: + nameLength = 9 + OptionWidth = 130 + break; + case 3: + nameLength = 9 + OptionWidth = 130 + break; + case 4: + if (formWidth > 1145) { + nameLength = 9 + OptionWidth = 130 + + } else { + if (formWidth > 930) { + nameLength = 4 + OptionWidth = 100 + } + } + break; + case 5: + if (formWidth > 1380) { + nameLength = 9 + OptionWidth = 130 + } else { + if (formWidth > 1100) { + nameLength = 4 + OptionWidth = 100 + } + } + break; + default: + break; + } + } + return v.forbidden ? {v.name.length > nameLength ? `${v.name.substr(0, nameLength)}...:` : v.name + ':'}} 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: OptionWidth, 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 > - {v.filters.map(vv => {vv.name})} - + {v.filters.map(vv => {vv.name})} + : "" })}
@@ -441,7 +515,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
{/* 视频 */} -
+
{playData?.slice((page - 1) * pageSize, page * pageSize)?.map(v => { - return + return })}
{/* 视频设置 */}
- {[{ img: 'gongge', value: '宫格设置', screen: [{ img: 'screen1', value: '单屏' }, { img: 'screen4', value: '4分屏' }, { img: 'screen6', value: '6分屏' }, { img: 'screen12', value: '12分屏' },] }, - { img: 'polling', value: '轮询设置' }, - { img: 'back', value: '背投', }, - { img: 'monitor', value: '监控地图' },].map((v, index) => { + {[{ img: mould('blueGongge', 'whiteGongge', 'blackGongge'), value: '宫格设置', screen: [{ img: mould('blueScreen1', 'whiteScreen1', 'blackScreen1'), value: '单屏' }, { img: mould('blueScreen4', 'whiteScreen4', 'blackScreen4'), value: '4分屏' }, { img: mould('blueScreen6', 'whiteScreen6', 'blackScreen6'), value: '6分屏' }, { img: mould('blueScreen12', 'whiteScreen12', 'blackScreen12'), value: '12分屏' },] }, + { img: mould('bluePolling', 'whitePolling', 'blackPolling'), value: '轮询设置', }, + { img: mould('blueBackr', 'whiteBack', 'blackBack'), value: '背投', }, + { img: mould('blueMonitor', 'whiteMonitor', 'blackMonitor'), value: '监控地图' },].map((v, index) => { return
{ switch (v.value) { case '宫格设置': - return
+ return
{v.screen.map((item) => { return
flipScreens(item.value)}> -
{item.value}
+
{item.value}
})}
case '轮询设置': - return
+ return
{ 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 ? mould('#2f53ea') : '' }} checked={polling} /> 轮询间隔 - { setPollingTime(Number(value.replace(/[^0-9]/ig, ''))) }} /> @@ -544,7 +618,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..a851280 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,131 @@ 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-button-content { + color: #fff; + } + .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-select-selection-text, + .semi-select-selection-placeholder { + color: black; + } + .semi-icon { + color: black; + } + .semi-icon-chevron_left, + .semi-icon-chevron_right { + color: #fff; + } + .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: rgba(0, 0, 0, 0.45) !important; + background: #ececec; + box-shadow: inset 0px 0px 5px 1px rgba(39, 39, 39, 0.2); + } + 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; } + // .semi-popover { + // .semi-tree-wrapper { + // background-color: red; + // } + // } } 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 0db2ba0..57c96fe 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 @@ -1156,7 +1156,7 @@ const MirroringDetail = (props) => {
{ labelEditNum == item.num ? ( - { toChangeLabel(item.num, item.name, addLabelNum) }} onChange={(value) => toEditLabel(value, index)} style={{ width: 120 }} maxLength={8} className='inputpadding' size='small'> + { toChangeLabel(item.num, item.name, addLabelNum) }} onChange={(value) => toEditLabel(value, index)} style={{ width: 120 }} maxLength={6} className='inputpadding' size='small'> ) : (item.name) }