Merge branch 'master' of http://gitlab.fangjia.com/dev0/main
This commit is contained in:
@@ -724,19 +724,59 @@
|
||||
});
|
||||
var series = new Array();
|
||||
series[0] = {
|
||||
name:"房源散列图",
|
||||
name:"房源散列图-普通住宅",
|
||||
data:new Array()
|
||||
//color:"#660099"
|
||||
}
|
||||
series[1] = {
|
||||
name:"房源散列图-商住",
|
||||
data:new Array(),
|
||||
color:"#12990f"
|
||||
}
|
||||
series[2] = {
|
||||
name:"房源散列图-别墅",
|
||||
data:new Array(),
|
||||
color:"#992632"
|
||||
}
|
||||
var series_arry_0 = []
|
||||
var series_arry_1 = []
|
||||
var series_arry_2 = []
|
||||
$(data).each(function(i,item){
|
||||
var pdate = item.pDate + "";
|
||||
var ds = pdate.substring(0, 4) + '-' + pdate.substring(4, 6) + '-' + pdate.substring(6)
|
||||
series[0].data.push({
|
||||
x:new Date(ds),
|
||||
y:Math.round(item.totalPrice/item.area),
|
||||
data:item
|
||||
})
|
||||
if (item.estateType.indexOf('别墅') > -1){
|
||||
series_arry_2.push({
|
||||
x:new Date(ds),
|
||||
y:Math.round(item.totalPrice/item.area),
|
||||
data:item
|
||||
})
|
||||
}else if((item.estateType.indexOf('商住') > -1) || (item.estateType.indexOf('公寓酒店') > -1)){
|
||||
series_arry_1.push({
|
||||
x:new Date(ds),
|
||||
y:Math.round(item.totalPrice/item.area),
|
||||
data:item
|
||||
})
|
||||
}else{
|
||||
series_arry_0.push({
|
||||
x:new Date(ds),
|
||||
y:Math.round(item.totalPrice/item.area),
|
||||
data:item
|
||||
})
|
||||
}
|
||||
// series[0].data.push({
|
||||
// x:new Date(ds),
|
||||
// y:Math.round(item.totalPrice/item.area),
|
||||
// data:item
|
||||
// })
|
||||
// series[1].data.push({
|
||||
// x:new Date(ds),
|
||||
// y:Math.round(item.totalPrice/item.area),
|
||||
// data:item
|
||||
// })
|
||||
});
|
||||
series[0].data = series_arry_0
|
||||
series[1].data = series_arry_1
|
||||
series[2].data = series_arry_2
|
||||
$('#houseChart').highcharts({
|
||||
chart: {
|
||||
type: 'scatter',
|
||||
|
||||
@@ -152,7 +152,7 @@
|
||||
<tbody>
|
||||
<#list loudongList! as loudong>
|
||||
<tr>
|
||||
<td width="4%">
|
||||
<td width="9%">
|
||||
${loudong.districtNo!''}
|
||||
</td>
|
||||
<td width="4%">
|
||||
|
||||
@@ -140,6 +140,7 @@
|
||||
<th style="width:60px;">板块</th>
|
||||
<th style="width:80px;">装修</th>
|
||||
<th style="width:70px;">朝向</th>
|
||||
<th style="width:70px;">物业类型</th>
|
||||
<th style="width:90px;">来源</th>
|
||||
<th style="width:80px;">操作</th>
|
||||
</tr>
|
||||
@@ -180,6 +181,7 @@
|
||||
<td>${it.block!}</td>
|
||||
<td>${it.fitment!}</td>
|
||||
<td>${it.direction!}</td>
|
||||
<td>${it.estateType!}</td>
|
||||
<td>
|
||||
<#if it.url??>
|
||||
<a href="${it.url!}" target="_blank" title="${it.url!}">${t_util.urlToSiteName(it.url!)!'未知'}</a>
|
||||
|
||||
Reference in New Issue
Block a user