Commit c146aa78 authored by yangkaiyi's avatar yangkaiyi

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

parent 400b3e6d
...@@ -2,13 +2,16 @@ ...@@ -2,13 +2,16 @@
/*气泡的高度调整*/ /*气泡的高度调整*/
#popup { #popup {
top: -25px!important; top: -25px !important;
} }
.lbs-popup{ .lbs-popup {
white-space:nowrap; white-space: nowrap;
} }
.bubble-icon{ .lbs-content ul li:last-child {
display: none;
}
.bubble-icon {
width: 16px; width: 16px;
height: 18px; height: 18px;
vertical-align: -5px; vertical-align: -5px;
...@@ -16,38 +19,39 @@ ...@@ -16,38 +19,39 @@
margin-left: 2px; margin-left: 2px;
} }
#img-popup {
#img-popup{
position: absolute; position: absolute;
margin-left: 108px; margin-left: 108px;
margin-top: -206px; margin-top: -206px;
padding: 6px; padding: 6px;
border:2px solid #09F; border: 2px solid #09f;
border-radius:5px; border-radius: 5px;
background-color:#FFF; background-color: #fff;
font-size: 12px; font-size: 12px;
display:none; display: none;
}
} #img-popup:before,
#img-popup:before,#img-popup:after{ #img-popup:after {
content:"";display:block; content: "";
border-width:20px; display: block;
position:absolute; bottom:-40px; border-width: 20px;
left:32px; position: absolute;
border-style:solid dashed dashed; bottom: -40px;
border-color:#09F transparent transparent; left: 32px;
font-size:0; border-style: solid dashed dashed;
line-height:0; border-color: #09f transparent transparent;
} font-size: 0;
#img-popup:after{ line-height: 0;
bottom:-37px; }
border-color:#FFF transparent transparent; #img-popup:after {
} bottom: -37px;
#img-popup img{ border-color: #fff transparent transparent;
}
#img-popup img {
width: 200px; width: 200px;
height: 150px; height: 150px;
} }
.show-image:hover #img-popup{ .show-image:hover #img-popup {
display:block; display: block;
} }
...@@ -120,19 +120,24 @@ export default { ...@@ -120,19 +120,24 @@ export default {
); );
} }
if (state.user.userConfig.events[devstatus.status]) { if (state.user.userConfig.events[devstatus.status]) {
// Notification({ const status =
// title: messages[state.common.system.lang].map[
// state.user.devices.list[index].name + state.user.status[devstatus.status]
// " " + ];
// messages[state.common.system.lang].map[ status &&
// state.user.status[devstatus.status] Notification({
// ], title:
// message: util.dateFormat(devstatus.time, "YYYY-MM-DD HH:mm:ss"), state.user.devices.list[index].name +
// type: devstatus.status == 1 ? "success" : "warning", " " +
// duration: 0, messages[state.common.system.lang].map[
// }); state.user.status[devstatus.status]
// window.$bus.emit("playAudio"); ],
// state.user.playAlarmSound = true; 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) { [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