From 8dd7af51db4cf768fbf92002b5b62f7fb9d1c929 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 06 五月 2025 15:04:59 +0800
Subject: [PATCH] refactor(zhitan):调整模型代码和优化能源统计功能
---
zhitan-vue/src/views/index.vue | 67 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 26 deletions(-)
diff --git a/zhitan-vue/src/views/index.vue b/zhitan-vue/src/views/index.vue
index 95f164a..85e2687 100644
--- a/zhitan-vue/src/views/index.vue
+++ b/zhitan-vue/src/views/index.vue
@@ -336,6 +336,7 @@
})
const { queryParams } = toRefs(data)
function handleTimeType(item, type) {
+ console.log("itemtype",item,type)
queryParams.value.timeType = item
queryParams.value.type = type
queryParams.value.dataTime = proxy.dayjs(new Date()).format("YYYY-MM-DD")
@@ -911,18 +912,20 @@
margin-top: 14px;
display: flex;
width: 100%;
- flex-wrap: wrap;
+ flex-wrap: nowrap;
justify-content: space-between;
gap: 15px;
&:after {
content: "";
- flex: auto;
+ flex: 0 0 0;
}
-
+
.card-list-item {
- width: 320px;
- height: 127px;
+ width: 0;
+ flex: 1 1 320px;
+ max-width: 320px;
+ height: 135px;
background: rgba(242, 246, 250, 0.1);
box-sizing: border-box;
padding: 16px;
@@ -937,9 +940,9 @@
&:hover {
background: rgba(242, 246, 250, 0.15);
}
-
+
.item-left {
- margin-right: 16px;
+ margin-right: 20px;
.top-icon {
width: 73px;
@@ -965,9 +968,12 @@
font-size: 14px;
font-family: OPPOSans-Regular;
color: rgba(255, 255, 255, 0.65);
+ letter-spacing: 0.5px;
+ margin-bottom: 4px;
+
.unit {
color: rgba(255, 255, 255, 0.65);
- margin-left: 2px;
+ margin-left: 4px;
font-size: 12px;
font-weight: normal;
}
@@ -976,29 +982,31 @@
.right-value {
font-weight: 500;
font-size: 26px;
- margin-top: 4px;
+ margin-top: 6px;
font-family: OPPOSans-Medium;
color: #fff;
- line-height: 1;
+ line-height: 1.2;
+ letter-spacing: 0.5px;
}
}
.item-bottom {
display: flex;
justify-content: space-between;
- margin-top: 14px;
+ margin-top: 18px;
font-family: OPPOSans, OPPOSans;
font-weight: normal;
font-size: 12px;
color: rgba(255, 255, 255, 0.5);
- line-height: 1;
+ line-height: 1.2;
.bottom-left, .bottom-right {
display: flex;
align-items: center;
+ letter-spacing: 0.3px;
:deep(.el-icon) {
- margin-left: 4px;
+ margin-left: 6px;
font-size: 12px;
}
}
@@ -1080,7 +1088,7 @@
.themeLight {
.page {
padding: 20px;
- background: #f7f8fa;
+ background: #fff;
.card-title {
width: 132px;
@@ -1094,18 +1102,20 @@
margin-top: 14px;
display: flex;
width: 100%;
- flex-wrap: wrap;
+ flex-wrap: nowrap;
justify-content: space-between;
gap: 15px;
&:after {
content: "";
- flex: auto;
+ flex: 0 0 0;
}
-
+
.card-list-item {
- width: 320px;
- height: 127px;
+ width: 0;
+ flex: 1 1 320px;
+ max-width: 320px;
+ height: 135px;
background: #fff;
box-sizing: border-box;
padding: 16px;
@@ -1117,7 +1127,7 @@
align-items: center;
.item-left {
- margin-right: 16px;
+ margin-right: 20px;
.top-icon {
width: 73px;
@@ -1143,9 +1153,12 @@
font-size: 14px;
font-family: OPPOSans-Regular;
color: rgba(0, 0, 0, 0.65);
+ letter-spacing: 0.5px;
+ margin-bottom: 4px;
+
.unit {
color: rgba(0, 0, 0, 0.65);
- margin-left: 2px;
+ margin-left: 4px;
font-size: 12px;
font-weight: normal;
}
@@ -1154,29 +1167,31 @@
.right-value {
font-weight: 500;
font-size: 26px;
- margin-top: 4px;
+ margin-top: 6px;
font-family: OPPOSans-Medium;
color: #333;
- line-height: 1;
+ line-height: 1.2;
+ letter-spacing: 0.5px;
}
}
.item-bottom {
display: flex;
justify-content: space-between;
- margin-top: 14px;
+ margin-top: 18px;
font-family: OPPOSans, OPPOSans;
font-weight: normal;
font-size: 12px;
color: rgba(0, 0, 0, 0.5);
- line-height: 1;
+ line-height: 1.2;
.bottom-left, .bottom-right {
display: flex;
align-items: center;
+ letter-spacing: 0.3px;
:deep(.el-icon) {
- margin-left: 4px;
+ margin-left: 6px;
font-size: 12px;
}
}
--
Gitblit v1.9.3