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 c8f08414
authored
Sep 27, 2023
by
李乾广
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
修改bug
1 parent
a70a02cd
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
5 deletions
h5/src/api/index.js
h5/src/components/vionPlayer/index.vue
h5/src/views/extension/index.vue
h5/src/views/extension/videoTime.vue
h5/src/api/index.js
View file @
c8f0841
...
...
@@ -10,10 +10,10 @@ const tourApi = {
},
// 云控制
ptzStart
(
params
,
config
)
{
return
req
(
'PUT'
,
`/patrol/
patrolDeviceChannel
/ptzStart`
,
params
,
config
)
return
req
(
'PUT'
,
`/patrol/
through
/ptzStart`
,
params
,
config
)
},
ptzStop
(
params
,
config
)
{
return
req
(
'PUT'
,
`/patrol/
patrolDeviceChannel
/ptzStop`
,
params
,
config
)
return
req
(
'PUT'
,
`/patrol/
through
/ptzStop`
,
params
,
config
)
},
// 获取设备录像记录
getThroughVideoRecord
(
params
,
config
){
...
...
h5/src/components/vionPlayer/index.vue
View file @
c8f0841
...
...
@@ -89,7 +89,7 @@ export default {
record
:
!
this
.
isXCXPage
,
// 录制
scale
:
!
this
.
isXCXPage
,
// 显示模式:拉伸、缩放、正常
},
extendOperateBtns
:
[
getRotateConfig
.
call
(
this
),
getMirrorRotate
.
call
(
this
)],
extendOperateBtns
:
this
.
isXCXPage
?[]:
[
getRotateConfig
.
call
(
this
),
getMirrorRotate
.
call
(
this
)],
});
console
.
log
(
'init-options'
,
options
);
...
...
h5/src/views/extension/index.vue
View file @
c8f0841
...
...
@@ -2,7 +2,6 @@
<div
class=
"extension-page"
>
<div
class=
"j-player-wrapper"
>
<vion-player
ref=
"vionPlayer"
:watermarkText=
"params.watermarkText"
:hideControls=
"false"
:showPtz=
"false"
:isXCXPage=
"true"
@
magnificationChange=
"magnificationChange"
/>
<!--
<img
src=
"data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADAAAAAwBAMAAAClLOS0AAAAJFBMVEVHcEzMzMzMzMzMzMzMzMzNzc3MzMzMzMzNzc3Nzc3MzMzMzMwv5ahDAAAAC3RSTlMAW+8S2UGVwyyZnOTRhEMAAAEfSURBVDjLzZKxbsJADIYdBQpsSCyVMlXAdEuQYGKpWFk6dWHJgsQ7sMDSpUv3PgITAQT0f7ly57ucQ45KXRAZot+/89k+X4ju9KzL4XOhlm3pR0enYrWViSRPXQIQSASkRSkIJEFRimYCuQAHSW89IOv6SH5TCsuAj68Ab1wDzqkAzqoC7AUAPtgsABgkBBgkCJiNHehGok//KRVsHqd+3Dj1/vukt3AH/Jj05s5/AmyZhFVWXDls44iVvfQWkCvgxU6g9ZdJfCLvjJbYaT3GvjOY4mQSG3SJGjhr/Y1Xohp+TGKqqzexZ/1GVGdNCitt6R8zVvb9d+JmKdl8o5sPWbtxT6zFuJcDQtk92MNmYiXHquYlZlVt1j4P6cd7fgHFW7Nhqu29TwAAAABJRU5ErkJggg=="
alt=
""
@
click=
"screenshot"
class=
"screen-shot-img"
>
-->
</div>
<!-- 时间线组件 -->
<div
class=
"extension-time-box"
>
...
...
@@ -44,6 +43,8 @@ export default {
watermarkText
:
''
,
appKey
:
''
,
ptzEnable
:
''
,
gateName
:
''
,
terminalType
:
''
,
},
panTiltList
:{
up
:
0
,
...
...
h5/src/views/extension/videoTime.vue
View file @
c8f0841
...
...
@@ -32,7 +32,7 @@
<!-- 操作按钮 -->
<div
class=
"operating-box"
>
<van-button
v-if=
"isNoBack&&ptzEnable==1"
type=
"info"
size=
"mini"
@
click=
"ptzControlChange"
>
{{
ptzControlShow
?
'隐藏云台'
:
'打开云台'
}}
</van-button>
<van-button
v-else
type=
"info"
size=
"mini"
@
click=
"backRealTime"
>
返回实时
</van-button>
<van-button
v-else
-if=
"!isNoBack"
type=
"info"
size=
"mini"
@
click=
"backRealTime"
>
返回实时
</van-button>
<!--
<div
v-if=
"isNoBack"
class=
"operating-btn"
@
click=
"ptzControlChange"
>
{{
ptzControlShow
?
'隐藏云台'
:
'打开云台'
}}
</div>
-->
<!--
<div
v-else
class=
"operating-btn"
@
click=
"backRealTime"
>
返回实时
</div>
-->
</div>
...
...
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