优化代码

This commit is contained in:
刘祥超
2021-06-08 15:20:59 +08:00
parent 7a57180ecd
commit 9de66f080d
3 changed files with 180 additions and 220 deletions

View File

@@ -2,22 +2,26 @@ Tea.context(function () {
this.$delay(function () {
let that = this
let systemUnit = this.processMaxUnit(this.systemStats)
let systemAxis = teaweb.countAxis(this.systemStats, function (v) {
return v.count
})
this.reloadChart("system-chart", "操作系统", this.systemStats, function (v) {
return v.system.name
}, function (args) {
return that.systemStats[args.dataIndex].system.name + ": " + teaweb.formatNumber(that.systemStats[args.dataIndex].rawCount)
}, systemUnit)
return that.systemStats[args.dataIndex].system.name + ": " + teaweb.formatNumber(that.systemStats[args.dataIndex].count)
}, systemAxis)
window.addEventListener("resize", function () {
that.resizeChart("system-chart")
})
let browserUnit = this.processMaxUnit(this.browserStats)
let browserAxis = teaweb.countAxis(this.browserStats, function (v) {
return v.count
})
this.reloadChart("browser-chart", "浏览器", this.browserStats, function (v) {
return v.browser.name
}, function (args) {
return that.browserStats[args.dataIndex].browser.name + ": " + teaweb.formatNumber(that.browserStats[args.dataIndex].rawCount)
}, browserUnit)
return that.browserStats[args.dataIndex].browser.name + ": " + teaweb.formatNumber(that.browserStats[args.dataIndex].count)
}, browserAxis)
window.addEventListener("resize", function () {
that.resizeChart("system-chart")
@@ -25,7 +29,7 @@ Tea.context(function () {
})
})
this.reloadChart = function (chartId, name, stats, xFunc, tooltipFunc, unit) {
this.reloadChart = function (chartId, name, stats, xFunc, tooltipFunc, axis) {
let chartBox = document.getElementById(chartId)
if (chartBox == null) {
return
@@ -41,7 +45,7 @@ Tea.context(function () {
yAxis: {
axisLabel: {
formatter: function (value) {
return value + unit
return value + axis.unit
}
}
},
@@ -61,7 +65,7 @@ Tea.context(function () {
name: name,
type: "bar",
data: stats.map(function (v) {
return v.count;
return v.count / axis.divider;
}),
itemStyle: {
color: "#9DD3E8"
@@ -83,29 +87,4 @@ Tea.context(function () {
let chart = echarts.init(chartBox)
chart.resize()
}
this.processMaxUnit = function (stats) {
let max = stats.$map(function (k, v) {
return v.count
}).$max()
let divider = 0
let unit = ""
if (max >= 1000 * 1000 * 1000) {
unit = "B"
divider = 1000 * 1000 * 1000
} else if (max >= 1000 * 1000) {
unit = "M"
divider = 1000 * 1000
} else if (max >= 1000) {
unit = "K"
divider = 1000
}
stats.forEach(function (v) {
v.rawCount = v.count
if (divider > 0) {
v.count /= divider
}
})
return unit
}
})

View File

@@ -5,20 +5,17 @@ Tea.context(function () {
let axis = teaweb.countAxis(this.providerStats, function (v) {
return v.count
})
this.providerStats.forEach(function (v) {
v.count /= axis.divider
})
this.reloadChart("provider-chart", "运营商", this.providerStats, function (v) {
return v.provider.name
}, function (args) {
return that.providerStats[args.dataIndex].provider.name + ": " + teaweb.formatNumber(that.providerStats[args.dataIndex].rawCount)
}, axis.unit)
return that.providerStats[args.dataIndex].provider.name + ": " + teaweb.formatNumber(that.providerStats[args.dataIndex].count)
}, axis)
window.addEventListener("resize", function () {
that.resizeChart("provider-chart")
})
})
this.reloadChart = function (chartId, name, stats, xFunc, tooltipFunc, unit) {
this.reloadChart = function (chartId, name, stats, xFunc, tooltipFunc, axis) {
let chartBox = document.getElementById(chartId)
if (chartBox == null) {
return
@@ -34,7 +31,7 @@ Tea.context(function () {
yAxis: {
axisLabel: {
formatter: function (value) {
return value + unit
return value + axis.unit
}
}
},
@@ -54,7 +51,7 @@ Tea.context(function () {
name: name,
type: "bar",
data: stats.map(function (v) {
return v.count;
return v.count / axis.divider;
}),
itemStyle: {
color: "#9DD3E8"

View File

@@ -2,26 +2,35 @@ Tea.context(function () {
this.$delay(function () {
let that = this
let countryUnit = this.processMaxUnit(this.countryStats)
// 地区
let countryAxis = teaweb.countAxis(this.countryStats, function (v) {
return v.count
})
this.reloadChart("country-chart", "地区", this.countryStats, function (v) {
return v.country.name
}, function (args) {
return that.countryStats[args.dataIndex].country.name + ": " + teaweb.formatNumber(that.countryStats[args.dataIndex].rawCount)
}, countryUnit)
return that.countryStats[args.dataIndex].country.name + ": " + teaweb.formatNumber(that.countryStats[args.dataIndex].count)
}, countryAxis)
let provinceUnit = this.processMaxUnit(this.provinceStats)
// 省份
let provinceAxis = teaweb.countAxis(this.provinceStats, function (v) {
return v.count
})
this.reloadChart("province-chart", "省市", this.provinceStats, function (v) {
return v.province.name
}, function (args) {
return that.provinceStats[args.dataIndex].country.name + ": " + that.provinceStats[args.dataIndex].province.name + " " + teaweb.formatNumber(that.provinceStats[args.dataIndex].rawCount)
}, provinceUnit)
return that.provinceStats[args.dataIndex].country.name + ": " + that.provinceStats[args.dataIndex].province.name + " " + teaweb.formatNumber(that.provinceStats[args.dataIndex].count)
}, provinceAxis)
let cityUnit = this.processMaxUnit(this.cityStats)
// 城市
let cityAxis = teaweb.countAxis(this.cityStats, function (v) {
return v.count
})
this.reloadChart("city-chart", "城市", this.cityStats, function (v) {
return v.city.name
}, function (args) {
return that.cityStats[args.dataIndex].country.name + ": " + that.cityStats[args.dataIndex].province.name + " " + that.cityStats[args.dataIndex].city.name + " " + teaweb.formatNumber(that.cityStats[args.dataIndex].rawCount)
}, cityUnit)
return that.cityStats[args.dataIndex].country.name + ": " + that.cityStats[args.dataIndex].province.name + " " + that.cityStats[args.dataIndex].city.name + " " + teaweb.formatNumber(that.cityStats[args.dataIndex].count)
}, cityAxis)
window.addEventListener("resize", function () {
that.resizeChart("country-chart")
@@ -30,7 +39,7 @@ Tea.context(function () {
})
})
this.reloadChart = function (chartId, name, stats, xFunc, tooltipFunc, unit) {
this.reloadChart = function (chartId, name, stats, xFunc, tooltipFunc, axis) {
let chartBox = document.getElementById(chartId)
if (chartBox == null) {
return
@@ -46,7 +55,7 @@ Tea.context(function () {
yAxis: {
axisLabel: {
formatter: function (value) {
return value + unit
return value + axis.unit
}
}
},
@@ -66,7 +75,7 @@ Tea.context(function () {
name: name,
type: "bar",
data: stats.map(function (v) {
return v.count;
return v.count / axis.divider;
}),
itemStyle: {
color: "#9DD3E8"
@@ -88,29 +97,4 @@ Tea.context(function () {
let chart = echarts.init(chartBox)
chart.resize()
}
this.processMaxUnit = function (stats) {
let max = stats.$map(function (k, v) {
return v.count
}).$max()
let divider = 0
let unit = ""
if (max >= 1000 * 1000 * 1000) {
unit = "B"
divider = 1000 * 1000 * 1000
} else if (max >= 1000 * 1000) {
unit = "M"
divider = 1000 * 1000
} else if (max >= 1000) {
unit = "K"
divider = 1000
}
stats.forEach(function (v) {
v.rawCount = v.count
if (divider > 0) {
v.count /= divider
}
})
return unit
}
})