diff --git a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationHistroyProcess.jsx b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationHistroyProcess.jsx
index 55851b4..1f7e296 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationHistroyProcess.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/videoOperationHistroyProcess.jsx
@@ -27,7 +27,8 @@ const videoOperationHistroyProcess = ({ processDisX, setProcessDisX, histroyTime
pointParentWidthRef.current - 4.5 ?
- -38 - (38 - (pointParentWidthRef.current - 4.5 - processDisX)) :
- -38
+ processDisX + 42 > pointParentWidthRef.current - 4.5 ?
+ -42 - (42 - (pointParentWidthRef.current - 4.5 - processDisX)) :
+ -42
,
}}>
{
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 2b653b6..6b6b39d 100644
--- a/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
+++ b/code/VideoAccess-VCMP/web/client/src/components/videoPlayer/voiceHeader.jsx
@@ -5,7 +5,6 @@ import { Col, Row, } from "@douyinfe/semi-ui";
import { IconReply } from '@douyinfe/semi-icons';
import TextScroll from '../textScroll'
import './videoPlay.less';
-import { log } from "ezuikit-js";
const timeFormat = 'YYYY-MM-DD HH:mm:ss'
@@ -54,53 +53,63 @@ const VideoHeader = ({ operationState, changeSelectState, setProcessDisX, name,
updateTime()
}, [showTime])
+ const goBack = () => {
+ changeSelectState('histroy')
+ if (playState) {
+ player.stop().then(() => {
+ if (resolution == 'sd') {
+ player.play({ url: videoObj?.playUrlSd, })
+ } else {
+ player.play({ url: videoObj?.playUrlHd, })
+ }
+ playState = false
+ })
+ } else {
+ player.play({ url: resolution == 'sd' ? videoObj?.playUrlSd : videoObj?.playUrlHd, })
+ }
+ }
+
const vcmp_videoplay = document.getElementById("vcmp_videoplay" + videoObj.id)?.clientHeight
const vcmp_videopla = document.getElementById("vcmp_videoplay" + videoObj.id)?.clientWidth
return (
- {roll && vcmp_videopla > 320 ?
-
42 ? 42 : vcmp_videoplay * 0.12 < 30 ? 30 : vcmp_videoplay * 0.12}px`, background: videoStyle == 'true' ? content.length > 0 ? '#467ACD' : "" : '#000000FF', maxHeight: 42, minHeight: 30,
- position: 'absolute', width: '100%', zIndex: 80,
- color: '#fff'
- }}>
-
-
- {
- operationState && operationState.histroy.select ?
- <>
- {
- changeSelectState('histroy')
- if (playState) {
- player.stop().then(() => {
- if (resolution == 'sd') {
- player.play({ url: videoObj?.playUrlSd, })
- } else {
- player.play({ url: videoObj?.playUrlHd, })
- }
- playState = false
- })
- } else {
- player.play({ url: resolution == 'sd' ? videoObj?.playUrlSd : videoObj?.playUrlHd, })
- }
- }} />
- > : ''
- }
- {showTime_} {name}
-
-
-
- {content && content?.length > 0 ? : ""}
-
-
-
-
: ''}
+
42 ? 42 : vcmp_videoplay * 0.12 < 30 ? 30 : vcmp_videoplay * 0.12}px`,
+ background:
+ roll && vcmp_videopla > 320 ? 'opacity' :
+ videoStyle == 'true' ? content.length > 0 ? '#467ACD' : "" : '#000000FF',
+ maxHeight: 42,
+ minHeight: 30,
+ position: 'absolute', width: '100%', zIndex: 80,
+ color: '#fff'
+ }}>
+
+ 0 ? 'url(/assets/images/background/videoPlayBg.png)' : '',
+ backgroundSize: '100% 100%',
+ backgroundRepeat: 'no-repeat',
+ padding: '0 12px'
+ }}>
+ {
+ operationState && operationState.histroy.select ?
+ <>
+
+ > : ''
+ }
+ {
+ videoStyle == 'true' ?
+ '' : `${showTime_} ${name || ''}`
+ }
+
+
+
+ {content && content?.length > 0 ? : ""}
+
+
+
+
)
}