Merge branch 'master' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-V32-XuHaoJie

 Conflicts:
	hg-monitor-web-base/src/main/resources/static/src/index.js

@@ -469,7 +469,7 @@ layui.extend({
                         new msgTips({
                         new msgTips({
                             dom: ".right-bottom-tips",
                             dom: ".right-bottom-tips",
                             title: title,
                             title: title,
-                            message: `<p style="line-height: 18px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding: 145px 22px 0; "><span style=" overflow: hidden;   text-overflow: ellipsis;   display: -webkit-box;  -webkit-line-clamp: 4; -webkit-box-orient: vertical;" lay-tips="${content}">${content}</span><span class="title closeFault" style="position: absolute;top: 66px;left: 214px;">X</span><span style="position: absolute;left: 87px;top: 124px; font-weight: bold;float: right;">${title}</span></p>`,
+                            message: `<p style="line-height: 18px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding: 145px 22px 0; "><span style=" overflow: hidden;   text-overflow: ellipsis;   display: -webkit-box;  -webkit-line-clamp: 4; -webkit-box-orient: vertical;" title="${content}">${content}</span><span class="title closeFault" style="position: absolute;top: 66px;left: 214px;">X</span><span style="position: absolute;left: 87px;top: 124px; font-weight: bold;float: right;">${title}</span></p>`,
                             duration: 10000,
                             duration: 10000,
                             space: 10,
                             space: 10,
                             firstSpace: 8,
                             firstSpace: 8,
@@ -487,6 +487,7 @@ layui.extend({
                                 //}
                                 //}
                             }
                             }
                         })
                         })
+
                     }, delay);
                     }, delay);
                 }else{
                 }else{
                     setTimeout(function () {
                     setTimeout(function () {