diff --git a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js index dd28cf2..46aa73a 100644 --- a/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js +++ b/code/VideoAccess-VCMP/api/app/lib/controllers/camera/index.js @@ -262,7 +262,7 @@ async function detail (ctx) { async function getCameraListAll (ctx) { try { const { models } = ctx.fs.dc; - + var front = new moment(); //验证前时间 const cameraRes = await models.Camera.findAll({ attributes: { exclude: ['delete', 'recycleTime', 'rtmp', 'createUserId', 'nvrId', 'kindId', 'yingshiSecretId', 'gbId'] }, order: [['id', 'DESC']], @@ -286,7 +286,9 @@ async function getCameraListAll (ctx) { ], }] }) - + var after = new moment(); + var duration = moment.duration(after.diff(front))._data.milliseconds; + console.log('duration',duration) ctx.status = 200; ctx.body = cameraRes } catch (error) { diff --git a/code/VideoAccess-VCMP/web/client/assets/images/application/blackBackground.png b/code/VideoAccess-VCMP/web/client/assets/images/application/blackBackground.png index 77b7bde..3c9cbb3 100644 Binary files a/code/VideoAccess-VCMP/web/client/assets/images/application/blackBackground.png and b/code/VideoAccess-VCMP/web/client/assets/images/application/blackBackground.png differ diff --git a/code/VideoAccess-VCMP/web/client/src/components/reminderBox.jsx b/code/VideoAccess-VCMP/web/client/src/components/reminderBox.jsx index f10ea7e..595658a 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/reminderBox.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/reminderBox.jsx @@ -28,7 +28,6 @@ const ReminderBox = ({ title, wait, toadd, visible, onOk, close, USER}) => { > { - console.log(checked) localStorage.setItem( USER, JSON.stringify(checked.target.checked) ) }} diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx index 80b873c..a895ec3 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperation.jsx @@ -50,7 +50,6 @@ const VideoOperation = ({ // setYingshiPrepare('play') } - console.log(player); videoFront = new moment(); //验证前时间 player.stop().then((res) => { if (resolution == 'sd') { diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationCloudControl.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationCloudControl.jsx index 32f6573..bea3826 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationCloudControl.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationCloudControl.jsx @@ -15,7 +15,6 @@ const VideoOperationCloudControl = ({ } } const vcmpVideo = document.getElementById('vcmp_videoplay')?.offsetHeight; - console.log(vcmpVideo); return (
{ // console.log(yingshiPlayer.current); if (disappear || duration > 2000) { setVideoMask(true) - console.log(numbers); dispatch(openness.getErrorCode({ status: numbers, platform: videoObj.type })).then((res) => { - console.log(res); if (res.payload.data) { if (res.payload.data.paraphraseCustom) { setWritten(res.payload.data.paraphraseCustom) @@ -260,7 +257,6 @@ const VideoPlay = ({ dispatch, actions, // 全屏状态监听 screenfull.on('change', (e) => { let curFullElement = screenfull.element - console.log(curFullElement); if (curFullElement && curFullElement.id == 'vcmp_videoplay' + videoObj.id) { if (e?.path[0]?.id?.includes("vcmp_videoplay")) { if (screenfull.isFullscreen && operationRef.current && !operationRef.current['fullScreen'].select) { @@ -269,7 +265,6 @@ const VideoPlay = ({ dispatch, actions, if (!screenfull.isFullscreen && operationRef.current && operationRef.current['fullScreen'].select) { changeSelectState('fullScreen') if (yingshiPlayer.current) { - console.log(45648641); // yingshiPlayer.current.reSize(size?.width, size?.height); } } @@ -288,7 +283,7 @@ const VideoPlay = ({ dispatch, actions, }); document.onkeydown = (e) => { - console.log(e.key); + } // const resize_ = () => { @@ -543,7 +538,7 @@ const VideoPlay = ({ dispatch, actions, // /> }
- {videoMask ?
{written}
: ''} + {videoMask ?
{written}
: ''} {/* 下方操作栏 */} {/* 显示操作功能条件（宽高） */} diff --git a/code/VideoAccess-VCMP/web/client/src/sections/application/components/applyModal.jsx b/code/VideoAccess-VCMP/web/client/src/sections/application/components/applyModal.jsx index e7ed4b9..24afabb 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/application/components/applyModal.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/application/components/applyModal.jsx @@ -15,7 +15,6 @@ const ApplyModal = ({ dispatch, actions, close, modalName, visible, appData }) = values.appId = appDatas?.id } dispatch(applicationCenter.postApplication(values)).then((res) => { - console.log(res); if (res.success) { close() form.current.reset() diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx index 681031a..d618a9e 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/cascadeCamera.jsx @@ -62,9 +62,7 @@ function cascadeCamera ({ dRef, dispatch, actions, cameraData, parentCamera, tes useEffect(() => { //测试成功后获取级联视频流 if (testComplete) { - console.log(formData); dispatch(equipmentWarehouse.getCascadeStream({ streamId: formData.streamId })).then((res) => { - console.log(res.payload.data); let chooseList = []; let data = res.payload.data.map((item, index) => { if (item.camera) { diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx index 9fd4b57..64b94e0 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/ipcCamera.jsx @@ -87,7 +87,6 @@ function ipcCamera ({ labelAlign="left" labelWidth="115px" onValueChange={(values) => { - console.log(values); let setting = ["abilityId", "cloudControl", "kindId", "name", "position", "serialNo"] // let setting = ["abilityId", "cloudControl", "kindId", "name", "position", "rtmp", "serialNo"] let b = {} @@ -98,7 +97,6 @@ function ipcCamera ({ return b.false = values.hasOwnProperty(item) } }) - console.log(b); Object.keys(b).length == 1 ? ashTrue() : ashFalse() }} @@ -211,7 +209,6 @@ function ipcCamera ({ style={{ padding: 0, paddingTop: 1, paddingBottom: 1 }} rules={[{ required: true, message: "请选择云台支持" }]} onChange={(checked) => { - console.log(checked.target.value); if (checked.target.value == true) { setcloud(true); } else { diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx index 10081f5..cd7d739 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/components/sideSheet.jsx @@ -138,7 +138,6 @@ function SideSheets (props) { rowId ) ).then((res) => { - console.log(res.payload.data); setNvrDetails(res.payload.data); projectScrollbar = new PerfectScrollbar("#project_information", { suppressScrollX: true, @@ -165,7 +164,6 @@ function SideSheets (props) { const statusNvr = nvrDetails?.gbNvr const statusCamera = nvrDetails?.gbCamera - console.log(); function colorStatus (data) { switch (data) { case "ON": diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx index e5c4a58..cce4ace 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/nvr.jsx @@ -366,7 +366,6 @@ const NvrHeader = (props) => { nvrRef={nvrRef} close={() => { const remind = localStorage.getItem(USER); - console.log(remind) if (!remind) { setReminder(true) } diff --git a/code/VideoAccess-VCMP/web/client/src/sections/example/containers/example.jsx b/code/VideoAccess-VCMP/web/client/src/sections/example/containers/example.jsx index 939c8e5..0734d66 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/example/containers/example.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/example/containers/example.jsx @@ -6,7 +6,6 @@ const { Meta } = Card; const Example = (props) => { const { dispatch, actions, user, loading, socket } = props - console.log(props) useEffect(() => { // ACTION 示例 diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx index 00ed2e5..478a339 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushModal.jsx @@ -76,7 +76,7 @@ function pushModal (props) { const [policyList, setPolicyList] = useState([//通知策略备注 { strategy: '系统监听到设备离线时，进行一次邮件推送，并将当前所 有离线的设备一同推送至信息邮箱，每次起始推送间隔不少于15分钟。', - example: '【superadmin】账号下的设备:【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，请及时处理！', + example: '【superadmin】账号下的设备:【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，请即时处理！', }, { strategy: '系统监听到设备上线时，推送至信息邮箱，每次推送间隔 不少于15分钟。', @@ -84,7 +84,7 @@ function pushModal (props) { }, { strategy: '系统在设定时间前统计所有离线的设备信息，并推送至信 息邮箱。', - example: '【superadmin】账号下的设备，截止【2022年22时00分】，有15个设备掉线:【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，请及时处理！', + example: '【superadmin】账号下的设备，截止【2022年22时00分】，有15个设备掉线:【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，【智慧小蓝排涝-乡山站排口】于【2022年22时00分】掉线，请即时处理！', }, ]);//阶段信息 const [chooseCameraList, setChooseCameraList] = useState([]);//第三阶段选中监听范围摄像头列表 diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx index 38dc967..f4bdfc4 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx @@ -157,7 +157,7 @@ function pushSideSheet (props) { }>
{itm.cameraList}
-
{itm.noticeWay == 'online' ? '上线及时通知' : itm.noticeWay == 'offline' ? '离线即时通知' : '24时定时统计'}
+
{itm.noticeWay == 'online' ? '上线即时通知' : itm.noticeWay == 'offline' ? '离线即时通知' : '24时定时统计'}
) })} diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx b/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx index fbd509b..30e7b05 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx @@ -46,8 +46,8 @@ const Carrierpigeon = (props) => { }, ]; const noticeWayObj = { - 'offline':'离线及时通知', - 'online':'上线及时通知', + 'offline':'离线即时通知', + 'online':'上线即时通知', 'timing':'定时统计', } useEffect(() => { @@ -206,7 +206,7 @@ const Carrierpigeon = (props) => { let val = r.noticeWay[index] noticeWayValue.push(noticeWayObj[val]) } - let noticeWayString=noticeWayValue.join(';') + let noticeWayString=noticeWayValue.join('；') return noticeWayString; }, }, diff --git a/code/VideoAccess-VCMP/web/client/src/sections/offline/style.less b/code/VideoAccess-VCMP/web/client/src/sections/offline/style.less index e69de29..bce4fa2 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/offline/style.less +++ b/code/VideoAccess-VCMP/web/client/src/sections/offline/style.less @@ -0,0 +1,8 @@ +.semi-table{ + .semi-table-row:first-child{ + .semi-table-row-head{ + background: #2662DC; + color: #FFFFFF; + } + } +} 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 9020447..dae2ea7 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 @@ -162,14 +162,11 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s useEffect(() => { - console.log(queryValue); if (treeData && queryValue.includes('全部')) { - console.log(54254); setLefTtree(treeData) let values = treeData.map(v => v.value) videoData(treeData, values) } else { - console.log(3); let leftData = [] queryValue.map(item => { leftData.push(treeData?.find(({ value }) => item == value)) @@ -207,9 +204,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s } }) } - console.log(leftTree, leftValue); videoPlay(leftTree, leftValue) - console.log(playVideo); setPlayData(playVideo); for (let v of treeData) { //判断是否全选 @@ -224,7 +219,6 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s }, [leftValue]) //树状勾选结果 useEffect(() => { - console.log(searchs); let videoData = [] let wholeVideo = treeData?.map(v => { if (v.children) { @@ -296,7 +290,6 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s //确定查询条件下视频总数 const videoData = (d, v) => { - console.log(d, v); let playVideo = [] let videos = d.filter(item => v.some(vv => vv == item.value)) const playVideoData = (data) => { @@ -316,8 +309,6 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s //宫格设置点击 const flipScreens = (data) => { const remind = localStorage.getItem(GONGGESCREEN) || 'false' - console.log(remind); - console.log(true); switch (data) { case "单屏": setPageSize(1) @@ -590,7 +581,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s {/* 视频设置 */}
{[{ 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: '轮询设置', }, @@ -603,7 +594,7 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s content={() => { switch (v.value) { case '宫格设置': - return
+ return
{v.screen.map((item) => { return
{ flipScreens(item.value); setMultiScreen(item.value) }}> @@ -612,9 +603,8 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s })}
case '轮询设置': - return
+ return
{ - console.log(v); setPolling(v) }} aria-label="a switch for demo" style={{ border: ' 1px solid #D9D9D9', backgroundColor: polling ? mould('#2F53EA', '#4B4B4B', '#555F6D') : mould('#E8F0FF', '#C2C2C2', '#D7D7D7') }} checked={polling} /> 轮询间隔