From 935e93f556fa680f6bdfd2d7cf6905361bbaefdb Mon Sep 17 00:00:00 2001
From: WXL <1785969728@qq.com>
Date: 星期二, 01 四月 2025 10:09:13 +0800
Subject: [PATCH] 测试完成
---
src/views/index.vue | 93 ++++++++++++++++++++++++----------------------
1 files changed, 49 insertions(+), 44 deletions(-)
diff --git a/src/views/index.vue b/src/views/index.vue
index d9d13e1..fdb6d9e 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -6,18 +6,18 @@
<el-col :span="11">
<!-- 灏辫瘖缁熻鐩掑瓙 -->
<div class="grid-content bg-purple headerBox bgc1">
- <!-- <div class="title">
- 鎮ｈ�呯粺璁�<span
+ <div class="title">
+ 闂ㄨ瘖鏈嶅姟<span
style="
font-size: 25px;
font-weight: 600;
text-shadow: 2px 4px 7px rgb(85 132 255 / 50%);
color: black;
"
- >12322 (浜�)</span
+ ></span
>
<span>{{ endatd }} ~ {{ statd }}</span>
- </div> -->
+ </div>
<el-row :gutter="20">
<el-col :span="10">
<div class="home-user-task-stats">
@@ -48,8 +48,8 @@
</el-col>
<el-col :span="9">
<div class="grid-content bg-purple headerBox bgc2">
- <!-- <div class="title">
- 闂ㄨ瘖鏈嶅姟鎬绘暟
+ <div class="title">
+ 闂ㄨ瘖鏈嶅姟
<span
style="
font-size: 25px;
@@ -57,10 +57,10 @@
font-weight: 600;
color: red;
"
- >12322 (浜�)</span
+ ></span
>
<span>{{ endatd }} ~ {{ statd }}</span>
- </div> -->
+ </div>
<el-row :gutter="20">
<el-col :span="10">
<div class="home-user-task-stats">
@@ -69,6 +69,7 @@
<div class="text-color2">
<p>鍑洪櫌灏辫瘖閲忥紙浜烘锛�</p>
</div>
+
</el-col>
<el-col :span="10">
<div class="home-user-task-stats">
@@ -88,7 +89,7 @@
<!-- echars鏁版嵁鍙鍖� -->
<div class="grid-content bg-purple" style="min-height: 365px">
<div class="title">
- 灏辫瘖缁熻
+ 鏈嶅姟缁熻
<span>{{ endatd }} ~ {{ statd }}</span>
<el-radio-group
v-model="radio1"
@@ -117,7 +118,7 @@
<el-col :span="4" class="aside">
<div class="grid-content bg-purple" style="margin-top: -180px">
<div class="title">
- 鍋ュ悍瀹ｆ暀
+ 绉戝鏈嶅姟閲�
<span>{{ endatd }} ~ {{ statd }}</span>
</div>
<div style="max-height: 690px; width: 100%; overflow: auto">
@@ -134,6 +135,7 @@
width="88"
class-name="name"
></el-table-column>
+
<el-table-column prop="count" class-name="count">
<template slot-scope="scope">
{{ scope.row.count }}娆�
@@ -146,7 +148,7 @@
</el-row>
<!-- 搴曢儴涓�涓� -->
<el-row :gutter="20" style="margin-bottom: 20px">
- <el-col :span="15">
+ <el-col :span="24">
<div class="grid-content bg-purple" style="min-height: 300px">
<div class="title">
瀹ｆ暀缁熻
@@ -158,7 +160,7 @@
</div>
</div>
</el-col>
- <el-col :span="9">
+ <!-- <el-col :span="9">
<div class="grid-content bg-purple" style="min-height: 300px">
<div class="title">
鍚勯」鏈嶅姟缁熻
@@ -281,7 +283,7 @@
</el-row>
</div>
</div>
- </el-col>
+ </el-col> -->
</el-row>
</div>
</div>
@@ -403,7 +405,8 @@
{ amount: 0, count: 89, skuId: "0", skuName: "鎬ヨ瘖" },
{ amount: 0, count: 88, skuId: "0", skuName: "鍣ㄦ绉�" },
{ amount: 0, count: 87, skuId: "0", skuName: "楠ㄧ" },
- { amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�" },
+ { amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�1" },
+ { amount: 0, count: 67, skuId: "0", skuName: "鏀惧皠绉�2" },
];
},
// 鑾峰彇闂ㄨ瘖鍩虹鏁版嵁
@@ -454,11 +457,11 @@
legend: {
data: [
"鍑洪櫌闅忚閲�",
- "褰卞儚闅忚閲�",
- "鍦ㄩ櫌闅忚閲�",
- "闂ㄨ瘖澶嶈瘖閫氱煡",
- "鍑洪櫌澶嶈瘖閫氱煡",
- "鍦ㄩ櫌璇勪及閲�",
+ "闂ㄨ瘖闅忚閲�",
+ // "鍦ㄩ櫌闅忚閲�",
+ // "闂ㄨ瘖澶嶈瘖閫氱煡",
+ "鍑洪櫌鏈嶅姟浜烘",
+ "闂ㄨ瘖鏈嶅姟浜烘",
],
},
xAxis: [
@@ -515,18 +518,18 @@
},
data: [120, 150, 165, 90, 140, 200, 130, 85, 175, 95, 110, 160],
},
+ // {
+ // name: "褰卞儚闅忚閲�",
+ // type: "bar",
+ // tooltip: {
+ // valueFormatter: function (value) {
+ // return value + " 浜�";
+ // },
+ // },
+ // data: [102, 190, 135, 88, 175, 160, 83, 145, 200, 110, 97, 180],
+ // },
{
- name: "褰卞儚闅忚閲�",
- type: "bar",
- tooltip: {
- valueFormatter: function (value) {
- return value + " 浜�";
- },
- },
- data: [102, 190, 135, 88, 175, 160, 83, 145, 200, 110, 97, 180],
- },
- {
- name: "鍦ㄩ櫌闅忚閲�",
+ name: "闂ㄨ瘖闅忚閲�",
type: "bar",
tooltip: {
valueFormatter: function (value) {
@@ -536,20 +539,20 @@
data: [145, 92, 178, 134, 167, 85, 199, 112, 156, 88, 120, 145],
},
+ // {
+ // name: "鍑洪櫌澶嶈瘖閫氱煡",
+ // type: "line",
+ // smooth: 0.3,
+ // yAxisIndex: 1,
+ // tooltip: {
+ // valueFormatter: function (value) {
+ // return value + " 娆�";
+ // },
+ // },
+ // data: [45, 123, 78, 156, 89, 34, 199, 112, 67, 145, 88, 175],
+ // },
{
- name: "鍑洪櫌澶嶈瘖閫氱煡",
- type: "line",
- smooth: 0.3,
- yAxisIndex: 1,
- tooltip: {
- valueFormatter: function (value) {
- return value + " 娆�";
- },
- },
- data: [45, 123, 78, 156, 89, 34, 199, 112, 67, 145, 88, 175],
- },
- {
- name: "闂ㄨ瘖澶嶈瘖閫氱煡",
+ name: "鍑洪櫌鏈嶅姟浜烘",
type: "line",
smooth: 0.3,
yAxisIndex: 1,
@@ -561,7 +564,7 @@
data: [102, 190, 135, 88, 175, 160, 83, 145, 200, 110, 97, 180],
},
{
- name: "鍦ㄩ櫌璇勪及閲�",
+ name: "闂ㄨ瘖鏈嶅姟浜烘",
type: "line",
smooth: 0.3,
yAxisIndex: 1,
@@ -980,7 +983,9 @@
min-height: 36px;
border-radius: 20px;
padding: 0 10px;
+ text-align: center;
}
+
.grid-contents {
min-height: 36px;
border-radius: 20px;
--
Gitblit v1.9.3