From 8d7f9672e81f2c7e93e4a960359c8395eda9fb22 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期二, 14 五月 2024 17:37:27 +0800
Subject: [PATCH] 1.修复点击折线图后高亮定位点错误问题； 2.新增“分析”按钮点击加载动画

---
 src/views/historymode/HistoryMode.vue |   43 +++++++++++++++++++++++++++++--------------
 1 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/views/historymode/HistoryMode.vue b/src/views/historymode/HistoryMode.vue
index 817a150..1b21f51 100644
--- a/src/views/historymode/HistoryMode.vue
+++ b/src/views/historymode/HistoryMode.vue
@@ -1,10 +1,13 @@
 <template>
   <div class="p-events-none m-t-2">
-    <el-row justify="center">
+    <el-row justify="center" align="middle" class="top-wrap">
       <SearchBar
+        v-show="status == 0"
         :search-time="searchTime"
+        :loading="loading"
         @search="fetchHistroyData"
       ></SearchBar>
+      <TrajectoryState v-show="status != 0" :status="status"></TrajectoryState>
     </el-row>
     <el-row class="m-t-2">
       <FactorRadio
@@ -17,6 +20,14 @@
         class="m-t-2"
         :factor="factorDatas.factor[factorType]"
       ></FactorLegend>
+    </el-row>
+    <el-row class="historical" justify="center">
+      <HistoricalTrajectory
+        :factor-datas="factorDatas"
+        :factor-type="factorType"
+        @change="(e) => (status = e)"
+        @stop="draw"
+      ></HistoricalTrajectory>
     </el-row>
     <TrendAnalysis
       class="trend-analysis"
@@ -70,12 +81,14 @@
       drawMode: 0,
       searchTime: [],
       // 褰撳墠閫変腑楂樹寒鐨勬暟鎹偣绱㈠紩
-      locateIndex: undefined
+      locateIndex: undefined,
+      // 杞ㄨ抗鍔ㄧ敾鐘舵��
+      status: 0
     };
   },
   watch: {
     factorType(nValue, oValue) {
-      if (nValue != oValue) {
+      if (nValue != oValue && this.status == 0) {
         this.draw();
       }
     }
@@ -94,12 +107,7 @@
     },
     // 缁樺埗3D璧拌璺嚎鍥�
     drawRoadMap(e) {
-      //   this.factorMode = factorMode;
-      // this.factorType = factorType;
-      // this.factorName = factorName;
       this.factorDatas.refreshHeight(this.factorType);
-      // this.mapMaker.setFactorType(factorType);
-      // if (!this.mapMaker.runStatus()) {
 
       Layer.drawRoadMap(this.factorDatas, e, this.merge, this.setCenter);
       // }
@@ -108,21 +116,17 @@
       marks.drawMassMarks(this.factorDatas, e, (index) => {
         // 鏌ヨ鑼冨洿鍐呯殑鐩戞祴绔欑偣
         // SceneUtil.searchByCoordinate(lnglat[0], lnglat[1], distance);
-        // 3. 瓒嬪娍鍥捐烦杞畾浣�
-        // const progress = FChart.locate(lineChart.chart, lineChart.option, i, _factor.factorName);
-        // 4. 琛ㄦ牸鏁版嵁璺宠浆瀹氫綅
-        // Table.locate(i);
         this.drawSector(index);
         this.locateIndex = index;
       });
     },
     drawSector(index) {
-      // 1. 缁樺埗鎵囧舰鍖哄煙
+      // 1. 缁樺埗鏂版墖褰㈠尯鍩�
       sector.drawSector(this.factorDatas, index);
       // 2. 缁樺埗瀵硅瘽妗�
       DialogUtil.openNewWindow(this.factorDatas, index, () => {
         // 绉婚櫎鎵囧舰鍖哄煙
-        // clearSector3();
+        sector.clearSector();
       });
     },
     onFetchData(type, data) {
@@ -181,6 +185,10 @@
 };
 </script>
 <style scoped>
+.top-wrap {
+  height: 40px;
+}
+
 .trend-analysis {
   position: absolute;
   left: 0;
@@ -192,4 +200,11 @@
   right: 0;
   top: 0;
 }
+
+.historical {
+  position: absolute;
+  bottom: 10px;
+  left: 0;
+  right: 0;
+}
 </style>

--
Gitblit v1.9.3