From 50d3e8a733b091063aa3cf96aeddc3e13c4a745a Mon Sep 17 00:00:00 2001
From: 懒羊羊 <15939171744@163.com>
Date: 星期一, 22 一月 2024 16:22:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
jcdm-ui/src/views/main/bs/beatSetting/index.vue | 2 +-
jcdm-ui/src/views/dashboard/PanelGroup.vue | 46 ++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 43 insertions(+), 5 deletions(-)
diff --git a/jcdm-ui/src/views/dashboard/PanelGroup.vue b/jcdm-ui/src/views/dashboard/PanelGroup.vue
index f7b6b93..7301305 100644
--- a/jcdm-ui/src/views/dashboard/PanelGroup.vue
+++ b/jcdm-ui/src/views/dashboard/PanelGroup.vue
@@ -1,6 +1,7 @@
<template>
<el-row :gutter="40" class="panel-group">
- <el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
+ <div class="top2">鍗曟棩绱浜ч噺</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" />
@@ -13,7 +14,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('messages')">
<div class="card-panel-icon-wrapper icon-message">
<svg-icon icon-class="message" class-name="card-panel-icon" />
@@ -26,7 +27,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 +40,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 +53,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-row>
+
</template>
<script>
@@ -71,6 +103,12 @@
</script>
<style lang="scss" scoped>
+.top2{
+ font-size: 26px;
+ font-weight: bold;
+ margin-bottom: 16px;
+}
+
.panel-group {
margin-top: 18px;
diff --git a/jcdm-ui/src/views/main/bs/beatSetting/index.vue b/jcdm-ui/src/views/main/bs/beatSetting/index.vue
index 6179c36..ca3770f 100644
--- a/jcdm-ui/src/views/main/bs/beatSetting/index.vue
+++ b/jcdm-ui/src/views/main/bs/beatSetting/index.vue
@@ -78,7 +78,7 @@
</el-table-column>
<el-table-column label="浜у搧鍚嶇О" align="center" prop="productName">
</el-table-column>
- <el-table-column label="鑺傛媿" align="center" prop="beat">
+ <el-table-column label="鑺傛媿(S)" align="center" prop="beat">
</el-table-column>
<el-table-column fixed="right" width="200" label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
<template slot-scope="scope">
--
Gitblit v1.9.3