|
@@ -296,7 +296,7 @@ var vm = new Vue({
|
|
|
notOneAreaCityFilter () {
|
|
|
var area = this.reportFilters.area
|
|
|
if (!this.notOneAreaFilter) {
|
|
|
- var showCity = area && (area[Object.keys(area)].length >=2)
|
|
|
+ var showCity = area && (area[Object.keys(area)].length >=2 || area[Object.keys(area)].length === 0)
|
|
|
return showCity
|
|
|
} else {
|
|
|
return this.notOneAreaFilter
|
|
@@ -399,6 +399,11 @@ var vm = new Vue({
|
|
|
const areaSort = this.sections.areaScatter.sortType === 0 ? 'total' : 'amount'
|
|
|
this.sections.areaScatter.setCityList = this.formatterWinData(item.areaDetails, areaSort)
|
|
|
this.sections.areaScatter.setCityList = this.sections.areaScatter.setCityList.sort((a, b) => b[areaSort] - a[areaSort])
|
|
|
+ if(this.sections.areaScatter.setCityList.length > 5) {
|
|
|
+ this.sections.areaScatter.showAreaCityListBtn = true
|
|
|
+ } else {
|
|
|
+ this.sections.areaScatter.showAreaCityListBtn = false
|
|
|
+ }
|
|
|
}
|
|
|
})
|
|
|
}
|
|
@@ -1381,8 +1386,15 @@ var vm = new Vue({
|
|
|
},
|
|
|
// 城市分布
|
|
|
sortAreaCityScatter (areacitylist) {
|
|
|
- const result = areacitylist.reduce((max, item) => {
|
|
|
- return item.total > max.total ? item : max
|
|
|
+ const list = areacitylist
|
|
|
+ const ZXS = ['北京', '天津', '上海', '重庆', '台湾', '澳门', '香港']
|
|
|
+ const result = list.reduce((max, item) => {
|
|
|
+ const isTianjinIncluded = ZXS.includes(item.area)
|
|
|
+ if(!isTianjinIncluded) {
|
|
|
+ return item.total > max.total ? item : max
|
|
|
+ } else {
|
|
|
+ return max
|
|
|
+ }
|
|
|
})
|
|
|
if (result.areaDetails.length > 5) {
|
|
|
this.sections.areaScatter.showAreaCityListBtn = true
|