From c80c6b24a0d76321780d71c2d4249f5144693096 Mon Sep 17 00:00:00 2001
From: yyt <306727702@qq.com>
Date: 星期二, 23 一月 2024 11:16:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/index.vue | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/jcdm-ui/src/views/index.vue b/jcdm-ui/src/views/index.vue
index fc6881d..37ff1f2 100644
--- a/jcdm-ui/src/views/index.vue
+++ b/jcdm-ui/src/views/index.vue
@@ -5,10 +5,16 @@
<el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
<el-col :xs="24" :sm="12">
- <pie-chart />
+ <el-card>
+ <pie-chart />
+ </el-card>
</el-col>
+
<el-col :xs="24" :sm="12">
- <line-chart :chart-data="lineChartData" />
+ <el-card>
+ <line-chart :chart-data="lineChartData" />
+ </el-card>
+
</el-col>
</el-row>
@@ -19,6 +25,7 @@
import PanelGroup from './dashboard/PanelGroup'
import LineChart from './dashboard/LineChart'
import PieChart from './dashboard/PieChart'
+import pieChart from "@/views/dashboard/PieChart.vue";
const lineChartData = {
newVisitis: {
@@ -41,6 +48,11 @@
export default {
name: 'Index',
+ computed: {
+ pieChart() {
+ return pieChart
+ }
+ },
components: {
PanelGroup,
LineChart,
--
Gitblit v1.9.3