diff --git a/dist.zip b/dist.zip index 615a372..fc833cb 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/views/energySources/component/load.vue b/src/views/energySources/component/load.vue index 00f0f56..3621fdd 100644 --- a/src/views/energySources/component/load.vue +++ b/src/views/energySources/component/load.vue @@ -142,20 +142,20 @@ export default { console.log('res1 ====>', res) let data = res.data.data - let xAxisArr = Object.keys(data) - xAxisArr.sort() + let xAxisArr = Object.keys(data).sort() + let seriesJson = { jian: [], feng: [], ping: [], gu: [], } - for (let k in data) { - seriesJson.jian.push(data[k].jian) - seriesJson.feng.push(data[k].feng) - seriesJson.ping.push(data[k].ping) - seriesJson.gu.push(data[k].gu) - } + xAxisArr.map(r => { + seriesJson.jian.push(data[r].jian) + seriesJson.feng.push(data[r].feng) + seriesJson.ping.push(data[r].ping) + seriesJson.gu.push(data[r].gu) + }) if (t) { this.xAxisArr = xAxisArr this.seriesJson = seriesJson