6 宸茬鎴挎簮
@@ -181,7 +182,8 @@
-
+
+
@@ -220,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");
@@ -428,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: '',
@@ -448,6 +453,9 @@
renderTo: renderId,
type: 'spline'
},
+ exporting: {
+ enabled: false
+ },
title: {
text: data.title,
floating: false,
@@ -481,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 f48fa7d91..fcb37e18c 100644
--- a/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl
+++ b/projects/fangjia-open/src/main/webapp/ccbRent/downloadPage.ftl
@@ -18,26 +18,26 @@
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: 15px;
+ font-size: 19px;
color: #1E90FF;
- margin-top: 2px;
- margin-bottom: 2px;
+ margin-top: 3px;
+ margin-bottom: 3px;
}
.p {
- font-size: 13px;
+ font-size: 16px;
}
.table {
width: 100%;
@@ -111,7 +111,7 @@
<#if result.tradesImgUrl??>
<#--

-->
-

+

<#else>