Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
lbs-gpsbd-web
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
yangkaiyi
lbs-gpsbd-web
Commits
c146aa78
Commit
c146aa78
authored
Jul 03, 2021
by
yangkaiyi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: 放出一个提示并判断undefined
parent
400b3e6d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
65 additions
and
56 deletions
+65
-56
lbsmap.scss
src/styles/lbsmap.scss
+47
-43
mutations.js
src/vuex/mutations.js
+18
-13
No files found.
src/styles/lbsmap.scss
View file @
c146aa78
...
...
@@ -2,52 +2,56 @@
/*气泡的高度调整*/
#popup
{
top
:
-25px
!
important
;
top
:
-25px
!
important
;
}
.lbs-popup
{
white-space
:nowrap
;
.lbs-popup
{
white-space
:
nowrap
;
}
.bubble-icon
{
width
:
16px
;
height
:
18px
;
vertical-align
:
-5px
;
overflow
:
hidden
;
margin-left
:
2px
;
.lbs-content
ul
li
:last-child
{
display
:
none
;
}
.bubble-icon
{
width
:
16px
;
height
:
18px
;
vertical-align
:
-5px
;
overflow
:
hidden
;
margin-left
:
2px
;
}
#img-popup
{
position
:
absolute
;
margin-left
:
108px
;
margin-top
:
-206px
;
padding
:
6px
;
border
:
2px
solid
#09f
;
border-radius
:
5px
;
background-color
:
#fff
;
font-size
:
12px
;
display
:
none
;
}
#img-popup
:before
,
#img-popup
:after
{
content
:
""
;
display
:
block
;
border-width
:
20px
;
position
:
absolute
;
bottom
:
-40px
;
left
:
32px
;
border-style
:
solid
dashed
dashed
;
border-color
:
#09f
transparent
transparent
;
font-size
:
0
;
line-height
:
0
;
}
#img-popup
:after
{
bottom
:
-37px
;
border-color
:
#fff
transparent
transparent
;
}
#img-popup
img
{
width
:
200px
;
height
:
150px
;
}
#img-popup
{
position
:
absolute
;
margin-left
:
108px
;
margin-top
:
-206px
;
padding
:
6px
;
border
:
2px
solid
#09F
;
border-radius
:
5px
;
background-color
:
#FFF
;
font-size
:
12px
;
display
:none
;
}
#img-popup
:before
,
#img-popup
:after
{
content
:
""
;
display
:block
;
border-width
:
20px
;
position
:absolute
;
bottom
:
-40px
;
left
:
32px
;
border-style
:solid
dashed
dashed
;
border-color
:
#09F
transparent
transparent
;
font-size
:
0
;
line-height
:
0
;
}
#img-popup
:after
{
bottom
:
-37px
;
border-color
:
#FFF
transparent
transparent
;
}
#img-popup
img
{
width
:
200px
;
height
:
150px
;
}
.show-image
:hover
#img-popup
{
display
:block
;
}
.show-image
:hover
#img-popup
{
display
:
block
;
}
src/vuex/mutations.js
View file @
c146aa78
...
...
@@ -120,19 +120,24 @@ export default {
);
}
if
(
state
.
user
.
userConfig
.
events
[
devstatus
.
status
])
{
// Notification({
// title:
// state.user.devices.list[index].name +
// " " +
// messages[state.common.system.lang].map[
// state.user.status[devstatus.status]
// ],
// message: util.dateFormat(devstatus.time, "YYYY-MM-DD HH:mm:ss"),
// type: devstatus.status == 1 ? "success" : "warning",
// duration: 0,
// });
// window.$bus.emit("playAudio");
// state.user.playAlarmSound = true;
const
status
=
messages
[
state
.
common
.
system
.
lang
].
map
[
state
.
user
.
status
[
devstatus
.
status
]
];
status
&&
Notification
({
title
:
state
.
user
.
devices
.
list
[
index
].
name
+
" "
+
messages
[
state
.
common
.
system
.
lang
].
map
[
state
.
user
.
status
[
devstatus
.
status
]
],
message
:
util
.
dateFormat
(
devstatus
.
time
,
"YYYY-MM-DD HH:mm:ss"
),
type
:
devstatus
.
status
==
1
?
"success"
:
"warning"
,
duration
:
0
,
});
window
.
$bus
.
emit
(
"playAudio"
);
state
.
user
.
playAlarmSound
=
true
;
}
},
[
types
.
USER_RESPONSE_DEVICE_COMMAND
](
state
,
commands
)
{
...
...
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