diff --git a/fangija-zsyf/config.js b/fangija-zsyf/config.js
index 14ed6ac..b7b64f4 100644
--- a/fangija-zsyf/config.js
+++ b/fangija-zsyf/config.js
@@ -1,7 +1,7 @@
/**服务端地址**/
//var BASE_PATH = "http://youfang.fangjia.com";
//var BASE_PATH = "http://192.168.10.128:8084";
-//var BASE_PATH = "http://192.168.10.47:8086";
+var BASE_PATH = "http://192.168.10.47:8086";
//var BASE_PATH = "http://192.168.10.161:8084";
//var BASE_PATH = "http://192.168.10.53:8084";
//var BASE_PATH = "http://192.168.10.161:8084";
diff --git a/fangija-zsyf/css/main.css b/fangija-zsyf/css/main.css
index 93f7615..f853c09 100644
--- a/fangija-zsyf/css/main.css
+++ b/fangija-zsyf/css/main.css
@@ -296,6 +296,7 @@ em.down{color:#88D053;}
.list-block .add{background:none;font-size:0.75rem;color:#F18D00;position:absolute;top:0;right:0;padding:0.5rem 0.75rem;}
.list-block .add01{padding:0 0.5rem;top:1.1rem;right:0.75rem;}
.list-block .add01a{top:inherit;bottom:0.75rem;right:0.75rem;}
+.list-block .delete{width:1.5rem;height:1.55rem;background:url(../images/delete.png) no-repeat center center;background-size:100%;position:absolute;top:-1px;right:0;}
.list-block li.noData{padding:0.75rem;padding-top:1rem;}
.list-block li.noData img{margin:0 auto;}
diff --git a/fangija-zsyf/images/delete.png b/fangija-zsyf/images/delete.png
index a7aba68..d4c2483 100644
Binary files a/fangija-zsyf/images/delete.png and b/fangija-zsyf/images/delete.png differ
diff --git a/fangija-zsyf/js/saleAnalysis/saleAnalysis.js b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js
new file mode 100644
index 0000000..a8ef1ba
--- /dev/null
+++ b/fangija-zsyf/js/saleAnalysis/saleAnalysis.js
@@ -0,0 +1,594 @@
+//房产详情页面传入houseId
+var houseId;
+var disName;
+var disRegion;
+var disCity;
+var _evalDate;
+var totalPricePart;
+
+var houseInfo = new Vue({
+ el: '#houseInfo',
+ data: {
+ name: "",
+ city: "",
+ price: "",
+ liveStatus: "",
+ totalPrice: "",
+ houseRoomNum: "",
+ houseArea: "",
+ floorHeight: "",
+ evalDate: "",
+ roseRanking: "",
+ avgpriceRanking: "",
+ minSellPrice: "",
+ maxSellPrice: "",
+ minAndMaxTotalPrice: "",
+ minAndMaxPrice: "",
+ agencyCount: "",
+ famousAgency: "",
+ otherAgency: "",
+ agencyLevel: "",
+ maxCityAgency: ""
+ }
+})
+
+/* 增长率及收益-打开 */
+$(document).on('click','.open-modal01', function () {
+ $.closeModal('.my-popover01');
+ $('.modal01').show();
+ $('.modal01-overlay').show();
+});
+
+/* 增长率及收益-取消 */
+$(document).on('click','.modal01 .cancel_btn', function () {
+ $('.modal01').hide();
+ $('.modal01-overlay').hide();
+ //清空对于的输入框
+ $("#input_time").val('');
+ $("#input_price").val('');
+});
+
+/* 增长率及收益-关闭 */
+$(document).on('click','.modal01 .close', function () {
+ $('.modal01').hide();
+ $('.modal01-overlay').hide();
+ //清空对于的输入框
+ $("#input_time").val('');
+ $("#input_price").val('');
+});
+
+/* 增长率及收益-确定 */
+$(document).on('click','.modal01 .confirm_btn', function () {
+ var a = $("#input_time").val();
+ var b = $("#input_price").val();
+ //_evalDate 已经是由date转换成long类型了
+ var evalDate = _evalDate;
+ var d = new Date($("#input_time").val()).getTime();
+ var _houseId = houseId;
+ if(a == ""){
+ $.toast("购入时间不能为空");
+ return false;
+ }
+ else if(b == ""){
+ $.toast("购入价格不能为空");
+ return false;
+ }
+ else if(b <= 0){
+ $.toast("购入价格大于0");
+ return false;
+ }
+ else if(d > evalDate){
+ $.toast("购入时间不能大于估价时间");
+ return false;
+ }
+ var days = evalDate - d;
+ var year = parseInt(days / (1000 * 60 * 60 * 24) / 365) + 1;
+ var basePrice = totalPricePart;
+ var up = Number(basePrice) * Math.pow(2, year);
+ var down = Number(basePrice) * Math.pow(2, -year);
+ if(Number($("#input_price").val()) > up || Number($("#input_price").val()) < down){
+ $('.modal01').hide();
+ $.modal({
+ title: '购入价格与实际情况偏差较大,是否继续?',
+ buttons: [
+ {
+ text: '否,修改',
+ onClick: function() {
+ $("#input_price").focus();
+ $('.modal').remove();
+ $('.modal01').show();
+ }
+ },
+ {
+ text: '继续',
+ onClick: function() {
+ axios.post(BASE_PATH + "/rest/saleAnalysis/updateEvaluation",
+ {
+ houseId: houseId,
+ purchaseDate: $("#input_time").val(),
+ purchasePrice: $("#input_price").val()
+ }).then(function (response) {
+ var status = response.data.status;
+ if(status){
+ window.location.reload();
+ }else{
+ $.toast(response.data.message);
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+ }
+ }
+ ]
+ })
+ $(".modal-text").css("text-align","center");
+ } else{
+ axios.post(BASE_PATH + "/rest/saleAnalysis/updateEvaluation",
+ {
+ houseId: houseId,
+ purchaseDate: $("#input_time").val(),
+ purchasePrice: $("#input_price").val()
+ }).then(function (response) {
+ var status = response.data.status;
+ if(status){
+ window.location.reload();
+ }else{
+ $.toast(response.data.message);
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+ }
+});
+
+/* 点击遮罩弹窗隐藏 */
+$(document).on('click','.modal01-overlay', function () {
+ $('.modal01').hide();
+ $('.modal01-overlay').hide();
+});
+
+/* 选择-购入时间 */
+$("#input_time").datetimePicker({
+ toolbarTemplate: ''
+});
+
+/* 说明-交易活跃度 */
+$(document).on('click','.alert-text-title02', function () {
+ $.alert('交易活跃度是根据房产的价值、周边配套、供需关系等情况来衡量,能否在市场中快速交易变现的评级。', '交易活跃度');
+});
+
+
+/**
+ * 请求构造Chart数据
+ * @param {Object} type
+ */
+function loadingChart(type){
+ axios.get(BASE_PATH + "/rest/saleAnalysis/getDistrictPriceZouShi",
+ {
+ params: {
+ id: houseId,
+ type: type
+ }
+ }).then(function (response) {
+ if(response.data.status){
+ var categories = new Array();
+ var series = new Array();
+ var cityObj = new Object();
+ var regionObj = new Object();
+ var districtObj = new Object();
+
+ //城市 地区 小区
+ districtObj.name = disName;
+ regionObj.name = disRegion;
+ cityObj.name = disCity;
+
+ //构造series系列
+ series.push(districtObj);
+ series.push(regionObj);
+ series.push(cityObj);
+
+ //构造数据集
+ var cityDatas = new Array();
+ var regionDatas = new Array();
+ var districtDatas = new Array();
+
+ var m = response.data.data.timeKeys;
+ for(var i = 0; i < m.length; i++){
+ var date_ = new Date(Number(m[i]))
+ categories.push(formatTime_(date_));
+ if(response.data.data.cityAvgZouShi[m[i]] == undefined){
+ cityDatas.push(null);
+ }else {
+ cityDatas.push(response.data.data.cityAvgZouShi[m[i]]);
+ }
+ if (response.data.data.regionAvgZouShi[m[i]] == undefined) {
+ regionDatas.push(null);
+ }else {
+ regionDatas.push(response.data.data.regionAvgZouShi[m[i]]);
+ }
+ if (response.data.data.districtAvgZouShi[m[i]] == undefined){
+ districtDatas.push(null);
+ }else {
+ districtDatas.push(response.data.data.districtAvgZouShi[m[i]]);
+ }
+ }
+ cityObj.data = cityDatas;
+ regionObj.data = regionDatas;
+ districtObj.data = districtDatas;
+ //调用图标方法
+ showAvgPriceChat(categories, series);
+ }else{
+ $.toast(response.data.message);
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+}
+
+/**
+ * 均价走势
+ * @param {Object} categories
+ * @param {Object} series
+ */
+function showAvgPriceChat(categories, series) {
+ 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: '#666'
+ }]
+ },
+ tooltip: {
+ shared: true,
+ valueSuffix: '元/㎡'
+ },
+ legend: {
+ layout: 'horizontal',
+ align: 'center',
+ verticalAlign: 'bottom',
+ y: 0,
+ borderWidth: 0
+ },
+ plotOptions: {
+ line: {
+ connectNulls: true //该设置会连接空值点
+ },
+ series: {
+ events: {
+ legendItemClick: function(e) {
+ return false;
+ }
+ },
+ marker: {
+ //enabled: false 当系类点太多,可以用这个属性去掉图标上面的symbol, 既显示成直线
+ radius: 3, //曲线点半径,默认是4
+ symbol: 'circle' //曲线点类型:"circle", "square", "diamond", "triangle","triangle-down",默认是"circle"
+ }
+ }
+ },
+ series: series,
+ credits: {
+ enabled: false
+ }
+ })
+}
+
+/**
+ * 出售分析页面详情AJAX请求
+ */
+function getAnalysisDetail(){
+ axios.get(BASE_PATH + "/rest/saleAnalysis/analysisDetail",
+ {
+ params: {
+ id: houseId
+ }
+ }).then(function (response) {
+ var resultsMap = response.data.data;
+ var _houseInfo = resultsMap.hInfo;
+ var tags = resultsMap.tags;
+ if(response.data.status){
+ houseInfo.name = _houseInfo.name;
+ if(_houseInfo.liveStatus!=null && _houseInfo.liveStatus.length>0){
+ houseInfo.liveStatus = ""+_houseInfo.liveStatus+"";
+ }else{
+ houseInfo.liveStatus = "其它";
+ }
+ $('#liveStatus').html(houseInfo.liveStatus);
+ houseInfo.totalPrice = (_houseInfo.totalPrice) == 0?"暂无":(parseFloat(_houseInfo.totalPrice)/10000).toFixed(2)+"万";
+ houseInfo.houseRoomNum = _houseInfo.houseRoomNum==""?"暂无":_houseInfo.houseRoomNum;
+ houseInfo.houseArea = _houseInfo.area + "㎡";
+ houseInfo.floorHeight = (_houseInfo.floor == 0 || _houseInfo.height == 0)?"暂无":_houseInfo.floor + "/" + _houseInfo.height + "层";
+ houseInfo.evalDate = _houseInfo.evalDate == null?"暂无":formatTime(_houseInfo.evalDate) + "估值";
+ if(tags!=null && tags.length>0){
+ var tempTag = "";
+ for(var i in tags){
+ tempTag += ""+tags[i]+""
+ }
+ }else{
+ tempTag = "暂无";
+ }
+ $('#moreTag').html(tempTag);
+ //暂无先用riskScore03样式,后期需求有要求在调整
+ if(_houseInfo.totalScore == null){
+ $('#riskScore').addClass('riskScore03');
+ $('#riskScore').html("暂无");
+ }else if(_houseInfo.totalScore>=0 && _houseInfo.totalScore<=26){
+ $('#riskScore').addClass('riskScore01');
+ $('#riskScore').html("很差");
+ }else if(_houseInfo.totalScore>26 && _houseInfo.totalScore<=38){
+ $('#riskScore').addClass('riskScore02');
+ $('#riskScore').html("较差");
+ }else if(_houseInfo.totalScore>38 && _houseInfo.totalScore<=70){
+ $('#riskScore').addClass('riskScore03');
+ $('#riskScore').html("良好");
+ }else if(_houseInfo.totalScore>70 && _houseInfo.totalScore<=100){
+ $('#riskScore').addClass('riskScore04');
+ $('#riskScore').html("很好");
+ }
+ //控制增长率及收益显示/隐藏
+ if(_houseInfo.purchaseDate != null){
+ $('#showRateBox01').hide();
+ $('#showRateBox02').show();
+ //年增长率大于零
+ if(resultsMap.rate > 0 && resultsMap.increment > 0){
+ $('#rateTre').addClass("up");
+ $('#incrementTre').addClass("up");
+ $('#rateValue').html(resultsMap.rate + "%")
+ $('#incrementValue').html(resultsMap.increment + "万");
+ }else if(resultsMap.rate < 0 && resultsMap.increment < 0){
+ $('#rateTre').addClass("down");
+ $('#incrementTre').addClass("down");
+ $('#rateValue').html(resultsMap.rate + "%")
+ $('#incrementValue').html(resultsMap.increment + "万");
+ }else{
+ $('#rateValue').css("color", "#EB5F34");
+ $('#incrementValue').css("color", "#EB5F34");
+ $('#rateValue').html("暂无")
+ $('#incrementValue').html("暂无");
+ }
+ }else{
+ $('#showRateBox01').show();
+ $('#showRateBox02').hide();
+ }
+ //增长率及收益跳转链接是否显示
+ if(resultsMap.ad!=null){
+ $('#showAdBox1').show();
+ $('#showAdBox1Content').html(resultsMap.ad.content + "");
+ //如果link有值,添加调整路径
+ if(resultsMap.ad.link!=null && resultsMap.ad.link.length>0){
+ $("#showAdBox1").click(function(){
+ clicked('../../views/webview_embed.html', true,false,{},{url:resultsMap.ad.link})
+ })
+ }
+ }
+ houseInfo.city = _houseInfo.city;
+ houseInfo.roseRanking = _houseInfo.roseRanking;
+ houseInfo.avgpriceRanking = _houseInfo.avgpriceRanking;
+ houseInfo.price = _houseInfo.price;
+ houseInfo.minSellPrice = _houseInfo.minSellPrice == 0?"暂无": _houseInfo.minSellPrice + "元/㎡";
+ houseInfo.maxSellPrice = _houseInfo.maxSellPrice == 0?"暂无": _houseInfo.maxSellPrice + "元/㎡";
+ $('#roseRankingPercent').css("width", houseInfo.roseRanking+"%");
+ $('#sliderNotePercent').css("left", resultsMap.priceRateContent+"%");
+ $('#curRatePercent').css("width", resultsMap.curRate+"%");
+ //挂牌建议
+ houseInfo.minAndMaxTotalPrice = (resultsMap.minTotalPrice==0 || resultsMap.maxTotalPrice==0)?"暂无":(parseFloat(resultsMap.minTotalPrice)/10000).toFixed(2)+"万"+" - "+(parseFloat(resultsMap.maxTotalPrice)/10000).toFixed(2)+"万";
+ houseInfo.minAndMaxPrice = (resultsMap.minPrice==0 || resultsMap.maxPrice==0)?"暂无":(parseFloat(resultsMap.minPrice)/10000).toFixed(2)+"万/㎡"+" - "+(parseFloat(resultsMap.maxPrice)/10000).toFixed(2)+"万/㎡";
+ //挂牌建议跳转链接是否显示
+ if(resultsMap.ad1!=null){
+ $('#showAdBox2').show();
+ $('#showAdBox2Content').html(resultsMap.ad1.content + "");
+ //如果link有值,添加调整路径
+ if(resultsMap.ad1.link!=null && resultsMap.ad1.link.length>0){
+ $("#showAdBox2").click(function(){
+ clicked('../../views/webview_embed.html', true,false,{},{url:resultsMap.ad1.link})
+ })
+ }
+ }
+ houseInfo.agencyCount = resultsMap.agencyCount;
+ houseInfo.famousAgency = resultsMap.famousAgency;
+ houseInfo.otherAgency = resultsMap.otherAgency;
+ houseInfo.agencyLevel = resultsMap.agencyLevel;
+ houseInfo.maxCityAgency = resultsMap.maxCityAgency;
+ $('#agencyLevelPercent').css("width", resultsMap.agencyLevel+"%");
+
+ //全局变量赋值
+ _evalDate = _houseInfo.evalDate;
+ totalPricePart = resultsMap.totalPricePart1;
+
+ //调用构造数据方法
+ addItemsGuaPai(resultsMap);
+ addItemsChengJiao(resultsMap);
+ }else{
+ $.toast(response.data.message);
+ }
+ }).catch(function (error) {
+ console.log(error);
+ });
+}
+
+/**
+ * 构造挂牌参考数据
+ * @param {Object} resultsMap
+ */
+function addItemsGuaPai(resultsMap){
+ if((resultsMap.disHouses!=null && resultsMap.disHouses.length>0) || (resultsMap.houses!=null && resultsMap.houses.length>0)){
+ var htmlGuaPai = "";
+ htmlGuaPai += '
';
+ if(resultsMap.houses!=null && resultsMap.houses.length>0){
+ htmlGuaPai += '
';
+ }
+ if(resultsMap.disHouses!=null && resultsMap.disHouses.length>0){
+ if(resultsMap.houses!=null && resultsMap.houses.length>0){
+ htmlGuaPai += '
';
+ $('#showTopic1').html(htmlGuaPai);
+ $('#showTopic1').show();
+ }
+}
+
+/**
+ * 构造成交情况数据
+ * @param {Object} resultsMap
+ */
+function addItemsChengJiao(resultsMap){
+ if((resultsMap.disSellHouses!=null && resultsMap.disSellHouses.length>0) || (resultsMap.sells!=null && resultsMap.sells.length>0)){
+ var htmlChengJiao = "";
+ htmlChengJiao += '
成交情况';
+ htmlChengJiao += '
';
+ if(resultsMap.sells!=null && resultsMap.sells.length>0){
+ htmlChengJiao += '
';
+ }
+ if(resultsMap.disSellHouses!=null && resultsMap.disSellHouses.length>0){
+ if(resultsMap.sells!=null && resultsMap.sells.length>0){
+ htmlGuaPai += '
';
+ $('#showTopic2').html(htmlChengJiao);
+ $('#showTopic2').show();
+ }
+}
+
+//按照时间范围加载数据
+$(".avgPriceTrend a").click(function(){
+ var type = $(this).attr("data-id");
+ $(".avgPriceTrend a").removeClass("active")
+ $(this).addClass('active');
+ loadingChart(type);
+});
+
+//时间格式方法
+function formatTime(_time){
+ var _now = new Date(_time);
+ var _year = _now.getFullYear();
+ var _month = _now.getMonth()+1;
+ var _date = _now.getDate();
+ return _year + "/" + _month + "/" + _date;
+}
+
+//时间格式方法
+function formatTime_(_time){
+ var _now = new Date(_time);
+ var _year = _now.getFullYear();
+ var _month = _now.getMonth()+1;
+ var _date = _now.getDate();
+ return _year + "-" + _month + "-" + _date;
+}
+
+document.addEventListener('plusready', onPlusReady, false);
+
+function onPlusReady(){
+ var self = plus.webview.currentWebview();
+ houseId = self.houseId;
+ disName = self.name;
+ disRegion = self.region;
+ disCity = self.city;
+ //初始化数据
+ getAnalysisDetail();
+ //初始化图表
+ loadingChart($(".avgPriceTrend").find("a.active").attr("data-id"));
+}
\ No newline at end of file
diff --git a/fangija-zsyf/views/house/detail.html b/fangija-zsyf/views/house/detail.html
index 414172d..a2ecc08 100644
--- a/fangija-zsyf/views/house/detail.html
+++ b/fangija-zsyf/views/house/detail.html
@@ -631,7 +631,7 @@ function gotoRentManager(){
//出售分析
function gotoSaleAnalysis(){
- clicked('/views/saleAnalysis/saleAnalysis.html',true,false,{},{houseId: houseId},function(){})
+ clicked('/views/saleAnalysis/saleAnalysis.html',true,false,{},{houseId: houseId, city: oriCity, region: oriRegion, name: oriName},function(){})
}
function gotoChangeHouse(){
diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html
index 57bbbe0..311a16c 100644
--- a/fangija-zsyf/views/house/houseDetail.html
+++ b/fangija-zsyf/views/house/houseDetail.html
@@ -34,6 +34,9 @@
+
房产行情
@@ -1211,11 +1214,17 @@ $.config = {router: false}
-
+
+
-