Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
蒋秀川
/
miniProject
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit 0f116822
authored
Sep 21, 2023
by
李乾广
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
修改bug
1 parent
6fa9b96d
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
20 additions
and
20 deletions
h5/src/views/pc/pcdemo.vue
h5/src/views/pc/timeline-canvas.vue
h5/src/views/pc/videoTime.vue
h5/src/views/pc/pcdemo.vue
View file @
0f11682
...
...
@@ -2,7 +2,7 @@
<div>
<!-- 添加视频测试 -->
<div>
<el-button
type=
"primary"
@
click=
"addPlayer(
{gateUnid: '85de13
26
-5775-11ee-94ed-00163e143ecd'})">河南分公司--办公室--办公室监控
</el-button>
<el-button
type=
"primary"
@
click=
"addPlayer(
{gateUnid: '85de13
a8
-5775-11ee-94ed-00163e143ecd'})">河南分公司--办公室--办公室监控
</el-button>
<el-button
type=
"primary"
@
click=
"addPlayer(
{gateUnid: '85de1326-5775-11ee-94ed-00163e143ecd',watermarkText:'Demo Store'})">Demo Store--客流相机-入口1
</el-button>
</div>
<indexPlayer
ref=
"iframe"
></indexPlayer>
...
...
@@ -29,9 +29,9 @@ export default {
isShowTime
:
true
,
// 是否显示时间操作区,默认为true
height
:
''
,
// 设置组件高度
isShowJT
:
false
,
// 是否显示截图按钮,默认为false
isShowSplit
:
fals
e
,
// 是否支持四分屏,默认为true
controlAutoHide
:
fals
e
,
// 是否显示视频操作区,默认为true
showPtz
:
fals
e
,
// 是否显示视频操作区中的云台控制,默认为true
isShowSplit
:
tru
e
,
// 是否支持四分屏,默认为true
controlAutoHide
:
tru
e
,
// 是否显示视频操作区,默认为true
showPtz
:
tru
e
,
// 是否显示视频操作区中的云台控制,默认为true
})
},
methods
:
{
...
...
h5/src/views/pc/timeline-canvas.vue
View file @
0f11682
...
...
@@ -187,14 +187,14 @@ export default {
//"横屏";
}
//有时屏幕尺寸变化了,而容器的尺寸还未改变的情况下的处理
if
(
this
.
canvas
.
style
.
width
===
this
.
canvas
.
parentElement
.
clientWidth
+
"px"
)
{
setTimeout
(()
=>
{
this
.
resize
();
},
10
);
}
else
{
//重新初始化
this
.
init
();
}
//
if (this.canvas.style.width === this.canvas.parentElement.clientWidth + "px") {
//
setTimeout(() => {
//
this.resize();
//
}, 10);
//
} else {
//
//重新初始化
//
this.init();
//
}
},
//进度条停止播放
stop
()
{
...
...
h5/src/views/pc/videoTime.vue
View file @
0f11682
...
...
@@ -134,13 +134,13 @@ export default {
},
mounted
()
{
let
that
=
this
window
.
addEventListener
(
'resize'
,
function
()
{
if
(
!
that
.
isFullScreenFun
())
{
// 非全屏状态
//业务逻辑
that
.
exitFullScreen
()
}
});
//
window.addEventListener('resize', function () {
//
if (!that.isFullScreenFun()) {
//
// 非全屏状态
//
//业务逻辑
//
that.exitFullScreen()
//
}
//
});
window
.
addEventListener
(
'keydown'
,
this
.
timeInputKeyCode
)
this
.
timeRange
=
[
moment
().
format
(
'YYYY-MM-DD 00:00:00'
),
moment
().
format
(
'YYYY-MM-DD 23:59:59'
)]
// this.markTime = [{
...
...
@@ -160,7 +160,7 @@ export default {
this
.
initDay
()
},
beforeDestroy
()
{
window
.
removeEventListener
(
"resize"
,
this
.
isFullScreenFun
,
true
);
//
window.removeEventListener("resize", this.isFullScreenFun, true);
window
.
removeEventListener
(
"keydown"
,
this
.
timeInputKeyCode
,
true
);
this
.
stopPlay
()
},
...
...
Write
Preview
Markdown
is supported
Attach a file
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to post a comment