Commit c146aa78 authored by yangkaiyi's avatar yangkaiyi

fix: 放出一个提示并判断undefined

parent 400b3e6d
......@@ -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;
}
......@@ -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) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment