diff --git a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl
index 6c52269b0..a3d233ead 100644
--- a/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl
+++ b/projects/fangjia-open/src/main/webapp/ccbRent/detail.ftl
@@ -253,51 +253,59 @@
$('span[name="size"]').text(result.size)
$('span[name="height"]').text(result.height)
$('span[name="fitment"]').text(result.fitment)
+ }else{
+ $.toast(data.msg);
+ }
+ },
+ error: function () {
- $.ajax({
- // 注意需要加..
- url: '../property/rentReport2',
- data: params,
- dataType: "json",
- type: "post",
- success: function (data) {
- if (data.code == 200) {
- let result = data.result;
- //历史租金
- var charts = {}
- // charts.series = [{
- // name: '1居室',
- // data: [3800, 3900, 4000, 4100, 4200, 4200, 4200, 4200]
- // }];
- if (result.trends.distMap[params.room] == undefined) {
- console.log("返回历史租金,不存在" + params.room + "居室数据")
- $('#districtRentTrendsChart').empty();
- $('#districtRentTrendsChart').removeClass("charts");
- $('#districtRentTrendsChart').addClass("p table");
- $('#districtRentTrendsChart').append('
');
- } else {
- var arr = [];
- result.trends.times.forEach(function (d) {
- var price = result.trends.distMap[params.room][d];
- if (price != undefined) {
- arr.push(price);
- } else {
- arr.push('');
- }
- })
- charts.series = [{'name': params.room + '居室', 'data': arr}]; // 纵坐标
- charts.xData = result.trends.times; // 横坐标值
- createChartNow('districtRentTrendsChart', charts, true);
- }
+ }
+ })
- //已租房源
- var trades = result.trades;
- if (trades && trades.length > 0) {
- $('#trades').empty();
- trades.forEach(function(d){
- var fitment = d.fitment != undefined ? d.fitment : '';
- var hall = d.hall != undefined ? d.hall : '';
- $('#trades').append(' \
+ $.ajax({
+ // 注意需要加..
+ url: '../property/rentReport2',
+ data: params,
+ dataType: "json",
+ type: "post",
+ success: function (data) {
+ if (data.code == 200) {
+ let result = data.result;
+ //历史租金
+ var charts = {}
+ // charts.series = [{
+ // name: '1居室',
+ // data: [3800, 3900, 4000, 4100, 4200, 4200, 4200, 4200]
+ // }];
+ if (result.trends.distMap[params.room] == undefined) {
+ console.log("返回历史租金,不存在" + params.room + "居室数据")
+ $('#districtRentTrendsChart').empty();
+ $('#districtRentTrendsChart').removeClass("charts");
+ $('#districtRentTrendsChart').addClass("p table");
+ $('#districtRentTrendsChart').append('');
+ } else {
+ var arr = [];
+ result.trends.times.forEach(function (d) {
+ var price = result.trends.distMap[params.room][d];
+ if (price != undefined) {
+ arr.push(price);
+ } else {
+ arr.push('');
+ }
+ })
+ charts.series = [{'name': params.room + '居室', 'data': arr}]; // 纵坐标
+ charts.xData = result.trends.times; // 横坐标值
+ createChartNow('districtRentTrendsChart', charts, true);
+ }
+
+ //已租房源
+ var trades = result.trades;
+ if (trades && trades.length > 0) {
+ $('#trades').empty();
+ trades.forEach(function(d){
+ var fitment = d.fitment != undefined ? d.fitment : '';
+ var hall = d.hall != undefined ? d.hall : '';
+ $('#trades').append('
\
| ' + d.city + ' | \
' + d.region + ' | \
' + d.districtName + ' | \
@@ -308,17 +316,17 @@
' + fitment + ' | \
' + formatDate(d.tradeDate) + ' | \
');
- })
- }
+ })
+ }
- // 样本参考
- var referenceHouses = result.houses;
- if (referenceHouses && referenceHouses.length > 0) {
- $('#referenceHouses').empty();
- referenceHouses.forEach(function(d){
- var fitment = d.fitment != undefined ? d.fitment : '';
- var date = (d.pDate + '').substring(0, 4) + "-" + (d.pDate + '').substring(4, 6) + "-" + (d.pDate + '').substring(6, 8)
- $('#referenceHouses').append(' \
+ // 样本参考
+ var referenceHouses = result.houses;
+ if (referenceHouses && referenceHouses.length > 0) {
+ $('#referenceHouses').empty();
+ referenceHouses.forEach(function(d){
+ var fitment = d.fitment != undefined ? d.fitment : '';
+ var date = (d.pDate + '').substring(0, 4) + "-" + (d.pDate + '').substring(4, 6) + "-" + (d.pDate + '').substring(6, 8)
+ $('#referenceHouses').append('
\
| ' + d.city + ' | \
' + d.region + ' | \
' + d.districtName + ' | \
@@ -329,16 +337,16 @@
' + fitment + ' | \
' + date + ' | \
');
- })
+ })
- }
+ }
- // 同类小区租金
- var sameDistricts = result.districts;
- if (sameDistricts && sameDistricts.length > 0) {
- $('#sameDistricts').empty()
- sameDistricts.forEach(function(d){
- $('#sameDistricts').append(' \
+ // 同类小区租金
+ var sameDistricts = result.districts;
+ if (sameDistricts && sameDistricts.length > 0) {
+ $('#sameDistricts').empty()
+ sameDistricts.forEach(function(d){
+ $('#sameDistricts').append('
\
| ' + d.city + ' | \
' + d.region + ' | \
' + (d.districtName != undefined ? d.districtName:'' ) + ' | \
@@ -346,19 +354,11 @@
' + (d.room != undefined ? d.room:'') + ' | \
1 | \
');
- })
- }
- }
- }
- });
- }else{
- $.toast(data.msg);
+ })
+ }
}
- },
- error: function () {
-
}
- })
+ });
};
var formatDate = function (dateStr) {
var date = new Date(dateStr);