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

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

code/VideoAccess-VCMP/web/client/src/components/reminderBox.jsx

@@ -28,7 +28,6 @@ const ReminderBox = ({ title, wait, toadd, visible, onOk, close, USER}) => {
                 >
                     <Checkbox
                         onChange={(checked) =>{
-                             console.log(checked)
                              localStorage.setItem( USER, JSON.stringify(checked.target.checked)
                             )
                             }}

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

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 (
             <div style={{
                 position: 'absolute', top: 'calc(50% - 105px)', left: 'calc(50% - 125px)',

code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoPlay.jsx

@@ -123,14 +123,11 @@ const VideoPlay = ({ dispatch, actions,
 
       if (disappear || !videoMask) {
          let duration = moment.duration(videoAfter?.diff(videoFront))._data.milliseconds;
-         console.log(duration);
          setTimeout(() => {
             // 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,
                   // />
                }
                <div id={containerId} style={{ height: '100%', width: '100%', }}></div>
-               {videoMask ? <div style={{ height: '100%', width: '100%', position: 'absolute', top: '0', left: '0', zIndex: 99, backgroundColor: 'black', color: "red", }}><div style={{ position: 'absolute', top: 'calc(60%)', left: 0, zIndex: 99, textAlign: 'center', width: '100%' }}>{written}</div></div> : ''}
+               {videoMask ? <div style={{ height: '100%', width: '100%', position: 'absolute', top: '0', left: '0', backgroundColor: 'black', color: "red", }}><div style={{ position: 'absolute', top: 'calc(60%)', left: 0, zIndex: 99, textAlign: 'center', width: '100%' }}>{written}</div></div> : ''}
 
                {/* 下方操作栏 */}
                {/* 显示操作功能条件（宽高） */}

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

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

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 {

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":

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

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 示例

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([]);//第三阶段选中监听范围摄像头列表

code/VideoAccess-VCMP/web/client/src/sections/offline/components/pushSideSheet.jsx

@@ -157,7 +157,7 @@ function pushSideSheet (props) {
                                                         }>
                                                             <div style={{ marginRight: 24, width: 133, textOverflow: 'ellipsis', whiteSpace: 'nowrap', overflow: 'hidden' }}>{itm.cameraList}</div>
                                                         </Popover>
-                                                        <div style={{ marginRight: 25, width: 83 }} className={itm.noticeWay == 'online' ? 'online' : itm.noticeWay == 'offline' ? 'offline' : 'timing'}>{itm.noticeWay == 'online' ? '上线及时通知' : itm.noticeWay == 'offline' ? '离线即时通知' : '24时定时统计'}</div>
+                                                        <div style={{ marginRight: 25, width: 83 }} className={itm.noticeWay == 'online' ? 'online' : itm.noticeWay == 'offline' ? 'offline' : 'timing'}>{itm.noticeWay == 'online' ? '上线即时通知' : itm.noticeWay == 'offline' ? '离线即时通知' : '24时定时统计'}</div>
                                                     </div>
                                                 )
                                             })}

code/VideoAccess-VCMP/web/client/src/sections/offline/containers/carrierpigeon.jsx

@@ -46,8 +46,8 @@ const Carrierpigeon = (props) => {
         },
     ];
     const noticeWayObj = {
-        'offline':'离线及时通知',
+        'offline':'离线即时通知',
-        'online':'上线及时通知',
+        '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;
                 },
             },

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

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
                      </div>
                      {/* 视频设置 */}
                      <div style={{
-                       marginTop:5, width: 64, height: 476, background: mould('#01185F', ' linear-gradient(197deg, rgba(255,255,255,0.65) 0%, #E4E4E4 100%)', 'linear-gradient(197deg, rgba(38,38,38,0.65) 0%, #101010 100%)'), boxShadow: `inset 0px 0px 5px 1px ${mould('rgba(28,96,254,0.4000)', 'rgba(97,94,94,0.5)', 'rgba(132,132,132,0.5)')}`, borderRadius: ' 1px', textAlign: 'center',
+                       marginTop:5, width: 64, height: 476, background: mould('#01185F', ' linear-gradient(197deg, rgba(255,255,255,0.65) 0%, #E4E4E4 100%)', 'linear-gradient(216deg, #979797 0%, #BEBEBE 53%, #969696 100%)'), boxShadow: `inset 0px 0px 5px 1px ${mould('rgba(28,96,254,0.4000)', 'rgba(97,94,94,0.5)', 'rgba(132,132,132,0.5)')}`, borderRadius: ' 1px', textAlign: 'center',
                      }}>
                         {[{ 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 <div style={{ height: 69, background: mould('#01185F', 'linear-gradient(245deg, #FFFFFF 0%, #EAEBEC 100%)', 'linear-gradient(197deg, rgba(38,38,38,0.65) 0%, #101010 100%)'), boxShadow: `inset 0px 0px 5px 1px ${mould('rgba(28,96,254,0.2500)', 'rgba(97,94,94,0.39)', 'rgba(132,132,132,0.5)')}`, display: 'flex', justifyContent: 'space-evenly', alignItems: 'center' }}>
+                                          return <div style={{ height: 69, background: mould('#01185F', 'linear-gradient(245deg, #FFFFFF 0%, #EAEBEC 100%)', 'linear-gradient(311deg, #9D9D9D 0%, #8C8C8C 50%, #7E7E7E 100%)'), boxShadow: `inset 0px 0px 5px 1px ${mould('rgba(28,96,254,0.2500)', 'rgba(97,94,94,0.39)', 'rgba(132,132,132,0.5)')}`, display: 'flex', justifyContent: 'space-evenly', alignItems: 'center' }}>
                                              {v.screen.map((item) => {
                                                 return <div key={item.img} onClick={() => { flipScreens(item.value); setMultiScreen(item.value) }}>
                                                    <img src={`/assets/images/application/${item.img}.png`} alt="" style={{ width: 40, height: 40, }} />
@@ -612,9 +603,8 @@ const VideoScreen = ({ treeData, filterGroup, videoPlay, template, headerName, s
                                              })}
                                           </div>
                                        case '轮询设置':
-                                          return <div style={{ height: 48, background: mould('#01185F', 'linear-gradient(245deg, #FFFFFF 0%, #EAEBEC 100%)', 'linear-gradient(197deg, rgba(38,38,38,0.65) 0%, #101010 100%)'), boxShadow: `inset 0px 0px 5px 1px ${mould('rgba(28,96,254,0.2500)', 'rgba(97,94,94,0.39)', 'rgba(132,132,132,0.5)')}`, color: mould("#D9D9D9", '', "#D9D9D9"), display: 'flex', justifyContent: 'space-evenly', alignItems: 'center' }}>
+                                          return <div style={{ height: 48, background: mould('#01185F', 'linear-gradient(245deg, #FFFFFF 0%, #EAEBEC 100%)', 'linear-gradient(311deg, #9D9D9D 0%, #8C8C8C 50%, #7E7E7E 100%)'), boxShadow: `inset 0px 0px 5px 1px ${mould('rgba(28,96,254,0.2500)', 'rgba(97,94,94,0.39)', 'rgba(132,132,132,0.5)')}`, color: mould("#D9D9D9", '', "#D9D9D9"), display: 'flex', justifyContent: 'space-evenly', alignItems: 'center' }}>
                                              <Switch onChange={(v, e) => {
-                                                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} />
                                              轮询间隔