From e213e25673421c0ac41713171f9cd5ce90bc221f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 24 十一月 2023 14:35:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/statistic/statisticPage.vue | 37 ++++++++++++++++++++++++++++++++-----
1 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
index 8707be1..415865a 100644
--- a/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
+++ b/Source/UBCS-WEB/src/views/statistic/statisticPage.vue
@@ -1,18 +1,45 @@
<template>
-<lineChart></lineChart>
+ <!-- 鏂板鍙充晶鎸夐挳-->
+ <div>
+ <div style=" display: flex; justify-content: flex-end;">
+ <el-button plain type="primary" @click="addHandler">鏂板</el-button>
+ </div>
+ <!-- 鏂板瀵硅瘽妗�-->
+ <el-dialog
+ :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(){
- return{
-
+ data() {
+ return {
+ addVisible: false,
+ }
+ },
+ methods: {
+ addHandler() {
+ this.addVisible = true;
}
}
}
--
Gitblit v1.9.3