From ce59cac766bd4f0fb70555bff1c08875181e03bf Mon Sep 17 00:00:00 2001
From: 黄何裕 <1053952480@qq.com>
Date: 星期一, 22 七月 2024 09:14:42 +0800
Subject: [PATCH] 处理冲突
---
src/views/home/data-chart/index.vue | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/views/home/data-chart/index.vue b/src/views/home/data-chart/index.vue
index 8055cf9..0f0d2b4 100644
--- a/src/views/home/data-chart/index.vue
+++ b/src/views/home/data-chart/index.vue
@@ -27,6 +27,7 @@
<script>
import * as echarts from 'echarts';
let lineChart = null;
+let observer = null;
export default {
name: 'DataChart',
data() {
@@ -52,7 +53,7 @@
},
{
name: 'XX杩愮淮鍏徃3',
- state: { '1鏈�': 1000, '2鏈�': 2131, '3鏈�': 1233, '4鏈�': 2132, '5鏈�': 3211,'6鏈�': 1321 },
+ state: { '1鏈�': 1000, '2鏈�': 2131, '3鏈�': 1233, '4鏈�': 2132, '5鏈�': 3211, '6鏈�': 1321 },
state2: { '1鏈�': 123, '2鏈�': 213, '3鏈�': 123, '4鏈�': 23, '5鏈�': 123 }
},
{
@@ -72,12 +73,12 @@
initChart() {
const option = {
legend: {
- right: '2%',
- top: '5%',
+ right: 'right',
+ top: 'top',
+ orient: "vertical",
icon: 'rect',
data: [
{
-
name: '姝ｅ父鏁�',
itemStyle: {
color: 'rgba(62, 144, 247, 1)'
@@ -136,14 +137,19 @@
}
},
- // 杩囨护
- filterData() {
-
+ // 鐩戝惉鍙樺寲
+ observe() {
+ if (!observer) {
+ observer = new ResizeObserver(entries => {
+ this.handleResize();
+ })
+ }
+ observer.observe(this.$refs.chartContent);
},
// 绐楀彛鍙樻崲
handleResize() {
if (lineChart) {
- lineChart.resize()
+ lineChart.resize();
}
}
@@ -153,10 +159,13 @@
this.company = this.acitveData.name;
lineChart = echarts.init(this.$refs.chartContent);
this.initChart();
- window.addEventListener('resize', this.handleResize)
+ this.observe();
},
beforeDestroy() {
- window.removeEventListener('resize', this.handleResize)
+ if (lineChart) {
+ lineChart.dispose();
+ observer.unobserve(this.$refs.chartContent);
+ }
},
}
</script>
@@ -184,7 +193,6 @@
align-items: center;
z-index: 2;
-
.more-button {
cursor: pointer;
font-size: 16px;
@@ -207,4 +215,4 @@
margin: 0 20px;
width: 180px;
}
-</style>
\ No newline at end of file
+</style>
--
Gitblit v1.8.0