From abd832383e0a6941352215a1b150a6fb0c50e7dc Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 24 十一月 2023 10:18:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 15 ++++++++++++---
1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index 3afb4d8..415865a 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -6,21 +6,30 @@
</div>
<!-- 鏂板瀵硅瘽妗�-->
<el-dialog
- title="鏂板鏁版嵁缁熻鍒嗘瀽"
:visible.sync="addVisible"
append-to-body
+ title="鏂板鏁版嵁缁熻鍒嗘瀽"
>
</el-dialog>
+ <!-- echarts缁勪欢-->
+ <div>
+ <lineChart></lineChart>
+ <pieChart></pieChart>
+ <ColumnarChart></ColumnarChart>
+ </div>
</div>
-
</template>
<script>
import lineChart from "../../components/StatisticsComponent/lineChart"
+import pieChart from "../../components/StatisticsComponent/pieChart"
+import ColumnarChart from "../../components/StatisticsComponent/ColumnarChart"
export default {
components: {
- lineChart
+ lineChart,
+ pieChart,
+ ColumnarChart
},
name: "statisticPage",
data() {
--
Gitblit v1.9.3