Merge branch 'new_fjw' into 'master'

update

See merge request !1050
This commit is contained in:
2024-12-20 11:50:02 +08:00
4 changed files with 286 additions and 0 deletions
@@ -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!}&region=${region!}&block=${block!}&keyword=${keyword!}';
<#elseif type == '3' || type == 'half'>
var url = Constants.cityUrl + '/trend/halfData?defaultCityName=${cityName}&districtName=${districtName!}&region=${region!}&block=${block!}&keyword=${keyword!}';
<#elseif type == '1' || type == 'year2'>
var url = Constants.cityUrl + '/trend/year2Data?defaultCityName=${cityName}&districtName=${districtName!}&region=${region!}&block=${block!}&keyword=${keyword!}';
<#else>
var url = Constants.cityUrl + '/trend/yearData?defaultCityName=${cityName}&districtName=${districtName!}&region=${region!}&block=${block!}&keyword=${keyword!}';
</#if>
<#else>
var url = Constants.cityUrl + '/trend/quarterData?defaultCityName=${cityName}&districtName=${districtName!}&region=${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>
@@ -0,0 +1,37 @@
@charset "utf-8";
/* CSS Document */
.main { width: 1200px;margin: auto; margin-top: 100px;overflow: hidden;position: relative;}
.main_left {margin: auto;}
.topic {padding: 40px 0;border-bottom: solid 1px #e5e5e5;}
.topic_top {font-size: 18px;margin-bottom: 20px;align-items: center;display: flex;float: left;}
.topic_top i {width: 30px;height: 36px;display: inline-flex;background: url(../../../images/fangjia/v6/4-2-13.png) no-repeat left bottom;margin-left: -10px;}
.overview01 .overview_left{margin-bottom: 80px;}
.overview01 .overview_left p { margin-bottom: 10px;width: 100%; text-align: justify;font-size: 20px;line-height: 30px;}
.overview01 .overview_left p label {color: #3c3f46;font-size: 24px;font-weight: 500;}
.overview01 .overview_left p i {width: 11px;height: 30px;background: url(../../../images/fangjia/v6/address.png) no-repeat center center;float: left;margin-right: 5px;}
.overview01 .overview_left p{font-size: 16px;}
.price_div{display: flex;float: left;flex-direction: row;justify-content: flex-start;width: 1200px; margin: auto auto; padding-bottom: 10px;}
.price_div ul{width:25%;}
.price_div ul li{color: #878682;}
.price_div ul li .unit_price{color: #db4c3f;font-size: 32px;font-weight: bold;line-height: 50px;}
.price_div ul li .dw{color: #db4c3f;font-size: 16px;}
.price_div ul li .up{ color: #db4c3f;}
.price_div ul li .down{color:#00ae66;}
.price_div ul li .hb_tb{font-size: 22px;line-height: 50px;}
.price_div ul li .down i {background: url(../../../images/fangjia/v6/down.png) no-repeat left center;}
.price_div ul li .up i {background: url(../../../images/fangjia/v6/up.png) no-repeat left center;}
.districtMap{width:100%;height:400px;}
/* 地图样式 */
.mark-icon-box .mark-icon {width: 20px;height: 30px;display: block;cursor: pointer;font-size: 14px;color: #fff;font-weight: bold;text-align: center;line-height: 24px;background: url(../../../images/fangjia/v5/dw.png) no-repeat;}
.mark-icon-box { width: 24px; height: 30px; position: absolute; z-index: 98; }
.mark-icon-box .mark-icon:hover, .mark-icon-box .mark-icon-h { background: url(../../../images/fangjia/v5/dw_h.png) no-repeat ; }
.mark-tip {font-size: 14px;position: absolute;z-index: 99;margin-top: -74px;margin-left: -20px;}
.mark-tip .title1 {line-height: 20px;color: #000;background: #fff;padding: 5px 40px 5px 15px;border-radius: 5px;box-shadow: 3px 3px 8px #888;height: 20px;}
.mark-tip .title1 span {display: inline-block;max-width: 170px;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin-right: 25px;}
.mark-tip .title1 b { font-weight: normal; display: block; position: absolute; top: 5px; right: 10px; }
.mark-tip .icon { width: 21px; height:14px; background: url(../../../images/fangjia/v5/sj.png) no-repeat ; position: absolute; bottom: -14px; left: 20px; }