Merge branch 'master' of http://gitlab.house365.com/xuzhou/njzsb

WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_GuiHua.jsp

@@ -656,7 +656,7 @@
     <div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</div>
     <div id='34' draggable='true' class='f34'>${paymentItemHis.jbr}&nbsp;&nbsp;&nbsp;${rfxm.jbr}</div>
     <c:if test="${paymentItemHis.isCwyz!='0'}">
-        <div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang1.png" alt=""></div>
+        <div id='37' draggable='true' class='f37'><img src="`${ctx}/images/img/`zhang1.png" alt=""></div>
     </c:if>
     <div id='36' draggable='true' class='f36'><img src="${ctx}/images/img/zhang3.png" alt=""></div>
 

WebRoot/WEB-INF/pages/jfzm/Jfzm_view.jsp

@@ -299,16 +299,6 @@
             width: 160px;
             height: 160px;
         }
-        /*内部使用*/
-        .f35,.f40 {
-            left: 410px;
-            top: 408px;
-            color: red;
-            font-size: 24px;
-            background-color: #F2F7FD;
-            z-index: 99;
-            text-align: center;
-        }
     </style>
     <title>Title</title>
     <%@include file="/common/jsLib.jsp"%>
@@ -348,8 +338,14 @@
 
             return html2canvas(container, ops).then(canvas => {
                 // 返回图片的二进制数据
-                const imgUrl = canvas.toDataURL("image/png");
-                return imgUrl;
+                // return canvas.toDataURL("image/png");
+                const imgUrl = canvas.toDataURL("image/png")
+                console.log(imgUrl);
+                document.getElementById("img2").setAttribute('src', imgUrl)
+                //const a = document.createElement('a')
+                //a.src = imgUrl
+                <%--a.setAttribute('download', `chart-download-${name}`)--%>
+                // a.click()
             });
         }
         const doPrint = async()=>{
@@ -357,9 +353,9 @@
                 width: 790,
                 height: 790,
                 scale: 1
-            }).then(pic => {
-                console.log(pic);
-                document.getElementById("img2").setAttribute('src', pic)
+            }).then(x => {
+                console.log(x);
+
             })
         }
     </script>
@@ -386,7 +382,9 @@
     <div id='f30' draggable='true' class='f30'>规划许可证号：${xmxxb.xkzh}</div>
     <div id='f31' draggable='true' class='f31'>规划项目编号：${xmxxb.xmbh}</div>
     <div id='33' draggable='true' class='f33'>${paymentItemHis.zslxdbh}</div>
-    <div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang_half.png" alt=""></div>
+    <c:if test="${rfxm.isRfyz=='1'}">
+        <div id='37' draggable='true' class='f37'><img src="${ctx}/images/img/zhang_half.png" alt=""></div>
+    </c:if>
 
     <c:choose>
         <c:when test="${empty rfxm}">