Merge branch 'master-mj-joke' into 'master-mj'

fix:bug#2047【巡检结果查看】查询巡检报告页面404；

fix:bug#2047【巡检结果查看】查询巡检报告页面404；

See merge request !1203

@@ -264,12 +264,12 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                             type: "previewFile",
                             type: "previewFile",
                             message: {
                             message: {
                                 params: {
                                 params: {
-                                    url: response.pdfPath
+                                    url: response.pdfPath,
+                                    type: 'PDF_FILE'
                                 }
                                 }
                             }
                             }
                         }, '*')
                         }, '*')
                     }
                     }
-                    // window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath));
                 }
                 }
             })
             })
         }
         }

@@ -521,7 +521,18 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                 url: domainName + '/api-web/inspectiontask/getPdfPath?batchNo=' + batchNo
                 url: domainName + '/api-web/inspectiontask/getPdfPath?batchNo=' + batchNo
             }).done(function (response) {
             }).done(function (response) {
                 if ("success" == response.msg) {
                 if ("success" == response.msg) {
-                    window.open("/src/lib/extend/pdfjs/web/viewer.html?test=" + encodeURIComponent(response.pdfPath));
+                    let win = window.top;
+                    if (win) {
+                        window.top.postMessage({
+                            type: "previewFile",
+                            message: {
+                                params: {
+                                    url: response.pdfPath,
+                                    type: 'PDF_FILE'
+                                }
+                            }
+                        }, '*')
+                    }
                 }
                 }
             })
             })
         }
         }