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 802e4887
authored
Jul 06, 2020
by
潘建波
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
🐛
ocx下载提示
1 parent
bfc48606
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
8 deletions
dist.zip
src/views/public/videoPlay.vue
src/views/resource/store_confs.vue
src/views/sceneManage/videoplay.vue
src/views/taskManage/editSet.vue
dist.zip
View file @
802e488
No preview for this file type
src/views/public/videoPlay.vue
View file @
802e488
...
@@ -96,7 +96,14 @@ export default {
...
@@ -96,7 +96,14 @@ export default {
file_type
:
"video_ocx"
file_type
:
"video_ocx"
};
};
this
.
$api
.
ops
.
downloadOcx
(
params
).
then
(
response
=>
{
this
.
$api
.
ops
.
downloadOcx
(
params
).
then
(
response
=>
{
location
.
href
=
response
.
data
.
file_url
;
if
(
response
.
ecode
)
{
this
.
$message
({
type
:
"error"
,
message
:
response
.
enode
});
}
else
{
location
.
href
=
response
.
file_url
;
}
});
});
}
else
{
}
else
{
this
.
$message
.
error
(
"视频控件加载失败请用IE10及以上版本打开!"
);
this
.
$message
.
error
(
"视频控件加载失败请用IE10及以上版本打开!"
);
...
@@ -149,6 +156,7 @@ export default {
...
@@ -149,6 +156,7 @@ export default {
},
},
mounted
()
{
mounted
()
{
if
(
this
.
checkIE
())
{
if
(
this
.
checkIE
())
{
try
{
let
isLoadingOcx
=
let
isLoadingOcx
=
typeof
document
.
getElementById
(
"VionVideo"
).
GetVersion
()
===
"string"
typeof
document
.
getElementById
(
"VionVideo"
).
GetVersion
()
===
"string"
?
true
?
true
...
@@ -156,6 +164,9 @@ export default {
...
@@ -156,6 +164,9 @@ export default {
if
(
!
isLoadingOcx
)
{
if
(
!
isLoadingOcx
)
{
this
.
installOcxInfo
();
this
.
installOcxInfo
();
}
}
}
catch
(
error
)
{
this
.
downloadOCx
();
}
}
}
},
},
beforeDestroy
:
function
()
{
beforeDestroy
:
function
()
{
...
...
src/views/resource/store_confs.vue
View file @
802e488
...
@@ -188,7 +188,19 @@ export default {
...
@@ -188,7 +188,19 @@ export default {
upData
.
append
(
"is_temp"
,
0
);
upData
.
append
(
"is_temp"
,
0
);
});
});
this
.
$api
.
resource
.
uploadStore
(
upData
).
then
(
res
=>
{
this
.
$api
.
resource
.
uploadStore
(
upData
).
then
(
res
=>
{
if
(
res
.
unid
)
{
this
.
addVisible
=
false
;
this
.
query
();
this
.
query
();
this
.
$message
({
type
:
"success"
,
message
:
"上传成功!"
});
}
else
{
this
.
$message
({
type
:
"error"
,
message
:
res
.
enote
});
}
});
});
},
},
uploadsuccess
()
{
uploadsuccess
()
{
...
...
src/views/sceneManage/videoplay.vue
View file @
802e488
...
@@ -113,12 +113,13 @@ export default {
...
@@ -113,12 +113,13 @@ export default {
},
},
mounted
()
{
mounted
()
{
this
.
initocx
();
this
.
initocx
();
// try {
try
{
// if (document.getElementById("VionVideo").GetVersion()) {
if
(
document
.
getElementById
(
"VionVideo"
).
GetVersion
())
{
// }
console
.
log
(
"ocx已安装"
);
// } catch (error) {
}
// this.downloadOCx();
}
catch
(
error
)
{
// }
this
.
downloadOCx
();
}
},
},
watch
:
{
watch
:
{
ocxstate
(
val
)
{
ocxstate
(
val
)
{
...
...
src/views/taskManage/editSet.vue
View file @
802e488
...
@@ -205,7 +205,7 @@ export default {
...
@@ -205,7 +205,7 @@ export default {
var
freeArr
=
[];
var
freeArr
=
[];
this
.
freeList
.
forEach
(
ele
=>
{
this
.
freeList
.
forEach
(
ele
=>
{
if
(
ele
.
license_info
&&
ele
.
license_info
.
platType
)
{
if
(
ele
.
license_info
&&
ele
.
license_info
.
platType
)
{
this
.
platT
.
push
(
ele
.
license_info
.
platType
);
this
.
platT
.
set
(
ele
.
license_info
.
platType
);
}
}
});
});
}
}
...
@@ -328,8 +328,19 @@ export default {
...
@@ -328,8 +328,19 @@ export default {
editTask
(
data
)
{
editTask
(
data
)
{
data
.
is_send
=
this
.
sendstatus
(
data
);
data
.
is_send
=
this
.
sendstatus
(
data
);
this
.
$api
.
task
.
editTask
(
data
,
this
.
formData
.
task_id
).
then
(
res
=>
{
this
.
$api
.
task
.
editTask
(
data
,
this
.
formData
.
task_id
).
then
(
res
=>
{
if
(
res
.
ecode
==
"200"
)
{
this
.
setvisible
=
false
;
this
.
setvisible
=
false
;
this
.
$emit
(
"refresh"
);
this
.
$emit
(
"refresh"
);
this
.
$message
({
message
:
res
.
enote
,
type
:
"success"
});
}
else
{
this
.
$message
({
message
:
res
.
enote
,
type
:
"error"
});
}
});
});
},
},
sendstatus
(
data
)
{
sendstatus
(
data
)
{
...
...
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