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

杭州-通知查询-故障弹框 样式优化



See merge request !311

@@ -452,14 +452,12 @@ layui.extend({
                 }
 
                 //判断是否为故障诊断的三种类型
-                if(toastType=='faultinfo'||toastType=='faultprogress'||toastType=='faultover'){
+                if(toastType=='faultinfo'||toastType=='faultover'){
                     var imgUrl="";
                     if(toastType=='faultinfo'){
                         imgUrl="/src/style/img/fault.png";
                     }
-                    if(toastType=='faultprogress'){
-                        imgUrl="/src/style/img/faultover.png";
-                    }
+
                     if(toastType=='faultover'){
                         imgUrl="/src/style/img/faultprogress.png";
                     }
@@ -486,6 +484,35 @@ layui.extend({
                             }
                         })
                     }, delay);
+                }else if(toastType=='faultprogress'){
+                    var imgUrl="";
+                    if(toastType=='faultprogress'){
+                        imgUrl="/src/style/img/faultover.png";
+                    }
+                    setTimeout(function () {
+                    new msgTips({
+                        dom: ".right-bottom-tips",
+                        title: title,
+                        message: `<p style="line-height: 24px;background: url(${imgUrl}) no-repeat;background-size: 100%;height: 160px;background-position-x: right;padding-left: 25px;padding-top: 145px;"><span >${content}</span><span class="title closeFault" style="position: relative;top: -175px;left: 179px;">X</span><span style="position: relative;left: -90px;top: -117px; font-weight: bold;float: right;">${title}</span></p>`,
+                        duration: 10000,
+                        space: 10,
+                        firstSpace: 8,
+                        limit: 8,
+                        margin: 15,
+                        direction: 'right bottom',
+                        timingFun: 'ease',
+                        width: '300px',
+                        toastType: toastType,
+                        type: 'click',
+                        action: function () {
+                            //if (hash) {
+                            //     location.hash = hash;
+                            location.hash = "/faultDiagnosis/list/faultNo="+content.split("，")[0].split("：")[1];
+                            //}
+                        }
+                    })
+                }, delay);
+
                 }else{
                     setTimeout(function () {
                         new msgTips({