From eb64c3ede631f9f1ec49260db5190027fa08fb31 Mon Sep 17 00:00:00 2001
From: jiang <1354748262@qq.com>
Date: 星期二, 23 一月 2024 10:57:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/dashboard/PanelGroup.vue | 75 ++++++++++++++++++++++++++++++++-----
1 files changed, 64 insertions(+), 11 deletions(-)
diff --git a/jcdm-ui/src/views/dashboard/PanelGroup.vue b/jcdm-ui/src/views/dashboard/PanelGroup.vue
index f7b6b93..29156b6 100644
--- a/jcdm-ui/src/views/dashboard/PanelGroup.vue
+++ b/jcdm-ui/src/views/dashboard/PanelGroup.vue
@@ -1,6 +1,11 @@
<template>
<el-row :gutter="40" class="panel-group">
- <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+ <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">
<svg-icon icon-class="peoples" class-name="card-panel-icon" />
@@ -9,11 +14,11 @@
<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>
- <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+ <el-col :xs="12" :sm="12" :lg="4" class="card-panel-col">
<div class="card-panel" @click="handleSetLineChartData('messages')">
<div class="card-panel-icon-wrapper icon-message">
<svg-icon icon-class="message" class-name="card-panel-icon" />
@@ -26,7 +31,7 @@
</div>
</div>
</el-col>
- <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+ <el-col :xs="12" :sm="12" :lg="4" class="card-panel-col">
<div class="card-panel" @click="handleSetLineChartData('purchases')">
<div class="card-panel-icon-wrapper icon-money">
<svg-icon icon-class="money" class-name="card-panel-icon" />
@@ -39,7 +44,7 @@
</div>
</div>
</el-col>
- <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+ <el-col :xs="12" :sm="12" :lg="4" class="card-panel-col">
<div class="card-panel" @click="handleSetLineChartData('shoppings')">
<div class="card-panel-icon-wrapper icon-shopping">
<svg-icon icon-class="shopping" class-name="card-panel-icon" />
@@ -52,7 +57,38 @@
</div>
</div>
</el-col>
+
+ <el-col :xs="12" :sm="12" :lg="4" class="card-panel-col">
+ <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+ <div class="card-panel-icon-wrapper icon-shopping">
+ <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+ </div>
+ <div class="card-panel-description">
+ <div class="card-panel-text">
+ CVT涓婄嚎
+ </div>
+ <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+ </div>
+ </div>
+ </el-col>
+
+ <el-col :xs="12" :sm="12" :lg="4" class="card-panel-col">
+ <div class="card-panel" @click="handleSetLineChartData('shoppings')">
+ <div class="card-panel-icon-wrapper icon-shopping">
+ <svg-icon icon-class="shopping" class-name="card-panel-icon" />
+ </div>
+ <div class="card-panel-description">
+ <div class="card-panel-text">
+ CVT涓嬬嚎
+ </div>
+ <count-to :start-val="0" :end-val="13600" :duration="3600" class="card-panel-num" />
+ </div>
+ </div>
+ </el-col>
+
+ </el-card>
</el-row>
+
</template>
<script>
@@ -71,9 +107,25 @@
</script>
<style lang="scss" scoped>
-.panel-group {
- margin-top: 18px;
+.bottom-card{
+ padding: 15px 20px 20px 20px;
+ height: auto;
+ width: 1272px;
+ margin-left: 20px;
+ justify-content: center;
+ column-width: max-content;
+}
+.top2{
+ font-size: 18px;
+ font-weight: bold;
+ margin-bottom: 0px;
+}
+
+.panel-group {
+
+ width: 1272px;
+ margin-left: 20px;
.card-panel-col {
margin-bottom: 32px;
}
@@ -145,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;
}
}
}
--
Gitblit v1.9.3