Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into …

…master-v32-lushangqing

@@ -467,7 +467,11 @@ layui.extend({
                         new msgTips({
                             dom: ".right-bottom-tips",
                             title: title,
-                            message: `<p style="line-height: 30px;background: url(${imgUrl}) no-repeat;background-size: 70%;height: 178px;padding: 10px;background-position-x: right;padding-left: 106px;padding-top: 96px;">${content}</p>`,
+                            message: `<p style="line-height: 24px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;padding: 10px;background-position-x: right;padding-left: 29px;padding-top: 145px;">
+                                            <span class="title closeFault" style="position: relative;top: -75px;left: 170px;">X</span>
+                                            <span style="position: relative;left: 35px;top: -21px; font-weight: bold;">${title}</span>
+                                            ${content}
+                                      </p>`,
                             duration: 10000,
                             space: 10,
                             firstSpace: 8,
@@ -485,8 +489,10 @@ layui.extend({
                                 //}
                             }
                         })
+                        debugger
                     }, delay);
                 }else{
+                    debugger
                     setTimeout(function () {
                         new msgTips({
                             dom: ".right-bottom-tips",

@@ -27,7 +27,7 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
             minus = "";
         }
 
-        if ($('.ez_tips').size() == 0 || $('.ez_tips').size() < options.limit) {
+        if (($('.ez_tips').size() == 0 || $('.ez_tips').size() < options.limit) && (options.toastType!='faultinfo' && options.toastType!='faultprogress' && options.toastType!='faultover')) {
 
             var container = "<div class='ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;transform:translateX("+minus+"110%)></div>"
 
@@ -97,13 +97,16 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
             },1);
             $(options.dom).append(newContainer);
         } else if(options.toastType=='faultinfo'||options.toastType=='faultprogress'||options.toastType=='faultover'){
-            var container = "<div class='fault_ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;bottom: 319px;transform:translateX("+minus+"110%);></div>"
 
-            var head = "<div class='faultTitle faultClearfix'><i class='faultTips_icon_l fl'></i><i class='FaultTips_icon_r close'></i></div>";
+            var container = "<div class='fault_ez_tips "+options.toastType+"' style="+firstDirection+":"+options.margin+"px;transform:translateX("+minus+"110%);width: 226px;bottom: 8px !important; ></div>"
+
+            // var head = "<div class='faultTitle faultClearfix'><i class='faultTips_icon_l fl'></i><i class='FaultTips_icon_r close'></i></div>";
+            var head = "";
 
             var content = "<div class='FaultTips-message' style='cursor: pointer; display: flex;justify-content: flex-end;'></div>"
 
-            var newHead = $(head).append(options.title);
+            // var newHead = $(head).append(options.title);
+            var newHead = "";
 
             var newContent = $(content).append(options.message)
 
@@ -122,7 +125,9 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
                 var times = Date.now();
                 $(newContainer).css({
                     'transition-timing-function':options.timingFun,
-                    'width':options.width,
+                    // 'width':options.width,
+                    'width':'226px',
+                    'bottom':'8px'
                 });
                 var height = $(newContainer).outerHeight(true);
                 var len = $('.fault_ez_tips').size();
@@ -159,6 +164,13 @@ layui.define(['layer', 'laytpl', 'form'], function (exports) {
                         $(newContainer).remove();
                     },700)
                 });
+                $(newContainer).find(".closeFault").click(function (event) {
+                    event.stopPropagation();
+                    $(newContainer).removeClass('active');
+                    setTimeout(function () {
+                        $(newContainer).remove();
+                    },700)
+                })
                 if (options.action) {
                     $(newContent).css('cursor','pointer').on(options.type,options.action);
                 }