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

杭州-故障诊断-消息推送，以及诊断过程和完成的消息弹框



See merge request !254

@@ -450,13 +450,24 @@ layui.extend({
                 if (queryResult) {
                     content = laytpl(content).render(queryResult);
                 }
+
                 //判断是否为故障诊断的三种类型
-                if(toastType=='faultinfo'||toastType=='FAULTPROGRESS'||toastType=='FAULTOVER'){
+                if(toastType=='faultinfo'||toastType=='faultprogress'||toastType=='faultover'){
+                    var imgUrl="";
+                    if(toastType=='faultinfo'){
+                        imgUrl="/src/style/img/fault.png";
+                    }
+                    if(toastType=='faultprogress'){
+                        imgUrl="/src/style/img/faultprogress.png";
+                    }
+                    if(toastType=='faultover'){
+                        imgUrl="/src/style/img/faultover.png";
+                    }
                     setTimeout(function () {
                         new msgTips({
                             dom: ".right-bottom-tips",
                             title: title,
-                            message: `<p style="line-height: 30px;background: url(/src/style/img/fault.png) 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: 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>`,
                             duration: 10000,
                             space: 10,
                             firstSpace: 8,
@@ -468,9 +479,10 @@ layui.extend({
                             toastType: toastType,
                             type: 'click',
                             action: function () {
-                                if (hash) {
-                                    location.hash = hash;
-                                }
+                                //if (hash) {
+                                //     location.hash = hash;
+                                    location.hash = "/faultDiagnosis/list/faultNo="+content.split("，")[0].split("：")[1];
+                                //}
                             }
                         })
                     }, delay);