Merge branch 'dev_trial' of https://gitea.anxinyun.cn/free-sun/FS-IOT into dev_trial

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 = {
+   
+ };

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) {
+
+   
+};

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)

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 (
         <div>
             {roll && vcmp_videopla > 320 ?
                 <div style={{
-                    height: '12%', lineHeight: `${vcmp_videoplay * 0.12 > 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,
                         </Col>
                         <Col span={videoStyle == 'true' ? 24 : 15} style={{}}>
                             <div style={{ paddingRight: 12 }}>
-                                {content ? <TextScroll content={content || []} duration={6} roll={roll} /> : ""}
+                                {content ? <TextScroll content={content || []} duration={6} /> : ""}
                             </div>
                         </Col>
                     </Row>

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();

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 {

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 (
+        <>
+            {/* 头部标题及搜索 */}
+            <div>智慧小蓝视频融合监管中心</div>
+            <div>
+                <div style={{ width: 200, }}>
+                    <div>查询：
+                        <TreeSelect
+                            style={{ width: 150 }}
+                            dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
+                            treeData={treeData}
+                            placeholder="请选择"
+                            multiple={true}
+                            defaultValue={['全部']}
+                            maxTagCount={1}
+                            onChange={(e) => {
+                                console.log(e)
+                            }}
+                        />
+                    </div>
+
+                    <Tree
+                        treeData={treeData}
+                        defaultExpandAll
+                        style={{ width: 150 }}
+                    />
+                </div>
+                <div style={{flex: 1}}>
+
+                </div>
+
+            </div>
+
+        </>
+    )
+}
+
+function mapStateToProps (state) {
+    const { auth } = state;
+    return {
+        user: auth.user,
+    };
+}
+
+export default connect(mapStateToProps)(VideoScreen)

code/VideoAccess-VCMP/web/client/src/sections/journaling/containers/journalingCenter.jsx

@@ -1,12 +1,19 @@
 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 (
-      <Coming />
+        //   <Coming />
+        <>
+         <VideoScreen />
+        </>
+       
     )
 }
 

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))

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"