update
This commit is contained in:
@@ -140,6 +140,8 @@ public class DistrictModel extends BaseModel {
|
||||
private int allPicCount;
|
||||
private List<District> districts;
|
||||
|
||||
private String type;
|
||||
|
||||
public boolean isHousePriceInfo() {
|
||||
return housePriceInfo;
|
||||
}
|
||||
@@ -787,4 +789,12 @@ public class DistrictModel extends BaseModel {
|
||||
public void setDistricts(List<District> districts) {
|
||||
this.districts = districts;
|
||||
}
|
||||
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
|
||||
public void setType(String type) {
|
||||
this.type = type;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||
<#compress>
|
||||
<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
<head>
|
||||
|
||||
<#include "../jsconstants.ftl" />
|
||||
<link href="${staticUrl}/style/fangjia/v6/common.css?v=${version}" rel="stylesheet">
|
||||
<link href="${staticUrl}/style/fangjia/v6/_city_select.css?v=${version}" rel="stylesheet">
|
||||
<link href="${staticUrl}/style/fangjia/v6/trend.css?v=${version}" rel="stylesheet">
|
||||
<script src="${staticUrl}/js/fangjia/v5/jquery-1.7.2.min.js?v=${version}"></script>
|
||||
<link href="${staticUrl}/style/fangjia/v6/seoInfo.css?v=${version}" rel="stylesheet">
|
||||
<script>
|
||||
if((navigator.userAgent.match(/(iPad|iPhone|iPod|Android|ios)/i))){
|
||||
document.write("<link href='${staticUrl}/style/fangjia/v5/city-m.css?v=${version}' rel='stylesheet'>");
|
||||
document.write("<link href='${staticUrl}/style/fangjia/v6/mobile.css?v=${version}' rel='stylesheet'>");
|
||||
}
|
||||
</script>
|
||||
|
||||
<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=0a7eM0lkIvpKGPiq1bMCfeH7"></script>
|
||||
<script type="text/javascript" src="//api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js"></script>
|
||||
|
||||
<script>
|
||||
var cityStr = "${city!}";
|
||||
var regionStr = "${region!}";
|
||||
var districtStr = "${districtName!}";
|
||||
</script>
|
||||
|
||||
</head>
|
||||
|
||||
<body>
|
||||
|
||||
<#include "/header/v6/_header.ftl"/>
|
||||
|
||||
|
||||
<div class="main">
|
||||
<div class="main_left">
|
||||
<div class="overview overview01" style="border-bottom:none;padding-bottom:0;">
|
||||
<div class="overview_left">
|
||||
<div>
|
||||
<p><label>${districtName!}</label></p>
|
||||
<p><i></i> <span style="color:#878682;">${city!} ${region!} ${districtAddress!}</span></p>
|
||||
</div>
|
||||
<div class="price_div">
|
||||
<ul><li>小区均价</li><li><span class="unit_price">56565</span><span class="dw">元/㎡</span></li></ul>
|
||||
<ul><li>环比</li><li><span class="hb_tb">3.6</span><i></i></li></ul>
|
||||
<ul><li>同比</li><li><apan class="hb_tb">12.3</apan><i></i></li></ul>
|
||||
</div>
|
||||
</div>
|
||||
<!--价格走势 -->
|
||||
<#include "../houseReport/district_price.ftl"/>
|
||||
|
||||
<!-- 周边配套 -->
|
||||
<#include "../houseReport/district_around_map2.ftl"/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<#include "/header/v6/_footer.ftl"/>
|
||||
|
||||
<script src="${staticUrl}/js/fangjia/v5/main.js?v=${version}"></script>
|
||||
<script src="${staticUrl}/js/fangjia/v5/index.js?v=${version}"></script>
|
||||
<#--<script src="${staticUrl}/js/fangjia/v5/highcharts5.0.6.js?v=${version}"></script>-->
|
||||
<#--<script src="${staticUrl}/js/highcharts/highstock-1.1.4.js?v=${version}"></script>-->
|
||||
<script src="${staticUrl}/js/highcharts/exporting.js?v=${version}"></script>
|
||||
<script type="text/javascript" src="${staticUrl}/js/fangjiaNew.js?v=${version}"></script>
|
||||
|
||||
<script src="${staticUrl}/js/fangjia/v5/echarts-all.js?v=${version}"></script>
|
||||
<script src="${staticUrl}/js/fangjia/v5/city.js?v=${version}"></script>
|
||||
|
||||
<script type="text/javascript" src="//g.alicdn.com/sj/lib/zepto/zepto.js" charset="utf-8"></script>
|
||||
|
||||
<script type="text/javascript">
|
||||
var chart ;
|
||||
var down_pic_temp = 0;
|
||||
|
||||
|
||||
//走势图
|
||||
<#if districtStatBo?? || regionStatBo??>
|
||||
<#if type??>
|
||||
<#if type == '4' || type == 'quarter'>
|
||||
var url = Constants.cityUrl + '/trend/quarterData?defaultCityName=${cityName}&districtName=${districtName!}®ion=${region!}&block=${block!}&keyword=${keyword!}';
|
||||
<#elseif type == '3' || type == 'half'>
|
||||
var url = Constants.cityUrl + '/trend/halfData?defaultCityName=${cityName}&districtName=${districtName!}®ion=${region!}&block=${block!}&keyword=${keyword!}';
|
||||
<#elseif type == '1' || type == 'year2'>
|
||||
var url = Constants.cityUrl + '/trend/year2Data?defaultCityName=${cityName}&districtName=${districtName!}®ion=${region!}&block=${block!}&keyword=${keyword!}';
|
||||
<#else>
|
||||
var url = Constants.cityUrl + '/trend/yearData?defaultCityName=${cityName}&districtName=${districtName!}®ion=${region!}&block=${block!}&keyword=${keyword!}';
|
||||
</#if>
|
||||
|
||||
<#else>
|
||||
var url = Constants.cityUrl + '/trend/quarterData?defaultCityName=${cityName}&districtName=${districtName!}®ion=${region!}&block=${block!}&keyword=${keyword!}';
|
||||
</#if>
|
||||
$.getJSON(encodeURI(url), function (data) {
|
||||
createChart('container', data, false);
|
||||
});
|
||||
</#if>
|
||||
|
||||
//下载 打印
|
||||
exportButton();
|
||||
$("#exportButton").click(function () {
|
||||
chart.exportChart()
|
||||
});
|
||||
$("#printButton").click(function () {
|
||||
chart.print()
|
||||
});
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
</#compress>
|
||||
@@ -0,0 +1,128 @@
|
||||
<input type="hidden" id="city_map">
|
||||
<input type="hidden" id="lat_map">
|
||||
<input type="hidden" id="lng_map">
|
||||
<input type="hidden" id="address_map">
|
||||
<input type="hidden" id="avgPrice_map">
|
||||
<div class="topic" id="mapDiv">
|
||||
<div class="topic_top"><i></i>小区周边配套<a class="panorama">
|
||||
<#-- <label id="qj">全景</label>-->
|
||||
</a></div>
|
||||
<div class="topic_bottom" style="position:relative;">
|
||||
<div class="districtMap" id="districtMap"></div>
|
||||
<div class="districtBox">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript" src="//api.map.baidu.com/api?v=2.0&ak=0a7eM0lkIvpKGPiq1bMCfeH7"></script>
|
||||
<script type="text/javascript" src="//api.map.baidu.com/library/RichMarker/1.2/src/RichMarker_min.js"></script>
|
||||
<script src="${staticUrl}/js/fangjia/v5/district-map.js"></script>
|
||||
<script>
|
||||
$("#city_map").val(cityStr);
|
||||
$(".topic_top span").text(districtStr);
|
||||
$(".topic_top span").css({"font-size": "18px"});
|
||||
|
||||
var lat = 0;
|
||||
var lng = 0;
|
||||
|
||||
$(document).ready(function(){
|
||||
loadLatAndLng(cityStr, regionStr, districtStr);
|
||||
})
|
||||
/* 配套内容切换 */
|
||||
$(".aroundMenu li").click(function(){
|
||||
var a=$(".aroundMenu li");
|
||||
var x;
|
||||
for(var i=0;i<a.length;i++){
|
||||
if(a[i]==this){
|
||||
x=i;
|
||||
break;
|
||||
}
|
||||
}
|
||||
$(".aroundMenu li").removeClass("current");
|
||||
$(".aroundMenu li").eq(x).addClass("current");
|
||||
$(".aroundBox .around").hide();
|
||||
$(".aroundBox .around").eq(x).show();
|
||||
})
|
||||
|
||||
function loadLatAndLng(cityStr, regionStr, districtStr){
|
||||
|
||||
if (typeof lat2 != "undefined" && lat2) {
|
||||
$("#address_map").val(address2);
|
||||
$("#lat_map").val(lat2);
|
||||
lat = lat2;
|
||||
$("#lng_map").val(lng2);
|
||||
lng = lng2;
|
||||
initMapConfig();
|
||||
mapConfig.init();
|
||||
}else{
|
||||
$.ajax({
|
||||
type: "GET",
|
||||
url:"${cityUrl}/houseReport/loadDistrictLocation",
|
||||
dataType:'json',
|
||||
async: false,
|
||||
data:{
|
||||
cityName: cityStr,
|
||||
region: regionStr,
|
||||
districtName: districtStr
|
||||
},
|
||||
success: function(data) {
|
||||
if(data.address){
|
||||
$("#address_map").val(data.address);
|
||||
}
|
||||
if(data.avg_price){
|
||||
$("#avgPrice_map").val(data.avg_price);
|
||||
}
|
||||
|
||||
if(data.lat){
|
||||
$("#lat_map").val(data.lat);
|
||||
lat = data.lat;
|
||||
}
|
||||
if(data.lng){
|
||||
$("#lng_map").val(data.lng);
|
||||
lng = data.lng;
|
||||
}
|
||||
|
||||
if(lat!=0){
|
||||
initMapConfig();
|
||||
mapConfig.init();
|
||||
}else{
|
||||
$("#mapDiv").hide();
|
||||
}
|
||||
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$(".panorama").click(function(e){
|
||||
var s = $("#qj").text();
|
||||
$("#qj").text("退出全景");
|
||||
if(s == "退出全景"){
|
||||
window.location.reload();
|
||||
}else{
|
||||
var panorama = new BMap.Panorama('districtMap');
|
||||
panorama.setPosition(new BMap.Point(lng, lat));
|
||||
panorama.addEventListener('position_changed', function(e){ // 全景位置改变事件
|
||||
panoramaCallBack(e);
|
||||
});
|
||||
panorama.addEventListener('pov_changed', function(e){ // 全景视角改变事件
|
||||
panoramaCallBack(e);
|
||||
});
|
||||
function panoramaCallBack(e){ // 事件回调函数
|
||||
if (e.type == 'onpov_changed') {
|
||||
document.getElementById('svInfoText').innerHTML="全景视角为:<br/>"+"水平视角:"+panorama.getPov().heading+"<br/>垂直视角:"+panorama.getPov().pitch;
|
||||
}
|
||||
else if (e.type=='onposition_changed') {
|
||||
document.getElementById('svInfoText').innerHTML="全景位置点为:"+panorama.getPosition().lng+","+panorama.getPosition().lat;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
|
||||
</script>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user