YOUFANG 评估结果+我的关注

This commit is contained in:
zongzhimin
2018-04-02 16:29:56 +08:00
parent 024236d719
commit 995866d19e
2 changed files with 372 additions and 198 deletions
+84 -198
View File
@@ -104,19 +104,19 @@
</li>
</ul>
</div>
<a class="ad" href=""><img src="../../images/adImg.png"></a>
<a class="ad" href=""><img src="../../images/adImg.png" id="img"></a>
<div class="topic">
<div class="topicTitle" style="position:relative;">均价走势
<div class="content-block">
<div class="buttons-row theme">
<a href="#tabChartAvg1" class="tab-link button active">半年</a>
<a href="#tabChartAvg2" class="tab-link button">一年</a>
<a href="#tabChartAvg3" class="tab-link button">三年</a>
<div class="buttons-row theme avgPriceTrend">
<a href="#tabChartAvg1" data-id="2" class="tab-link button active">半年</a>
<a href="#tabChartAvg2" data-id="3" class="tab-link button">一年</a>
<a href="#tabChartAvg3" data-id="5" class="tab-link button">三年</a>
</div>
</div>
</div>
<div class="topicContent" style="padding:0;">
<div class="chart" id="chart"></div>
<div class="chart" id="chart02"></div>
</div>
</div>
</div>
@@ -128,7 +128,7 @@
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
Zepto = $
var jQuery = $
$.config = {router: false}
</script>
@@ -238,6 +238,15 @@ $.config = {router: false}
evaluate_msg.evaluate_words="暂无"
}
evaluate_msg.msg=h.evaluateMsg
$("#img").attr("src","http://192.168.10.161:8084/img/"+h.imgId);
loadingChart(h.city,h.region,h.name,2)
//按照时间范围加载数据
$(".avgPriceTrend a").click(function(){
var type = $(this).attr("data-id");
$(".avgPriceTrend a").removeClass("active")
$(this).addClass('active');
loadingChart(h.city,h.region,h.name,type);
});
}
}).catch(function(error){
console.log(error)
@@ -295,199 +304,76 @@ $(document).on('click','.open-vertical-modal', function () {
<script>
/* 均价走势 */
//function yearAvgPrice(){
// var categories = new Array();
// var series = new Array();
// var o = new Object();
// o.name = '龙盛佳苑';
//
// var odata = new Array();
// o.data = odata
// series.push(o);
//
// var o2 = new Object();
// o2.name = '上海';
// var o2data = new Array();
//
// var o3 = new Object();
// o3.name = '静安';
// var o3data = new Array();
// odata.push(46000)
// o2data.push(50400)
// o3data.push(52800)
// categories.push('2017-02')
// odata.push(47000)
// o2data.push(50600)
// o3data.push(52900)
// categories.push('2017-03')
// odata.push(47400)
// o2data.push(50300)
// o3data.push(52700)
// categories.push('2017-04')
// odata.push(49000)
// o2data.push(50200)
// o3data.push(55200)
// categories.push('2017-05')
// odata.push(49400)
// o2data.push(50800)
// o3data.push(56100)
// categories.push('2017-06')
// odata.push(49600)
// o2data.push(51900)
// o3data.push(56900)
// categories.push('2017-07')
// odata.push(48400)
// o2data.push(53100)
// o3data.push(59400)
// categories.push('2017-08')
// odata.push(52200)
// o2data.push(51200)
// o3data.push(62400)
// categories.push('2017-09')
// odata.push(54900)
// o2data.push(56200)
// o3data.push(65600)
// categories.push('2017-10')
// odata.push(57400)
// o2data.push(57000)
// o3data.push(66800)
// categories.push('2017-11')
// odata.push(54800)
// o2data.push(56700)
// o3data.push(66200)
// categories.push('2017-12')
// odata.push(55000)
// o2data.push(58300)
// o3data.push(66000)
// categories.push('2018-01')
//
// o3.data = o3data
// series.push(o3);
//
// o2.data = o2data
// series.push(o2);
//
// charts = Highcharts.chart('chart', {
// title: {
// text: ''
// },
// subtitle: {
// text: '',
// x: -20
// },
// colors: ['#F88C9F', '#AAD672', '#AE94E9'],
// xAxis: {
// categories: categories,
// boundaryGap: false,
// tickInterval: 2,
// tickLength: 6,
// labels: {
// style: {
// fontSize: 12
// }
// }
// },
// yAxis: {
// allowDecimals: false,
// title: {
// text: ''
// },
// plotLines: [{
// value: 0,
// width: 1,
// color: 'red'
// }]
// },
// tooltip: {
// valueSuffix: '元/㎡'
// },
// legend: {
// layout: 'horizontal',
// align: 'center',
// verticalAlign: 'bottom',
// y: 0,
// borderWidth: 0
// },
// plotOptions: {
// line: {
// connectNulls: true //该设置会连接空值点
// },
// series: {
// events: {
// legendItemClick: function(e) {
// return false;
// }
// },
// marker: {
// radius: 3, //曲线点半径,默认是4
// symbol: 'circle' //曲线点类型:"circle", "square", "diamond", "triangle","triangle-down",默认是"circle"
// }
// }
// },
// series: series,
// credits: {
// enabled: false
// }
// })
//}
//yearAvgPrice();
function loadingChart(hid, city, region, name, type, cat){
$.ajax({
type : "GET",
url : "../youfang/getDistrictPriceZouShi?id="+hid+"&type="+type+"&cat="+cat+"&city="+city+"&region="+region+"&name="+name,
dataType:"json",
data : {},
async:false,
success : function(re) {
var categories = new Array();
var series = new Array();
var cityObj = new Object();
var regionObj = new Object();
var districtObj = new Object();
districtObj.name = '<#if showObject??>${showObject.name!}</#if>';
regionObj.name = '<#if showObject??>${showObject.region!}</#if>';
cityObj.name = '<#if showObject??>${showObject.city!}</#if>';
series.push(districtObj);
series.push(regionObj);
series.push(cityObj);
var cityDatas = new Array();
var regionDatas = new Array();
var districtDatas = new Array();
var m = re.timeKeys;
if(m){
for(var i=0;i<m.length;i++){
var date = new Date(Number(m[i]))
categories.push(date.format("yyyy-MM"));
if(re.cityAvgZouShi[m[i]] == undefined){
cityDatas.push(null);
} else {
cityDatas.push(re.cityAvgZouShi[m[i]]);
}
if (re.regionAvgZouShi[m[i]] == undefined) {
regionDatas.push(null);
} else {
regionDatas.push(re.regionAvgZouShi[m[i]]);
}
if (re.districtAvgZouShi[m[i]] == undefined){
districtDatas.push(null);
} else {
districtDatas.push(re.districtAvgZouShi[m[i]]);
}
function getNowFormatDate(date) {
var seperator1 = "-";
var year = date.getFullYear();
var month = date.getMonth() + 1;
if (month >= 1 && month <= 9) {
month = "0" + month;
}
var currentdate = year + seperator1 + month ;
return currentdate;
}
function loadingChart(city, region, name,type){
axios.get("/fsh/getDistrictPriceZouShi",{
params:{city : city,region:region,name:name,type:type}
}).then(function(response){
var re = response.data;
var categories = new Array();
var series = new Array();
var cityObj = new Object();
var regionObj = new Object();
var districtObj = new Object();
districtObj.name = '小区';
regionObj.name = '区县';
cityObj.name = '城市';
series.push(districtObj);
series.push(regionObj);
series.push(cityObj);
var cityDatas = new Array();
var regionDatas = new Array();
var districtDatas = new Array();
var m = re.timeKeys;
if(m){
for(var i=0;i<m.length;i++){
var date = new Date(Number(m[i]))
//
categories.push(getNowFormatDate(date));
if(re.cityAvgZouShi[m[i]] == undefined){
cityDatas.push(null);
} else {
cityDatas.push(re.cityAvgZouShi[m[i]]);
}
if (re.regionAvgZouShi[m[i]] == undefined) {
regionDatas.push(null);
} else {
regionDatas.push(re.regionAvgZouShi[m[i]]);
}
if (re.districtAvgZouShi[m[i]] == undefined){
districtDatas.push(null);
} else {
districtDatas.push(re.districtAvgZouShi[m[i]]);
}
}
cityObj.data = cityDatas;
regionObj.data = regionDatas;
districtObj.data = districtDatas;
showChat(categories, series);
}
});
}
cityObj.data = cityDatas;
regionObj.data = regionDatas;
districtObj.data = districtDatas;
showChat(categories, series);
}).catch(function(error){
console.log(error)
})
}
+288
View File
@@ -0,0 +1,288 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>我的关注</title>
<meta name="viewport" content="initial-scale=1, maximum-scale=1">
<link rel="shortcut icon" href="/favicon.ico">
<meta name="apple-mobile-web-app-capable" content="yes">
<meta name="apple-mobile-web-app-status-bar-style" content="black">
<link rel="stylesheet" href="http://g.alicdn.com/msui/sm/0.6.2/css/sm.css">
<link rel="stylesheet" href="../../css/main.css">
<link rel="stylesheet" href="../../css/theme-blue.css">
</head>
<body>
<div class="page-group">
<div class="page page-current">
<header class="bar bar-nav">
<button class="button button-link button-nav pull-left" onclick="back(),plus.nativeUI.closeWaiting();">
<span class="icon icon-left"></span>
</button>
<!-- <button class="button button-link button-nav pull-right open-popover">
<span class="icon icon-path"></span>
</button> -->
<h1 class="title">我的关注</h1>
</header>
<div class="bar bar-header-secondary">
<div class="buttons-row theme">
<a href="#tab1" class="tab-link button active">小区</a>
<a href="#tab2" class="tab-link button">城市</a>
</div>
</div>
<div class="content contentSuggest infinite-scroll infinite-scroll-bottom" data-distance="50">
<div class="tabs">
<div id="tab1" class="tab active">
<div class="content-block content-block01">
<div class="list-block media-list">
<ul class="list-container" id="ulTab1">
</ul>
</div>
<!-- 加载提示符 -->
<div id="loadTip1" class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>
</div>
</div>
<div id="tab2" class="tab">
<div class="content-block content-block01">
<div class="list-block media-list">
<ul class="list-container" id="ulTab2">
</ul>
</div>
<!-- 加载提示符 -->
<div id="loadTip2" class="infinite-scroll-preloader">
<div class="preloader"></div>
</div>
</div>
</div>
</div>
</div>
</div>
<#include "/customMenu.html" />
</div>
<script type="text/javascript" src="http://g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
<script>
/* 关闭路由,以实现不同页面之间的相互跳转(仅开发环境需要) */
jQuery = $
$.config = {router: false}
</script>
<script type='text/javascript' src='../../js/light7.js?version=${version!}' charset='utf-8'></script>
<script type="text/javascript" src="../../js/cn.js?version=${version!}" charset="utf-8"></script>
<script type="text/javascript" src="../../js/common.js?version=${version!}"></script>
<script src="../../config.js"></script>
<script type="text/javascript" src="../../js/common.js" ></script>
<script type="text/javascript" src="../../js/axios.min.js"></script>
<script type="text/javascript" src="../../js/axiosPlugin.js"></script>
<#include "/monitor/monitor.html">
<script type="text/javascript">
$("#ulTab1").empty();
$("#ulTab2").empty();
//$.init()
//加载flag
var loading = false;
//最多可加载的条目
var maxItems = 100;
//上次加载的序号小区
var lastIndex = 0;
//上次加载的序号城市
var lastIndex2 = 0;
//每次加载添加多少条目
var itemsPerLoad = 8;
var itemsPerLoadCity = 20;
var url = "loadCollections?pageSize="+itemsPerLoad;
var urlCity = "loadCityCollections?pageSize="+itemsPerLoadCity;
var curpage = 1;
var curpageCity = 1;
var totalCount = 0;
var tatalCountCity = 0;
function addEstate(number, lastIndex) {
curpage = lastIndex/itemsPerLoad + 1;
axios.get("/myCollection/loadCollections",{params:{pageSize:itemsPerLoad,page:curpage}}).then(function(response){
data = response.data;
//data = eval( '(' + data + ')' );
if(data['results']==null || data['results'].length==0) {
$('#loadTip1').remove();
$('.infinite-scroll-bottom #tab1').html("<div class='noData'><img src='../images/noData.png'><p>您还没有关注小区</p></div>");
return;
}
totalCount = data.totalCount;
// 生成新条目的HTML
var html = '';
$.each(data['results'], function(i){
var tag = this.tag;
var tagStr = "";
if(tag){
var tags = tag.split("_")
for(var j=0;j<tags.length;j++){
if(j<3){
var tag = tags[j];
tagStr = tagStr + '<small class="small01">'+tag+'</small>';
}
}
}
//'<div class="item-after"><em>'+(this.minPrice?this.minPrice:'')+'万-'+(this.maxPrice?this.maxPrice:'')+'万</em></div>'+
var priceStr = this.minPrice+'万-'+this.maxPrice+'万';
if(this.minPrice==null||this.minPrice==0||this.maxPrice==null||this.maxPrice==0){
priceStr="暂无数据";
}
html+= '<li>'+
'<a onclick="clicked(\'${basePath}/district/details?city='+this.city+'&region='+this.region+'&name='+this.name+'\',true)" class="item-link item-content">'+
'<div class="item-inner">'+
'<div class="item-title-row">'+
'<div class="item-title">'+this.name+'</div>'+
'<div class="item-after">¥'+(this.avgPrice?this.avgPrice:'')+ '元/㎡</div>'+
'</div>'+
'<div class="item-title-row">'+
'<div class="item-title"><small>'+(this.address?(this.city+this.region+this.address):'')+'</small></div>'+
'</div>'+
'<div class="item-subtitle row">'+
'<div class="col-50">潜力指数: <em class="em01">68</em></div>'+
'<div class="col-50">涨跌幅: <em class="up">↑24.96%</em></div>'+
'<div class="col-100">租金回报率: <em class="em02">2.08%</em></div>'+
'</div>'+
'<div class="item-subtitle">'+tagStr+'</div>'+
'</div>'+
'</a>'+
'</li>';
});
// 添加新条目
$('#ulTab1').append(html);
if(totalCount<=itemsPerLoad){
// 加载完毕,则注销无限加载事件,以防不必要的加载
// $.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip1').remove();
}
}).catch(function(error){
console.log(error)
});
}
function addCity(number, lastIndex){
curpageCity = lastIndex2/itemsPerLoadCity + 1;
axios.get("/myCollection/loadCityCollections",{params:{pageSize:itemsPerLoadCity,page:curpageCity}}).then(function(response){
data = response.data;
//data = eval( '(' + data + ')' );
if(data['results']==null || data['results'].length==0) {
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip2').remove();
$('.infinite-scroll-bottom #tab2').html("<div class='noData'><img src='../../images/noData.png'><p>您还没有关注城市</p></div>");
return;
}
totalCountCity = data.totalCount;
// 生成新条目的HTML
var html = '';
$.each(data['results'], function(i){
avgPriceStr = '¥'+this.avgPrice+' 元/㎡';
if(this.avgPrice==null||this.avgPrice==0){
avgPriceStr="暂无数据";
}
html += '<li>'+
'<a href="../quotations/building?cityName='+this.city+'" class="item-link item-content">'+
'<div class="item-inner">'+
'<div class="item-title-row">'+
'<div class="item-title">'+this.city+'</div>'+
'<div class="item-after">'+avgPriceStr+'</div>'+
'</div>'+
'</div>'+
'</a>'+
'</li>' ;
});
// 添加新条目
$('#ulTab2').append(html);
if(totalCountCity<=itemsPerLoadCity){
// 加载完毕,则注销无限加载事件,以防不必要的加载
//$.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip2').remove();
}
}).catch(function(error){
console.log(error)
});
}
//预先加载8条
addEstate(itemsPerLoad, 0);
addCity(itemsPerLoadCity, 0);
//注册'infinite'事件处理函数
$(document).on('infinite', '.infinite-scroll-bottom',function() {
if($("#tab1").hasClass("active"))
{
// 如果正在加载,则退出
if (loading) return;
// 设置flag
loading = true;
// 模拟1s的加载过程
setTimeout(function() {
// 重置加载flag
loading = false;
// 更新最后加载的序号
lastIndex = $('#ulTab1').find('li').length;
if (lastIndex >= totalCount) {
// 加载完毕,则注销无限加载事件,以防不必要的加载
// $.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip1').remove();
return;
}
// 添加新条目
addEstate(itemsPerLoad, $('#ulTab1').find('li').length);
//容器发生改变,如果是js滚动,需要刷新滚动
// $.refreshScroller();
}, 1000);
}
if($("#tab2").hasClass("active"))
{
// 如果正在加载,则退出
if (loading) return;
// 设置flag
loading = true;
// 模拟1s的加载过程
setTimeout(function() {
// 重置加载flag
loading = false;
// 更新最后加载的序号
lastIndexCity = $('#ulTab2').find('li').length;
if (lastIndexCity >= totalCountCity) {
// 加载完毕,则注销无限加载事件,以防不必要的加载
// $.detachInfiniteScroll($('.infinite-scroll'));
// 删除加载提示符
$('#loadTip2').remove();
return;
}
// 添加新条目
addCity(itemsPerLoad, $('#ulTab2').find('li').length);
//容器发生改变,如果是js滚动,需要刷新滚动
// $.refreshScroller();
}, 1000);
}
});
</script>
</body>
</html>