From 42f42dc88214f283b43c422f37e10ab45c5c5578 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期三, 12 三月 2025 17:32:13 +0800
Subject: [PATCH] 1. 新增绘图模式的切换 2. 新增行政区划的切换展示

---
 src/components/chart/ProgressLineChart.vue |   31 ++++++++++++++++++-------------
 1 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/chart/ProgressLineChart.vue b/src/components/chart/ProgressLineChart.vue
index 7a40cc0..482740d 100644
--- a/src/components/chart/ProgressLineChart.vue
+++ b/src/components/chart/ProgressLineChart.vue
@@ -67,13 +67,6 @@
     },
     locateIndex(nV, oV) {
       if (nV == oV) return;
-      // 1. 瀹氫綅鐐瑰簲璇ュ睍绀哄湪瓒嬪娍鍥句腑闂达紝鍥犳瀹氫綅鐧惧垎姣斿線鍓嶅亸绉诲綋鍓峗size鐨勪竴鍗�
-      let i = nV - parseInt(this.pageSize / 2);
-      // 2. 纭繚绱㈠紩涓嶄細瓒呭嚭鑼冨洿
-      i = i < 0 ? 0 : i;
-      // 3. 鑾峰彇绱㈠紩瀵瑰簲鐨勮繘搴︾櫨鍒嗘瘮
-      this.progress = (i / (this.allXAxis.length - this.pageSize)) * 100;
-
       for (const iterator of this.allSeries) {
         // if (iterator.name == factorName || (iterator.name == 'TVOC' || factorName == 'VOC')) {
         iterator.markLine = {
@@ -92,7 +85,21 @@
           ]
         };
       }
-      this.changeChartRange();
+      // 璁$畻瓒呭嚭鍗曢〉鏁版嵁閲忕殑闀垮害
+      let len = this.allXAxis.length - this.pageSize;
+      len = len < 0 ? 0 : len;
+      // 瀹氫綅鐐瑰簲璇ュ睍绀哄湪瓒嬪娍鍥句腑闂达紝鍥犳瀹氫綅鐧惧垎姣斿線鍓嶅亸绉诲綋鍓峗size鐨勪竴鍗�
+      let i = nV - parseInt(this.pageSize / 2);
+      // 纭繚绱㈠紩涓嶄細瓒呭嚭鑼冨洿
+      i = i < 0 ? 0 : i;
+      i = i > len ? len : i;
+      // 鑾峰彇绱㈠紩瀵瑰簲鐨勮繘搴︾櫨鍒嗘瘮
+      const _progress = len == 0 ? 0 : (i / len) * 100;
+      if (this.progress != _progress) {
+        this.progress = _progress;
+      } else {
+        this.changeChartRange();
+      }
     }
   },
   methods: {
@@ -121,7 +128,8 @@
     },
     // 淇敼鍥捐〃灞曠ず鐨勬姌绾垮浘绫诲瀷
     changeChartSeries() {
-      this.option.series = this.getShowSeries();
+      const { sIndex, eIndex, startPer, endPer } = this.getRange();
+      this.option.series = this.getShowSeries(sIndex, eIndex);
       this.lineChart.setOption(this.option, { notMerge: true });
     },
     changeChartRange() {
@@ -143,9 +151,7 @@
     },
     getShowSeries(sIndex, eIndex) {
       this.allSeries.forEach((s) => {
-        if (sIndex && eIndex) {
-          s.data = s.allData.slice(sIndex, eIndex);
-        }
+        s.data = s.allData.slice(sIndex, eIndex);
       });
       const res = this.allSeries.filter((s) => {
         return this.selectFactorType.includes(s.key);
@@ -169,7 +175,6 @@
   mounted() {
     this.lineChart = echarts.init(this.$refs.lineChart);
     this.lineChart.on('click', (e) => {
-      console.log(e);
       this.$emit('chartClick', this.sIndex + e.dataIndex);
     });
   }

--
Gitblit v1.9.3