From 8adcecc06caa279e6dba258406cd48109b47884e Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期二, 23 一月 2024 10:56:58 +0800
Subject: [PATCH] 首页提交代码
---
jcdm-ui/src/views/dashboard/PieChart.vue | 2 +-
jcdm-ui/src/views/index.vue | 16 ++++++++++++++--
jcdm-ui/src/views/dashboard/PanelGroup.vue | 35 +++++++++++++++++++++++++----------
3 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/jcdm-ui/src/views/dashboard/PanelGroup.vue b/jcdm-ui/src/views/dashboard/PanelGroup.vue
index 7301305..29156b6 100644
--- a/jcdm-ui/src/views/dashboard/PanelGroup.vue
+++ b/jcdm-ui/src/views/dashboard/PanelGroup.vue
@@ -1,6 +1,10 @@
<template>
<el-row :gutter="40" class="panel-group">
- <div class="top2">鍗曟棩绱浜ч噺</div>
+ <el-card class="bottom-card">
+ <div slot="header" class="clearfix">
+ <span class="top2">鍗曟棩绱浜ч噺</span>
+ </div>
+
<el-col :xs="12" :sm="12" :lg="4" class="card-panel-col">
<div class="card-panel" @click="handleSetLineChartData('newVisitis')">
<div class="card-panel-icon-wrapper icon-people">
@@ -10,7 +14,7 @@
<div class="card-panel-text">
鍚堢涓婄嚎
</div>
- <count-to :start-val="0" :end-val="102400" :duration="2600" class="card-panel-num" />
+ <count-to :start-val="0" :end-val="10200" :duration="2600" class="card-panel-num" />
</div>
</div>
</el-col>
@@ -82,7 +86,7 @@
</div>
</el-col>
-
+ </el-card>
</el-row>
</template>
@@ -103,15 +107,25 @@
</script>
<style lang="scss" scoped>
+.bottom-card{
+ padding: 15px 20px 20px 20px;
+ height: auto;
+ width: 1272px;
+ margin-left: 20px;
+ justify-content: center;
+ column-width: max-content;
+}
+
.top2{
- font-size: 26px;
+ font-size: 18px;
font-weight: bold;
- margin-bottom: 16px;
+ margin-bottom: 0px;
}
.panel-group {
- margin-top: 18px;
+ width: 1272px;
+ margin-left: 20px;
.card-panel-col {
margin-bottom: 32px;
}
@@ -183,16 +197,17 @@
font-weight: bold;
margin: 26px;
margin-left: 0px;
+ padding: 20px 20px;
.card-panel-text {
- line-height: 18px;
+ line-height: 14px;
color: rgba(0, 0, 0, 0.45);
- font-size: 16px;
- margin-bottom: 12px;
+ font-size: 12px;
+ margin-bottom: 9px;
}
.card-panel-num {
- font-size: 20px;
+ font-size: 18px;
}
}
}
diff --git a/jcdm-ui/src/views/dashboard/PieChart.vue b/jcdm-ui/src/views/dashboard/PieChart.vue
index 167711d..b831efc 100644
--- a/jcdm-ui/src/views/dashboard/PieChart.vue
+++ b/jcdm-ui/src/views/dashboard/PieChart.vue
@@ -20,7 +20,7 @@
},
height: {
type: String,
- default: '300px'
+ default: '350px'
}
},
data() {
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