diff --git a/dist.zip b/dist.zip index 9f2d597..8f595d9 100644 Binary files a/dist.zip and b/dist.zip differ diff --git a/src/views/energySources/component/equipmentStatus.vue b/src/views/energySources/component/equipmentStatus.vue index ee671a0..7ca9e75 100644 --- a/src/views/energySources/component/equipmentStatus.vue +++ b/src/views/energySources/component/equipmentStatus.vue @@ -85,7 +85,6 @@ export default { let seriesArr = [] for (let i = 0; i < maxLengthArr.length; i++) { - // for (let i = 0; i < source[0].length; i++) { let arr = [] source.forEach(e => { arr.push(e[i]) @@ -100,7 +99,6 @@ export default { let y = this.$moment().format('yyyy-MM-DD') let value = m ? this.$moment(`${y} ${m ? m.time : null}`).valueOf() : '' return { - // value: this.$moment(`${y} ${m ? m.time : null}`).valueOf(), value, itemStyle: { normal: { diff --git a/src/views/energySourcesProvince/component/pathMap.vue b/src/views/energySourcesProvince/component/pathMap.vue index c4c6033..fac6485 100644 --- a/src/views/energySourcesProvince/component/pathMap.vue +++ b/src/views/energySourcesProvince/component/pathMap.vue @@ -101,7 +101,6 @@ export default { getData() { getEnterprisePower({ today: this.$moment().format('yyyy-MM-DD') }).then(res => { let data = res.data.data - console.log(data, '.....') this.markList.forEach(e => { data.forEach(r => { if (e.name.includes(r.name)) { diff --git a/src/views/energySourcesProvince/component/togetherPercent.vue b/src/views/energySourcesProvince/component/togetherPercent.vue index 1d95935..09cf392 100644 --- a/src/views/energySourcesProvince/component/togetherPercent.vue +++ b/src/views/energySourcesProvince/component/togetherPercent.vue @@ -67,12 +67,13 @@ export default { fontSize: 14 }, itemWidth: 6, - itemHeight: 6 + itemHeight: 6, + selectedMode: false }, grid: { // top: "10%", left: "0", - right: "0", + right: "-40", bottom: "0", containLabel: true, }, @@ -158,9 +159,10 @@ export default { { type: 'value', show: false, - axisLabel: { - formatter: '{value}%' - }, + // axisLabel: { + // formatter: '{value}%' + // }, + gridIndex: 0, splitLine: { show: false }, diff --git a/src/views/energySourcesProvince/index.vue b/src/views/energySourcesProvince/index.vue index 5f88e33..35bf8ba 100644 --- a/src/views/energySourcesProvince/index.vue +++ b/src/views/energySourcesProvince/index.vue @@ -53,7 +53,6 @@ export default { setRemPc(); window.addEventListener('resize', setRemPc);//浏览器窗口大小改变时调用rem换算方法 }) - this.getData() }, destroyed() { document.getElementsByTagName('html')[0].style.fontSize = 'unset';