Skip to content
Toggle navigation
Projects
Groups
Snippets
Help
Toggle navigation
This project
Loading...
Sign in
platform
/
fanxing_new
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 6ad19ddf
authored
Jul 20, 2021
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
【BUG】修改28181无法下发任务问题
1 parent
cf3ae4a5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
6 deletions
public/js/version.json
src/main.js
src/views/public/flvvideo.vue
src/views/sceneManage/setting/ytconfig.vue
src/views/taskManage/editVideo.vue
public/js/version.json
View file @
6ad19dd
{
"commit"
:
"a03847f885ec625778c76c07f9d062f6220bb759"
,
"commitDate"
:
"2021-7-15 14:41"
,
"buildDate"
:
"2021-7-15 19:3"
,
"version"
:
"2.1.0"
,
"info"
:
"【NEW】20181手动拉取"
}
\ No newline at end of file
{
"commit"
:
"cf3ae4a5b19c6eb0b2689a9834d66b36b7bc3519"
,
"commitDate"
:
"2021-7-16 14:21"
,
"buildDate"
:
"2021-7-20 19:20"
,
"version"
:
"2.1.0"
,
"info"
:
"临时提交"
}
\ No newline at end of file
src/main.js
View file @
6ad19dd
...
...
@@ -11,8 +11,8 @@ import log from "./api/log";
import
"./assets/css/public.css"
;
import
echarts
from
"echarts"
;
import
"./assets/icon/icon/iconfont.css"
;
import
"./assets/icon/icon3/iconfont.css"
;
import
"./assets/icon/icon4/iconfont.css"
;
import
"./assets/icon/icon3/iconfont.css"
;
import
"../src/assets/js/vporto"
;
import
{
buildCode
}
from
"../src/assets/js/buildcodes"
;
import
particles
from
"particles.js"
;
...
...
src/views/public/flvvideo.vue
View file @
6ad19dd
...
...
@@ -40,7 +40,6 @@ export default {
// this.flv_destroy();
// }
// }
debugger
if
(
this
.
player
)
{
this
.
destoryVideo
(
this
.
player
);
}
...
...
@@ -58,12 +57,12 @@ export default {
});
this
.
player
.
attachMediaElement
(
playerel
);
this
.
player
.
load
();
setTimeout
(()
=>
{
this
.
player
.
play
();
},
500
);
this
.
player
.
on
(
flvjs
.
Events
.
ERROR
,
(
errType
,
errDetail
)
=>
{
// alert("网络波动,正在尝试连接中...");
console
.
log
(
"=============="
,
errType
)
debugger
if
(
this
.
player
)
{
this
.
reloadVideo
(
this
.
player
);
}
...
...
@@ -95,11 +94,13 @@ export default {
this
.
startFunc
(
this
.
cururl
);
},
destoryVideo
(
flvPlayer
)
{
flvPlayer
.
pause
();
flvPlayer
.
unload
();
flvPlayer
.
detachMediaElement
();
flvPlayer
.
destroy
();
flvPlayer
=
null
;
this
.
player
=
null
;
},
flv_pause
()
{
this
.
player
.
pause
();
...
...
src/views/sceneManage/setting/ytconfig.vue
View file @
6ad19dd
...
...
@@ -165,9 +165,20 @@ export default {
},
subset
()
{
let
vrefid
=
this
.
vchan
.
refid
||
this
.
vchan
.
vchan_refid
;
try
{
document
.
getElementById
(
"VionVideo"
)
.
VionPTZControl
(
String
(
vrefid
),
Number
(
18
),
Number
(
this
.
presetindex
));
}
catch
(
error
)
{
console
.
log
(
error
)
}
if
(
!
this
.
presetindex
||
this
.
presetindex
==
null
||
''
){
this
.
$message
({
message
:
"预置位编号不能为空"
,
type
:
"warning"
});
return
}
this
.
$emit
(
"subpostion"
,
this
.
presetindex
);
},
deleteytconfig
()
{
...
...
src/views/taskManage/editVideo.vue
View file @
6ad19dd
...
...
@@ -248,7 +248,7 @@ export default {
is_dome
:
false
,
subtask_name
:
vchan
.
name
,
vchan
:
{
vchan_refid
:
vchan
.
refid
||
vchan
.
vchan_refid
,
vchan_refid
:
vchan
.
refid
||
vchan
.
vchan_refid
||
vchan
.
DeviceID
,
vchan_duid
:
vchan
.
duid
||
vchan
.
vchan_duid
,
vdev_unid
:
this
.
dev_unid
,
vchan_name
:
vchan
.
name
...
...
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