From a7b7b5f1f85bd30b171e17056bf9ae9830fb36cb Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期四, 08 四月 2021 17:22:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 49744bd..3c40d37 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -57,12 +57,12 @@
</template>
<script>
-import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
+// import PublicDetailedList from '@components/BaseNav/PublicBounced/GasComponents/PublicDetailedList'
export default {
name: 'ECharts',
components: {
- PublicDetailedList
+ // PublicDetailedList
},
data () {
return {
@@ -232,6 +232,17 @@
drawChart: function () {
const myChart = this.$echarts.init(this.$refs.main)
myChart.setOption(this.options)
+ window.onresize = function () {
+ var h1 = document.documentElement.clientHeight// 鑾峰彇灞忓箷鐨勯珮搴�
+ if (h1 > 700) {
+ myChart.getDom().style.height = 3 + 'rem'
+ myChart.getDom().style.width = 6 + 'rem'
+ } else {
+ myChart.getDom().style.height = 3 + 'rem'
+ myChart.getDom().style.width = 6 + 'rem'
+ }
+ myChart.resize()
+ }
}
},
mounted () {
@@ -256,6 +267,7 @@
.el-tag {
height: 25px;
+ width: 140px;
line-height: 25px;
margin-right: 10px;
font-size: 10px;
--
Gitblit v1.8.0