From cc52e21c310fc2dba49c24d7ed985b0aed1bb489 Mon Sep 17 00:00:00 2001
From: VVT789 <sdxt_0802@163.com>
Date: 星期一, 17 二月 2025 23:26:55 +0800
Subject: [PATCH] Merge branch 'master' into wt_from_develop1.0

---
 zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue b/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue
index 1f64bec..2686774 100644
--- a/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue
+++ b/zhitan-vue/src/views/dataMonitoring/historyDataTrend/index.vue
@@ -52,7 +52,7 @@
               </div>
             </div>
             <div class="chart-box" v-loading="loading" v-show="activeKey === 1">
-              <LineChart ref="LineChartRef" :chartData="lineChartData" />
+              <LineChart ref="LineChartRef" :chartData="lineChartData" :chartType="'bar'" />
             </div>
             <div style="margin-top: 16px" v-show="activeKey === 2">
               <div class="" style="padding: 0 16px">

--
Gitblit v1.9.3