diff --git a/code/VideoAccess-VCMP/api/.vscode/launch.json b/code/VideoAccess-VCMP/api/.vscode/launch.json index d2b588d..14736de 100644 --- a/code/VideoAccess-VCMP/api/.vscode/launch.json +++ b/code/VideoAccess-VCMP/api/.vscode/launch.json @@ -16,7 +16,7 @@ "-p 4000", "-f http://localhost:4000", "-g postgres://postgres:123@10.8.30.32:5432/video_access", - "--redisHost 127.0.0.1", + "--redisHost 10.8.30.34", "--redisPort 6379", "--axyApiUrl http://127.0.0.1:4100", "--iotAuthApi http://127.0.0.1:4200", diff --git a/code/VideoAccess-VCMP/api/app/lib/controllers/application/index.js b/code/VideoAccess-VCMP/api/app/lib/controllers/application/index.js new file mode 100644 index 0000000..9d5e12f --- /dev/null +++ b/code/VideoAccess-VCMP/api/app/lib/controllers/application/index.js @@ -0,0 +1,11 @@ +'use strict'; +const fs = require('fs'); +const moment = require('moment') + + + + + +module.exports = { + + }; \ No newline at end of file diff --git a/code/VideoAccess-VCMP/api/app/lib/routes/application/index.js b/code/VideoAccess-VCMP/api/app/lib/routes/application/index.js new file mode 100644 index 0000000..e06bc00 --- /dev/null +++ b/code/VideoAccess-VCMP/api/app/lib/routes/application/index.js @@ -0,0 +1,9 @@ +'use strict'; + +const application = require('../../controllers/application'); + + +module.exports = function (app, router, opts) { + + +}; diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx index 376708c..b88ed7a 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx @@ -65,6 +65,16 @@ const VideoPlay = ({ iotVideoServer, local, //是否本地调用视频 }) => { + if (videoObj.type == 'yingshi') { + videoObj = { + ...videoObj, + playUrlSd: `ezopen://open.ys7.com/${videoObj.serialNo}/${videoObj.channelNo || '1'}.live`, + playUrlHd: `ezopen://open.ys7.com/${videoObj.serialNo}/${videoObj.channelNo || '1'}.hd.live`, + replayUrl: `ezopen://open.ys7.com/${videoObj.serialNo}/${videoObj.channelNo || '1'}.hd.local.rec`, + } + } + + const [jessibuca, setjessibuca] = useState(null) const [player, setPlayer] = useState(null) const [isPlaying, setIsPlaying] = useState(false) diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx index 87296bc..7732b06 100644 --- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx +++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx @@ -58,13 +58,12 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name, const vcmp_videoplay = document.getElementById('vcmp_videoplay')?.clientHeight const vcmp_videopla = document.getElementById('vcmp_videoplay')?.clientWidth - console.log(vcmp_videopla); return (
{roll && vcmp_videopla > 320 ?
42 ? 42 : vcmp_videoplay * 0.12 < 30 ? 30 : vcmp_videoplay * 0.12}px`, background: videoStyle == 'true' ? '#467ACD' : '#00000026', maxHeight: 42, minHeight: 30, + height: '12%', lineHeight: `${vcmp_videoplay * 0.12 > 42 ? 42 : vcmp_videoplay * 0.12 < 30 ? 30 : vcmp_videoplay * 0.12}px`, background: videoStyle == 'true' ? '#467ACD' : '#000000FF', maxHeight: 42, minHeight: 30, position: 'absolute', width: '100%', zIndex: 80, color: '#fff' }}> @@ -99,7 +98,7 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
- {content ? : ""} + {content ? : ""}
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 c4c6a32..10081f5 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 @@ -152,6 +152,7 @@ function SideSheets (props) { useEffect(() => { + const domProject = document.getElementById("project_information"); if (domProject && projectScrollbar) { projectScrollbar.update(); diff --git a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx index e0dbdda..47b964e 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/equipmentWarehouse/containers/camera.jsx @@ -223,9 +223,10 @@ const CameraHeader = (props) => { type: row.type, serialNo: row.serialNo, yingshiToken: row.secretYingshi?.token, - playUrlSd: `ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || '1'}.live`, - playUrlHd:`ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || '1'}.hd.live`, - replayUrl:`ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || '1'}.hd.local.rec`, + channelNo: row.channelNo || 1, + // playUrlSd: `ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || 1}.live`, + // playUrlHd: `ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || 1}.hd.live`, + // replayUrl: `ezopen://open.ys7.com/${row.serialNo}/${row.channelNo || 1}.hd.local.rec`, content: data, }) } else { diff --git a/code/VideoAccess-VCMP/web/client/src/sections/journaling/components/videoScreen.jsx b/code/VideoAccess-VCMP/web/client/src/sections/journaling/components/videoScreen.jsx new file mode 100644 index 0000000..40ed2ab --- /dev/null +++ b/code/VideoAccess-VCMP/web/client/src/sections/journaling/components/videoScreen.jsx @@ -0,0 +1,91 @@ +import React, { useEffect } from 'react'; +import { connect } from 'react-redux'; +import { TreeSelect, Tree } from '@douyinfe/semi-ui'; + + +const VideoScreen = (props) => { + + const treeData = [{ + label: '全部', + value: '全部', + key: '0', + children: [{ + label: '公司', + value: '公司', + key: '0-1', + children: [ + { + label: '大门', + value: '大门', + key: '0-1-1', + }, { + label: '机房', + value: '机房', + key: '0-1-2', + }, { + label: '后门', + value: '后门', + key: '0-1-3', + }, + ] + }, { + label: '外部', + value: '外部', + key: '0-2', + children: [ + { + label: '门口', + value: '门口', + key: '0-2-1', + }, + ] + }] + }] + + + + return ( + <> + {/* 头部标题及搜索 */} +
智慧小蓝视频融合监管中心
+
+
+
查询： + { + console.log(e) + }} + /> +
+ + +
+
+ +
+ +
+ + + ) +} + +function mapStateToProps (state) { + const { auth } = state; + return { + user: auth.user, + }; +} + +export default connect(mapStateToProps)(VideoScreen) diff --git a/code/VideoAccess-VCMP/web/client/src/sections/journaling/containers/journalingCenter.jsx b/code/VideoAccess-VCMP/web/client/src/sections/journaling/containers/journalingCenter.jsx index f0a4de2..031d612 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/journaling/containers/journalingCenter.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/journaling/containers/journalingCenter.jsx @@ -1,20 +1,27 @@ import React, { useEffect } from 'react'; import { connect } from 'react-redux'; import { Coming } from '$components' +import VideoScreen from '../components/videoScreen' + + import '../style.less' const JournalingCenter = (props) => { - return ( - - ) + return ( + // + <> + + + + ) } function mapStateToProps (state) { - const { auth } = state; - return { - user: auth.user, - }; + const { auth } = state; + return { + user: auth.user, + }; } export default connect(mapStateToProps)(JournalingCenter); diff --git a/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx b/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx index 3ccc443..2d87595 100644 --- a/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx +++ b/code/VideoAccess-VCMP/web/client/src/sections/monitor/containers/videoPlayCross.jsx @@ -11,7 +11,7 @@ const VideoPlayCross = (props) => { const viideoData = useRef(videoParams) useEffect(() => { - console.log(props); + // console.log(props); if (props.location.search) { decodeURIComponent(props.location.search) const params = qs.parse(props.location.search.slice(1)) diff --git a/code/VideoAccess-VCMP/web/package.json b/code/VideoAccess-VCMP/web/package.json index 3b213ad..4a567e9 100644 --- a/code/VideoAccess-VCMP/web/package.json +++ b/code/VideoAccess-VCMP/web/package.json @@ -7,7 +7,7 @@ "test": "mocha", "start-vite": "cross-env NODE_ENV=developmentVite npm run start-params", "start": "cross-env NODE_ENV=development npm run start-params", - "start-params": "node server -p 5000 -u http://10.8.30.34:4000 --apiVcmpUrl http://localhost:4000 --apiAuthUrl http://10.8.30.34:4200 --apiAnxinyunUrl http://10.8.30.34:4100 --iotAuthWeb http://localhost:5200 --iotVideoServer http://221.230.55.27:8081", + "start-params": "node server -p 5000 -u http://localhost:4000 --apiVcmpUrl http://localhost:4000 --apiAuthUrl http://localhost:4200 --apiAnxinyunUrl http://localhost:4100 --iotAuthWeb http://localhost:5200 --iotVideoServer http://221.230.55.27:8081", "deploy": "export NODE_ENV=production&& npm run build && node server", "build-dev": "cross-env NODE_ENV=development&&webpack --config webpack.config.js", "build": "export NODE_ENV=production&&webpack --config webpack.config.prod.js"