Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gassafety
Project
Project
Details
Activity
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
耿迪迪
gassafety
Commits
e2bbaee9
Commit
e2bbaee9
authored
Dec 16, 2021
by
yaqizhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加单位
parent
f3f82940
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
365 additions
and
287 deletions
+365
-287
markerInfoWindow.vue
...fety-web/src/components/PopWindowGis/markerInfoWindow.vue
+277
-228
markerInfoWindowWarn.vue
...-web/src/components/PopWindowGis/markerInfoWindowWarn.vue
+88
-59
No files found.
gassafety-web/src/components/PopWindowGis/markerInfoWindow.vue
View file @
e2bbaee9
This diff is collapsed.
Click to expand it.
gassafety-web/src/components/PopWindowGis/markerInfoWindowWarn.vue
View file @
e2bbaee9
...
...
@@ -74,68 +74,68 @@
</div>
<template
v-if=
"data.deviceType ==3 || data.deviceType==4"
>
<div
v-if=
"data.deviceType==3"
class=
"windowwarn-content"
style=
"
<div
v-if=
"data.deviceType==3"
class=
"windowwarn-content"
style=
"
border-bottom: 1px solid #e2e2e2;
padding: 10px 0 2px 22px;
height: 150px;padding-bottom: 2px;
"
>
<el-col
:span=
"11
"
>
<div
class=
"windowwarn"
>
标况累积量:
<span
class=
"standardConditionAccumulation"
></span>
</div>
</el-col>
<el-col
:span=
"11"
>
<div
class=
"windowwarn"
>
工况累积量:
<span
class=
"workingConditionAccumulation"
></span>
</div>
</el-col>
<el-col
:span=
"11
"
>
<div
class=
"windowwarn"
>
剩余量:
<span
class=
"residualQuantity"
></span>
</div>
</el-col>
<el-col
:span=
"11"
>
<div
class=
"windowwarn"
>
标况流量:
<span
class=
"standardConditionFlow"
></span>
</div>
</el-col>
<el-col
:span=
"11
"
>
<div
class=
"windowwarn"
>
工况流量:
<span
class=
"workingConditionFlow"
></span>
</div>
</el-col>
<el-col
:span=
"11"
>
<div
class=
"windowwarn"
>
温度:
<span
class=
"temperature"
></span>
</div>
</el-col>
<el-col
:span=
"11
"
>
<div
class=
"windowwarn"
>
压力:
<span
class=
"pressure"
></span>
</div>
</el-col>
<el-col
:span=
"15"
>
<div
class=
"windowwarn"
>
上报时间:
<span
class=
"reportTime"
></span>
</div>
</el-col>
</div>
<div
v-if=
"data.deviceType==4"
class=
"windowwarn-content"
style=
"
<el-col
:span=
"12
"
>
<div
class=
"windowwarn"
>
标况累积量:
<span
class=
"standardConditionAccumulation"
></span>
</div>
</el-col>
<el-col
:span=
"11"
>
<div
class=
"windowwarn"
>
工况累积量:
<span
class=
"workingConditionAccumulation"
></span>
</div>
</el-col>
<el-col
:span=
"12
"
>
<div
class=
"windowwarn"
>
剩余量:
<span
class=
"residualQuantity"
></span>
</div>
</el-col>
<el-col
:span=
"11"
>
<div
class=
"windowwarn"
>
标况流量:
<span
class=
"standardConditionFlow"
></span>
</div>
</el-col>
<el-col
:span=
"12
"
>
<div
class=
"windowwarn"
>
工况流量:
<span
class=
"workingConditionFlow"
></span>
</div>
</el-col>
<el-col
:span=
"11"
>
<div
class=
"windowwarn"
>
温度:
<span
class=
"temperature"
></span>
</div>
</el-col>
<el-col
:span=
"12
"
>
<div
class=
"windowwarn"
>
压力:
<span
class=
"pressure"
></span>
</div>
</el-col>
<el-col
:span=
"15"
>
<div
class=
"windowwarn"
>
上报时间:
<span
class=
"reportTime"
></span>
</div>
</el-col>
</div>
<div
v-if=
"data.deviceType==4"
class=
"windowwarn-content"
style=
"
border-bottom: 1px solid #e2e2e2;
padding: 10px 0 2px 22px;
height: 70px;padding-bottom: 2px;
"
>
<el-col
:span=
"24"
>
<div
class=
"windowwarn"
>
压力:
<span
class=
"pressure"
></span>
</div>
</el-col>
<el-col
:span=
"24"
>
<div
class=
"windowwarn"
>
上报时间:
<span
class=
"reportTime"
></span>
</div>
</el-col>
</div>
<el-col
:span=
"24"
>
<div
class=
"windowwarn"
>
压力:
<span
class=
"pressure"
></span>
</div>
</el-col>
<el-col
:span=
"24"
>
<div
class=
"windowwarn"
>
上报时间:
<span
class=
"reportTime"
></span>
</div>
</el-col>
</div>
</
template
>
...
...
@@ -157,6 +157,7 @@
</template>
<
script
>
let
closeInfoWindowTimer
;
import
{
realtimeData
,
getData
}
from
"@/api/dataMonitoring/reportData"
;
import
moment
from
"moment"
;
//line移入时的的infowindow
...
...
@@ -179,13 +180,23 @@
};
},
mounted
()
{
clearInterval
(
this
.
data
.
view
.
deviceTimer
)
;
clearInterval
(
this
.
data
.
view
.
deviceTimer
)
if
(
this
.
data
.
deviceType
==
3
||
this
.
data
.
deviceType
==
4
)
{
this
.
getDataid
();
this
.
data
.
view
.
deviceTimer
=
setInterval
(
this
.
getDataid
,
5000
);
closeInfoWindowTimer
=
setInterval
(()
=>
{
const
dom
=
document
.
getElementsByClassName
(
"amap-info"
)[
0
];
const
disPlay
=
dom
?.
style
.
display
;
if
(
!
dom
||
(
dom
&&
disPlay
==
"none"
))
{
clearInterval
(
this
.
data
.
view
.
deviceTimer
)
clearInterval
(
closeInfoWindowTimer
)
console
.
log
(
"请求关闭"
)
}
},
1000
)
}
},
computed
:
{
orderId
()
{
...
...
@@ -206,12 +217,28 @@
changeValue
(
data
)
{
const
keyArr
=
Object
.
keys
(
data
);
keyArr
.
forEach
((
item
)
=>
{
const
dw
=
this
.
danwei
(
item
)
const
dom
=
document
.
getElementsByClassName
(
item
)[
0
];
if
(
dom
)
{
dom
.
innerHTML
=
data
[
item
];
dom
.
innerHTML
=
data
[
item
]
+
" "
+
dw
;
}
})
},
danwei
(
item
)
{
let
dw
=
''
;
if
(
item
==
'standardConditionAccumulation'
||
item
==
'workingConditionAccumulation'
||
item
==
'residualQuantity'
){
dw
=
"m³"
}
else
if
(
item
==
'standardConditionFlow'
||
item
==
'workingConditionFlow'
){
dw
=
"m³/h"
}
else
if
(
item
==
'temperature'
){
dw
=
"℃"
}
else
if
(
item
==
'pressure'
){
dw
=
"KPa"
}
else
if
(
item
==
'reportTime'
){
dw
=
" "
}
return
dw
;
}
,
createWork
()
{
// 控制外层弹框
// console.log(this.data.view.$refs.CreateWork);
...
...
@@ -275,15 +302,17 @@
</
script
>
<
style
lang=
"scss"
scoped
>
.windowwarn-content
{
div
{
.windowwarn-content
{
div
{
font-size
:
14px
;
font-wwight
:
400
;
.windowwarn
{
.windowwarn
{
margin-bottom
:
7px
;
}
}
}
.wrapper
{
width
:
406px
;
max-height
:
600px
;
...
...
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