Merge branch 'master-V32-LH' into 'master'

杭州-故障弹框-替换故障弹框背景 优化



See merge request !320

@@ -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: 20px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding-left: 25px;padding-top: 145px;" ><span style=" overflow: hidden;   text-overflow: ellipsis;   display: -webkit-box;  -webkit-line-clamp: 5; -webkit-box-orient: vertical;margin-left: -11px;" lay-tips="${content}">${content}</span><span class="title closeFault" style="position: absolute;top: 72px;left: 213px;">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;" 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>`,
                             duration: 10000,
                             duration: 10000,
                             space: 10,
                             space: 10,
                             firstSpace: 8,
                             firstSpace: 8,
@@ -487,6 +487,7 @@ layui.extend({
                                 //}
                                 //}
                             }
                             }
                         })
                         })
+                        debugger
                     }, delay);
                     }, delay);
                 }else{
                 }else{
                     setTimeout(function () {
                     setTimeout(function () {

@@ -127,7 +127,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
                 $(newContainer).css({
                 $(newContainer).css({
                     'transition-timing-function':options.timingFun,
                     'transition-timing-function':options.timingFun,
                     // 'width':options.width,
                     // 'width':options.width,
-                    'width':'226px',
+                    'width':'240px',
                     'bottom':'350px'
                     'bottom':'350px'
                 });
                 });
                 var height = $(newContainer).outerHeight(true);
                 var height = $(newContainer).outerHeight(true);