6 宸茬鎴挎簮
@@ -179,7 +182,8 @@
-
+
+
@@ -218,9 +222,11 @@
// jspdf.addFont('SourceHanSans-Normal.ttf', 'SourceHanSans-Normal', 'normal');
// jspdf.setFont('SourceHanSans-Light');
//console.log(jspdf.getFontList());
+ var chart;
$("#download").bind('click', function(){
+ var chartImgUrl = $('#chartImgUrl').val();
window.location.href = "download?city="+params.city+"&district="+params.district+"&name="+params.name+"&address="+params.address+"&size="+params.size+"&floor="+params.floor
- +"&height="+params.height+"&room="+params.room+"&hall="+params.hall+"&toilet="+params.toilet+"&direction="+params.direction+"&fitment="+params.fitment;
+ +"&height="+params.height+"&room="+params.room+"&hall="+params.hall+"&toilet="+params.toilet+"&direction="+params.direction+"&fitment="+params.fitment+"&chartImgUrl=" + chartImgUrl;
// jspdf.html(document.body, {
// callback: function (doc) {
// doc.save("绉熼噾鎶ュ憡.pdf");
@@ -319,9 +325,9 @@
' + d.city + ' | \
' + d.region + ' | \
' + d.districtName + ' | \
-
' + d.totalPrice + ' | \
-
' + d.area + ' | \
-
' + d.room + ' | \
+
' + (d.totalPrice != undefined ? d.totalPrice : '') + ' | \
+
' + (d.area != undefined ? d.area : '') + ' | \
+
' + (d.room != undefined ? d.room : '') + ' | \
' + hall + ' | \
' + fitment + ' | \
' + formatDate(d.tradeDate) + ' | \
@@ -340,10 +346,10 @@
' + d.city + ' | \
' + d.region + ' | \
' + d.districtName + ' | \
-
' + d.totalPrice + ' | \
-
' + d.area + ' | \
-
' + d.room + ' | \
-
' + d.hall + ' | \
+
' + (d.totalPrice != undefined ? d.totalPrice : '') + ' | \
+
' + (d.area != undefined ? d.area : '') + ' | \
+
' + (d.room != undefined ? d.room : '') + ' | \
+
' + (d.hall != undefined ? d.hall : '')+ ' | \
' + fitment + ' | \
' + date + ' | \
');
@@ -359,9 +365,9 @@
$('#sameDistricts').append('
\
| ' + d.city + ' | \
' + d.region + ' | \
- ' + d.districtName + ' | \
- ' + d.roomPrice + ' | \
- ' + d.room + ' | \
+ ' + (d.districtName != undefined ? d.districtName:'' ) + ' | \
+ ' + (d.roomPrice != undefined ? d.roomPrice:'') + ' | \
+ ' + (d.room != undefined ? d.room:'') + ' | \
1 | \
');
})
@@ -426,8 +432,9 @@
var config = {yaxis : yaxis};
createHighChartNow(renderId, data, config);
};
+
function createHighChartNow(renderId, data, config) {
- var chart = new Highcharts.Chart({
+ chart = new Highcharts.Chart({
credits:{
enabled:true,
text: '',
@@ -446,6 +453,9 @@
renderTo: renderId,
type: 'spline'
},
+ exporting: {
+ enabled: false
+ },
title: {
text: data.title,
floating: false,
@@ -479,7 +489,26 @@
}
}
});
+ saveHighChartImg();
};
+
+ function saveHighChartImg() {
+ var svg = chart.getSVG();
+ $.ajax({
+ // 娉ㄦ剰闇�瑕佸姞..
+ url: "saveHighChartAsImage",
+ data: {
+ svg:svg
+ },
+ dataType: "json",
+ type: "post",
+ success: function (ret) {
+ if (ret.address != null) {
+ $('#chartImgUrl').val(ret.address)
+ }
+ }
+ })
+ }
$(function () {
init();
});
diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl
index 615fef4c5..fcb37e18c 100644
--- a/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl
+++ b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl
@@ -18,29 +18,31 @@
body {
overflow: hidden;
overflow-y: scroll;
- background: #f8f8f8;
+ background: white;
/** 鐗瑰埆娉ㄦ剰锛屽惁鍒欎腑鏂囦笉鐢熸晥 **/
font-family: SimSun;
}
.main {
margin: 4px 8px 4px 8px;
- background: #f8f8f8;
+ background: white;
}
.title {
position: relative;
color: #1E90FF;
}
.title1 {
- font-size: 14px;
+ font-size: 19px;
color: #1E90FF;
+ margin-top: 3px;
+ margin-bottom: 3px;
}
.p {
- font-size: 12px;
+ font-size: 16px;
}
.table {
width: 100%;
overflow-y: hidden;
- overflow-x: scroll
+ overflow-x: scroll;
}
.inline {
width: 550px;
@@ -109,7 +111,7 @@
<#if result.tradesImgUrl??>
<#--

-->
-

+

<#else>
@@ -122,7 +124,7 @@
6 宸茬鎴挎簮
-
+
| 鍩庡競 |
@@ -161,13 +163,13 @@
7 鏍锋湰鍙傝��
-
+
| 鍩庡競 |
鍖哄煙 |
灏忓尯鍚� |
- 绉熼噾 |
+ 绉� 閲� |
闈㈢Н |
瀹� |
鍘� |
@@ -200,7 +202,7 @@
8 鍛ㄨ竟鍚岀被灏忓尯绉熼噾
-
+
| 鍩庡競 |
@@ -220,7 +222,7 @@
<#if bo.districtName??>${bo.districtName}#if> |
<#if bo.totalPrice??>${bo.totalPrice}#if> |
<#if bo.room??>${bo.room}#if> |
- <#if bo.hall??>${bo.hall}#if> |
+ <#if bo.hall??>${bo.hall}<#else>1#if> |
#list>
<#else>
diff --git a/projects/fangjia-open/src/main/webapp/fonts/simsun.ttc b/projects/fangjia-open/src/main/webapp/fonts/simsun.ttc
new file mode 100644
index 000000000..e64e92ed9
Binary files /dev/null and b/projects/fangjia-open/src/main/webapp/fonts/simsun.ttc differ