Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
web-project
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
海康威视
web-project
Commits
de7e2481
Commit
de7e2481
authored
Oct 11, 2024
by
张伯涛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
大屏问题修改
parent
03b60a3a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
9 deletions
+15
-9
screenDisplay.vue
src/components/screenDisplay.vue
+13
-2
videoComponents.vue
src/components/videoComponents.vue
+2
-7
No files found.
src/components/screenDisplay.vue
View file @
de7e2481
...
...
@@ -510,7 +510,7 @@ import AMapLoader from "@amap/amap-jsapi-loader";
</div>
<div
class=
"videoInfo"
v-show=
"videoOpen"
>
<div
class=
"alarmInfo_header"
>
<div
class=
"alarmInfo_title"
>
换热站监控
</div>
<div
class=
"alarmInfo_title"
>
{{
stationName
}}
</div>
<div
v-if=
"showVideoClose === true"
class=
"alarmInfo_close"
@
click=
"handleVideoClose"
>
X
</div>
</div>
<div
v-if=
"videoAllLoading"
class=
"videoLoading-overlayAll"
>
...
...
@@ -603,6 +603,7 @@ export default defineComponent({
},
data
()
{
return
{
stationName
:
''
,
firstCardLoading
:
false
,
secondCardLoading
:
false
,
thirdCardLoading
:
false
,
...
...
@@ -616,6 +617,8 @@ export default defineComponent({
queryParams
:
''
,
divWidth
:
''
,
divHeight
:
''
,
divDialogWidth
:
''
,
divDialogHeight
:
''
,
queryParamsAll
:
''
,
stopParams
:
0
,
stopParamsAll
:
0
,
...
...
@@ -3024,6 +3027,7 @@ export default defineComponent({
}
GYTransferVideo
(
params
).
then
(
res
=>
{
if
(
res
.
success
===
true
)
{
this
.
stationName
=
this
.
transferList
[
num
].
stationName
this
.
showVideo
=
true
const
list
=
res
.
data
this
.
VideoInfo
.
playVideoList
=
[]
...
...
@@ -3053,6 +3057,7 @@ export default defineComponent({
},
// 获取港益换热站视频数据
getGYTransferVideo
()
{
console
.
log
(
'this.transferList'
,
this
.
transferList
)
this
.
videoLoading
=
true
this
.
videoNum
=
0
// this.markerThree.stationId = _this.transferList[0].stationId
...
...
@@ -3072,6 +3077,7 @@ export default defineComponent({
id
:
this
.
markerThree
.
stationId
// id: '9C9D13FA-BA07-4394-8441-55F98F160EDA'
}
this
.
stationName
=
this
.
transferList
.
find
(
item
=>
item
.
stationId
===
this
.
markerThree
.
stationId
).
stationName
GYTransferVideo
(
params
).
then
(
res
=>
{
// 我加了判断
...
...
@@ -4259,6 +4265,11 @@ export default defineComponent({
padding
:
20px
;
font-size
:
17px
;
}
.alarmInfo_title
{
width
:
100%
;
text-align
:
center
;
font-size
:
20px
;
}
.alarmInfo_content
{
display
:
flex
;
justify-content
:
center
;
...
...
src/components/videoComponents.vue
View file @
de7e2481
...
...
@@ -137,12 +137,7 @@ function down(){
window
.
open
(
filepath
);
}
function
resetVideoWidth
(){
// var menuWidth=localStorage.getItem("tabWidth");
// if(!menuWidth || menuWidth ==='' || !Number(menuWidth)){
// pProps.divWidth = window.innerWidth - 1570;
// }else{
// pProps.divWidth = window.innerWidth - Number(menuWidth);
// }
console
.
log
(
'playVW'
,
playWnd_width
);
}
...
...
@@ -290,7 +285,6 @@ function initPlugin() {
szClassId
:
"23BF3B0A-2C56-4D97-9C03-0CB103AA8F11"
,
// 用于IE10使用ActiveX的clsid
cbConnectSuccess
:
function
()
{
// 创建WebControl实例成功
console
.
log
(
'创建成功'
)
emit
(
'initSuccess'
)
oWebControl
.
JS_StartService
(
"window"
,
{
// WebControl实例创建成功后需要启动服务
dllPath
:
"./VideoPluginConnect.dll"
// 值"./VideoPluginConnect.dll"写死
}).
then
(
function
()
{
// 启动插件服务成功
...
...
@@ -305,6 +299,7 @@ function initPlugin() {
});
//playVideo()
setTimeout
(()
=>
playVideoByVideoList
(
VideoInfo
.
playVideoList
),
2000
)
setTimeout
(()
=>
emit
(
'initSuccess'
),
1000
)
},
cbConnectError
:
function
()
{
// 创建WebControl实例失败
console
.
log
(
'创建失败'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
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 comment