合并分支 'crs' 到 'master'

src/tools/htmlToPdf.js

@@ -2,7 +2,7 @@
 import html2Canvas from 'html2canvas'
 import JsPDF from 'jspdf'
 import {
-    Loading
+    Message, Loading
 } from 'element-ui'
 let loading;
 export default{
@@ -17,8 +17,13 @@ export default{
             html2Canvas(document.querySelector('#pdfDom'), {
                 allowTaint: true
             }).then(function (canvas) {
-                let contentWidth = canvas.width
-                let contentHeight = canvas.height
+                console.log(canvas)
+                let contentWidth = canvas.width;
+                let contentHeight = canvas.height;
+                if (contentWidth === '' || contentWidth === undefined || contentHeight === '' || contentHeight === undefined) {
+                    loading.close();
+                    Message.error('转换pdf失败，请稍后再试！')
+                }
                 let pageHeight = contentWidth / 595 * 842
                 let leftHeight = contentHeight
                 let position = 0