diff --git a/fangija-zsyf/js/quotations/cityDetail.js b/fangija-zsyf/js/quotations/cityDetail.js index 466160d..d0de800 100644 --- a/fangija-zsyf/js/quotations/cityDetail.js +++ b/fangija-zsyf/js/quotations/cityDetail.js @@ -641,6 +641,7 @@ function docollectCity(city, type){ }); } +//加载城市报告 function loadCityReport(city){ axios.get('/rest/quotations/loadCityReport',{params:{city:city}}).then(function(response){ if(response.status){ @@ -650,6 +651,7 @@ function loadCityReport(city){ }).catch(function(error){console.log(error)}); } +//城市报告参数校验 function paramCheck(param){ if(typeof(param)=="undefined"||param==null||$.trim(param)==""){ return false @@ -657,7 +659,30 @@ function paramCheck(param){ return true } } - +//城市报告参数过滤 +function paramFilter(param){ + if(typeof(param)=="undefined"||param==null||$.trim(param)==""){ + return "暂无" + }else{ + return param + } +} +//城市报告参数截取 +function paramDivisionHead(param){ + if(paramCheck(param)){ + return param.substring(0,param.indexOf("(")==-1?param.indexOf("("):param.indexOf("(")); + }else{ + return "暂无" + } +} +//城市报告参数截取 +function paramDivisionTail(param){ + if(paramCheck(param)){ + return param.substring(param.indexOf("(")==-1?param.indexOf("("):param.indexOf("(")); + }else{ + return "" + } +} diff --git a/fangija-zsyf/js/user/assetsLevel.js b/fangija-zsyf/js/user/assetsLevel.js index 56556db..ae10c70 100644 --- a/fangija-zsyf/js/user/assetsLevel.js +++ b/fangija-zsyf/js/user/assetsLevel.js @@ -8,13 +8,59 @@ var assetsLevel = new Vue({ } }) -function getAssetsLevelDetail(){ - +//用户资产排名查询请求 +function initAssetsLevelDetail(){ + //清空ui下的li元素 + $('.list-container').children("li").remove(); + axios.get(BASE_PATH + "/rest/userAssetsLevel/list", + { + params: {} + }).then(function (response) { + var resultsMap = response.data.data; + var resultList = resultsMap.userAssetsLevelList; + var userAssetsLevel = resultsMap.userAssetsLevel; + //父页面已经判断处理, 这里不用考虑数据不存在的情况 + if(resultList != null && resultList.length > 0){ + addItems(resultList, userAssetsLevel); + } + //数据加载完成隐藏loading效果 + $('#loading').hide(); + $('#pageContent').show(); + }).catch(function (error) { + console.log(error); + }); +} + +/* 分页构造数据 */ +function addItems(resultList, userAssetsLevel) { + var htmlContent = ""; + //控制个人部分显示 + assetsLevel.level = userAssetsLevel.level; + assetsLevel.name = userAssetsLevel.name; + assetsLevel.assets = userAssetsLevel.assets; + for(var i in resultList) { + var result = resultList[i]; + htmlContent += "
  • "; + htmlContent += "
    "; + if(i == 0){ + htmlContent += "
    "; + }else if(i == 1){ + htmlContent += "
    "; + }else if(i == 2){ + htmlContent += "
    "; + }else{ + htmlContent += Number(i)+1+""; + } + htmlContent += "
    "+result.name+"
    "; + htmlContent += "
    "+result.assets+"万元
    "; + htmlContent += "
  • "; + } + $('.list-container').append(htmlContent); } document.addEventListener('plusready', onPlusReady, false); function onPlusReady(){ //初始化数据 - getAssetsLevelDetail(); -} \ No newline at end of file + initAssetsLevelDetail(); +} diff --git a/fangija-zsyf/views/house/cityDetail.html b/fangija-zsyf/views/house/cityDetail.html index ae9fc02..250556c 100644 --- a/fangija-zsyf/views/house/cityDetail.html +++ b/fangija-zsyf/views/house/cityDetail.html @@ -100,118 +100,6 @@
    -
    -
    城市报告
    -
    - -
    -
    -
    -
      -
    • -
      -
      总人口:{{if(paramCheck(population)){population}else{"暂无"}}}(2017年常住人口)
      -
      -
    • -
    • -
      -
      面积:6340k㎡
      -
      -
    • -
    • -
      -
      发展指数:0.852(极高,2014年)
      -
      -
    • -
    • -
      -
      行政区级别:直辖市
      -
      -
    • -
    -
    -
    -
    -
    -
      -
    • -
      -
      生产总值:30133.86亿元(2017年)
      -
      -
    • -
    • -
      -
      人均生产总值:124536元(2017年)
      -
      -
    • -
    • -
      -
      人均支配收入:58988元(2017年)
      -
      -
    • -
    -
    -
    -
    -
    -
      -
    • -
      -
      著名景点:外滩、豫园、南京路、人民广场、静安寺、新天地、迪士尼乐园等
      -
      -
    • -
    • -
      -
      著名高校:复旦、交大、同济、华东师大等
      -
      -
    • -
    -
    -
    -
    -
    -
      -
    • -
      -
      气候条件:亚热带季风气候
      -
      -
    • -
    • -
      -
      地理位置:长江入海口南岸,东海之滨
      -
      -
    • -
    -
    -
    -
    -
    -
      -
    • -
      -
      机场:上海虹桥国际机场、上海浦东国际机场
      -
      -
    • -
    • -
      -
      火车站:上海站、上海虹桥站、上海南站
      -
      -
    • -
    -
    -
    -
    -
    -
    -
    热门小区
    @@ -288,7 +176,6 @@ function onPlusReady() { loadUpOrDown(city); loadHotDistrict(city) loadCityPricesAndCounts(city) - loadCityReport(city) } diff --git a/fangija-zsyf/views/house/houseDetail.html b/fangija-zsyf/views/house/houseDetail.html index 264d2f2..7705a09 100644 --- a/fangija-zsyf/views/house/houseDetail.html +++ b/fangija-zsyf/views/house/houseDetail.html @@ -238,7 +238,119 @@
    - + +
    +
    城市报告
    +
    + +
    +
    +
    +
      +
    • +
      +
      总人口:{{paramDivisionHead(cityReport.population)}}{{paramDivisionTail(cityReport.population)}}
      +
      +
    • +
    • +
      +
      面积:{{paramFilter(cityReport.area)}}
      +
      +
    • +
    • +
      +
      发展指数:{{paramDivisionHead(cityReport.humanDevelopmentIndex)}}{{paramDivisionTail(cityReport.humanDevelopmentIndex)}}
      +
      +
    • +
    • +
      +
      行政区级别:{{paramFilter(cityReport.administrativeDivision)}}
      +
      +
    • +
    +
    +
    +
    +
    +
      +
    • +
      +
      生产总值:{{paramDivisionHead(cityReport.grp)}}{{paramDivisionTail(cityReport.GRP)}}
      +
      +
    • +
    • +
      +
      人均生产总值:{{paramDivisionHead(cityReport.gnpp)}}{{paramDivisionTail(cityReport.GNPP)}}
      +
      +
    • +
    • +
      +
      人均支配收入:{{paramDivisionHead(cityReport.perCapitaIncome)}}{{paramDivisionTail(cityReport.perCapitaIncome)}}
      +
      +
    • +
    +
    +
    +
    +
    +
      +
    • +
      +
      著名景点:{{paramFilter(cityReport.famousScenery)}}
      +
      +
    • +
    • +
      +
      著名高校:{{paramFilter(cityReport.famousUniversities)}}
      +
      +
    • +
    +
    +
    +
    +
    +
      +
    • +
      +
      气候条件:{{paramFilter(cityReport.weatherConditions)}}
      +
      +
    • +
    • +
      +
      地理位置:{{paramFilter(cityReport.geographicPosition)}}
      +
      +
    • +
    +
    +
    +
    +
    +
      +
    • +
      +
      机场:{{paramFilter(cityReport.airport)}}
      +
      +
    • +
    • +
      +
      火车站:{{paramFilter(cityReport.railwayStation)}}
      +
      +
    • +
    +
    +
    +
    +
    +
    +
    热门小区
    @@ -1245,7 +1357,8 @@ $.config = {router: false} month:month, collecd:false, nears:[], - myCityMap : [] + myCityMap : [], + cityReport:{} } }); @@ -1555,7 +1668,7 @@ function clickCity(val){ loadUpOrDown(city); loadHotDistrict(city) loadCityPricesAndCounts(city) - + loadCityReport(city) $("#trendDiv a").removeClass("active") $("#trendDiv a[v='2']").addClass("active")// 默认走势显示半年 diff --git a/fangija-zsyf/views/user/assetsLevel.html b/fangija-zsyf/views/user/assetsLevel.html index 3ba9095..754be6b 100644 --- a/fangija-zsyf/views/user/assetsLevel.html +++ b/fangija-zsyf/views/user/assetsLevel.html @@ -28,7 +28,7 @@
    -
    +
    @@ -37,11 +37,11 @@ -->

    用户资产排名

    - - -
    + +
    +
    +