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

* 'master' of http://gitlab.house365.com/xuzhou/njzsb:
  删除注释代码
  同步施工许可证-生成图片功能

# Conflicts:
#	WebRoot/WEB-INF/pages/jfzm/Jfzm_view.jsp

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

@@ -310,7 +310,13 @@
     }
 
     function jfzm_view(id) {
-        createSimpleWindow("win_jfzm_view", "查询缴款通知书","${ctx}/jsp/jfzm/jfzm_view.action?id=" + id, 800, 800);
+        //打印施工许可证功能需要用到js截图，此功能不支持ie浏览器
+        if (!!window.ActiveXObject || ("ActiveXObject" in window)) {
+            alert('请使用谷歌浏览器或360浏览器急速模式操作');
+            return;
+        } else {
+            createSimpleWindow("win_jfzm_view", "同步施工许可","${ctx}/jsp/jfzm/jfzm_view.action?id=" + id, 800, 900);
+        }
     }
 </script>
 

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

@@ -284,7 +284,6 @@
         .f38 img,
         .f39 img {
             width: 200px;
-            height: 60px;
         }
         #page1 DIV {
             position: absolute
@@ -533,9 +532,11 @@
                         </td>
                     </tr>
                 </table>
-            </div></div></div>
+            </div>
+        </div>
+    </div>
 </form>
-  横联
+横联
 <c:if test="${rfxm.mjyj != '002' && rfxm.mjyj != '004'}">
     <div id="page1" class='only_for_print pagestyle' style='width:210mm;height:140mm;position:relative;'>
         <img class='screen-only' src="${ctx}/images/img/gz.jpg" style="position:absolute;width:100%;height:100%"/>
@@ -651,7 +652,7 @@
     </div>
 </c:if>
 
-  竖联
+竖联
 <c:if test="${rfxm.mjyj == '002' || rfxm.mjyj == '004'}">
     <div id="page1" class='only_for_print pagestyle' style='width:210mm;height:140mm;position:relative;'>
         <img src="${ctx}/webResources/images/fanggaiban.jpg" style="position:absolute;width:100%;height:100%"/>

WebRoot/WEB-INF/pages/rfxm/Rfxm_Detail.jsp

+<%@ page import="com.jshx.common.utils.Constant" %>
 <%@ page import="com.jshx.core.utils.SysPropertiesUtil" %>
 <%@ page import="java.io.File" %>
-<%@ page import="com.jshx.common.utils.Constant" %>
 <%@page language="java" pageEncoding="UTF-8" isELIgnored="false"%>
 <%@include file="/common/header.jsp"%>
 <%