Commit 44351260 authored by 徐州's avatar 徐州

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

* 'master' of http://gitlab.house365.com/xuzhou/njzsb:
  房改办底图修改

# Conflicts:
#	WebRoot/WEB-INF/pages/account/paymentVoucher/PaymentVoucherPrint_FangGaiBan.jsp
#	WebRoot/WEB-INF/pages/jfzm/jfzm_print.jsp
parents 5aa35cec 90e58296
......@@ -21,208 +21,208 @@
line-height: 180%;
}
.normalsize{
font-size: 15.8px;
font-size: 14.8px;
}
.f1 {
left: 250px;
top: 188px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 建设单位(左) */
.f2 {
left: 200px;
left: 190px;
top: 215px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 项目性质(左) */
.f3 {
left: 170px;
top: 243px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 项目名称(左) */
.f4 {
left: 170px;
top: 298px;
font-size: 15.8px;
top: 290px;
font-size: 14.8px;
}
/* 项目名称(左) */
.f5 {
left: 170px;
top: 351px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 建筑面积(左)*/
.f6 {
left: 190px;
top: 376px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 测算配套费(左) */
.f7 {
left: 205px;
top: 429px;
font-size: 15.8px;
font-size: 14.8px;
}
.f8 {
left: 205px;
top: 458px;
font-size: 15.8px;
font-size: 14.8px;
}
.f9 {
left: 145px;
top: 499px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 备注 */
.f10 {
left: 175px;
top: 549px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 经办人 */
.f11 {
left: 175px;
top: 607px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 领单人 */
.f12 {
left: 185px;
top: 673px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 电子监管号 */
.f13 {
left: 157px;
top: 697px;;
font-size: 15.8px;
top: 702px;;
font-size: 14.8px;
}
/* 年 */
.f14 {
left: 230px;
top: 697px;
font-size: 15.8px;
top: 702px;
font-size: 14.8px;
}
/* 月 */
.f15 {
left: 275px;
top: 697px;
font-size: 15.8px;
top: 702px;
font-size: 14.8px;
}
/* 日 */
.f16 {
left: 580px;
top: 660px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 电子监管号 */
.f17 {
left: 600px;
top: 258px;
font-size: 15.8px;
font-size: 14.8px;
}
.f18 {
left: 855px;
top: 258px;
font-size: 15.8px;
font-size: 14.8px;
}
.f19 {
left: 600px;
top: 303px;
font-size: 15.8px;
font-size: 14.8px;
}
.f20 {
left: 600px;
top: 340px;
font-size: 15.8px;
font-size: 14.8px;
}
.f21 {
left: 600px;
top: 393px;
font-size: 15.8px;
font-size: 14.8px;
}
.f22 {
left: 600px;
top: 438px;
font-size: 15.8px;
font-size: 14.8px;
}
.f23 {
left: 600px;
top: 483px;
font-size: 15.8px;
font-size: 14.8px;
}
.f24 {
left: 580px;
top: 580px;
font-size: 15.8px;
font-size: 14.8px;
}
.f25 {
left: 580px;
top: 605px;
font-size: 15.8px;
font-size: 14.8px;
}
.f26 {
left: 580px;
top: 634px;
font-size: 15.8px;
font-size: 14.8px;
}
.f27 {
left: 795px;
top: 709px;
z-index:99;
font-size: 15.8px;
font-size: 14.8px;
}
.f28 {
left: 865px;
top: 709px;
z-index:99;
font-size: 15.8px;
font-size: 14.8px;
}
.f29 {
left: 920px;
top: 709px;
z-index:99;
font-size: 15.8px;
font-size: 14.8px;
}
.f30 {
left: 600px;
top: 479px;
font-size: 15.8px;
font-size: 14.8px;
}
.f31 {
left: 600px;
top: 499px;
font-size: 15.8px;
font-size: 14.8px;
}
/*NO.PTF*/
.f32 {
......@@ -243,7 +243,7 @@
left: 155px;
top: 563px;
font-weight: bolder;
font-size: 15.8px;
font-size: 14.8px;
}
/*内部使用*/
.f35,.f40 {
......@@ -271,18 +271,18 @@
.f37 {
left: 250px;
top: 250px;
font-size: 15.8px;
font-size: 14.8px;
}
.f38 {
left: 70px;
top: 490px;
font-size: 15.8px;
font-size: 14.8px;
}
.f39 {
left: 800px;
top: 395px;
font-size: 15.8px;
font-size: 14.8px;
}
.f38 img,
......@@ -299,98 +299,98 @@
.f111 {
left: 660px;
top: 104px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 项目编号 */
.f211 {
left: 219px;
top: 168px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 建设单位 */
.f311 {
left: 570px;
top: 168px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 房改办联系单编号 */
.f411 {
left: 219px;
top: 222px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 项目名称 */
.f511 {
left: 570px;
top: 222px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 项目受理编号 */
.f611 {
left: 219px;
top: 284px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 项目地址 */
.f711 {
left: 570px;
top: 284px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 联系人及电话 */
.f811 {
left: 219px;
top: 356px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 补缴面积 */
.f911 {
left: 570px;
top: 356px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 其它规费 */
.f1211 {
left: 232px;
top: 368px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 经办人 */
.f1311 {
left: 200px;
top: 430px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 领单人 */
.f1411 {
left: 485px;
top: 488px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 年 */
.f1511 {
left: 545px;
top: 488px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 月 */
.f1611 {
left: 585px;
top: 488px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 日 */
......@@ -398,96 +398,96 @@
.f1711 {
left: 660px;
top: 564px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 项目编号 */
.f1811 {
left: 219px;
top: 686px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 建设单位 */
.f1911 {
left: 570px;
top: 686px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 房改办联系单编号 */
.f2011 {
left: 219px;
top: 740px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 项目名称 */
.f2111 {
left: 570px;
top: 740px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 项目受理编号 */
.f2211 {
left: 219px;
top: 810px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 项目地址 */
.f2311 {
left: 570px;
top: 810px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 联系人及电话 */
.f2411 {
left: 219px;
top: 896px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 补缴面积 */
.f2511 {
left: 570px;
top: 896px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 其它规费 */
.f2811 {
left: 485px;
top: 1031px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 年 */
.f2911 {
left: 545px;
top: 1031px;
font-size: 15.8px;
font-size: 14.8px;
}
/* 月 */
.f3011 {
left: 585px;
top: 1031px;
font-size: 15.8px;
font-size: 14.8px;
}
.f3111 {
left: 585px;
top: 408px;
font-size: 15.8px;
font-size: 14.8px;
}
.f3211 {
left: 585px;
top: 950px;
font-size: 15.8px;
font-size: 14.8px;
}
.f3111 img,
.f3211 img {
......@@ -593,26 +593,26 @@
<div id='f1' draggable='true' class='f1'>${xmxxb.xxylb}</div>
<div id='f2' draggable='true' class='f2'>${xmxxb.slbh}</div>
<c:choose>
<c:when test="${fn:length(xmxxb.jsdw) <= 35 }"> <!--如果 -->
<c:when test="${fn:length(xmxxb.jsdw) <= 28 }"> <!--如果 -->
<div id='f3' draggable='true'
class='f3'>${fn:substring(xmxxb.jsdw,0,13)}<br/>${fn:substring(xmxxb.jsdw,13,26)}<br/>${fn:substring(xmxxb.jsdw,26,35)}
class='f3'>${fn:substring(xmxxb.jsdw,0,10)}<br/>${fn:substring(xmxxb.jsdw,10,20)}<br/>${fn:substring(xmxxb.jsdw,20,28)}
</div>
</c:when>
<c:otherwise> <!--否则 -->
<div id='f3' draggable='true'
class='f3'>${fn:substring(xmxxb.jsdw,0,13)}<br/>${fn:substring(xmxxb.jsdw,13,26)}<br/>${fn:substring(xmxxb.jsdw,26,35)}(最多显示35个字)
class='f3'>${fn:substring(xmxxb.jsdw,0,10)}<br/>${fn:substring(xmxxb.jsdw,10,20)}<br/>${fn:substring(xmxxb.jsdw,20,25)}...
</div>
</c:otherwise>
</c:choose>
<c:choose>
<c:when test="${fn:length(xmxxb.xmmc) <= 35 }"> <!--如果 -->
<c:when test="${fn:length(xmxxb.xmmc) <= 28 }"> <!--如果 -->
<div id='f4' draggable='true'
class='f4'>${fn:substring(xmxxb.xmmc,0,13)}<br/>${fn:substring(xmxxb.xmmc,13,26)}<br/>${fn:substring(xmxxb.xmmc,26,35)}
class='f4'>${fn:substring(xmxxb.xmmc,0,10)}<br/>${fn:substring(xmxxb.xmmc,10,20)}<br/>${fn:substring(xmxxb.xmmc,20,28)}
</div>
</c:when>
<c:otherwise> <!--否则 -->
<div id='f4' draggable='true'
class='f4'>${fn:substring(xmxxb.xmmc,0,13)}<br/>${fn:substring(xmxxb.xmmc,13,26)}<br/>${fn:substring(xmxxb.xmmc,26,35)}(最多显示35个字)
class='f4'>${fn:substring(xmxxb.xmmc,0,10)}<br/>${fn:substring(xmxxb.xmmc,10,20)}<br/>${fn:substring(xmxxb.xmmc,20,25)}...
</div>
</c:otherwise>
</c:choose>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment