From 4b64e00b1ff7ca113c8dea6b733b9864b4d4bae4 Mon Sep 17 00:00:00 2001
From: 24kycj <1637269896@qq.com>
Date: Tue, 26 Nov 2024 20:09:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/renderer/components/userInfo/userInfo.vue | 8 +-
src/renderer/views/dashboard/index.vue | 161 ++++++++++--------
2 files changed, 91 insertions(+), 78 deletions(-)
diff --git a/src/renderer/components/userInfo/userInfo.vue b/src/renderer/components/userInfo/userInfo.vue
index 384f9e9..611e7d4 100644
--- a/src/renderer/components/userInfo/userInfo.vue
+++ b/src/renderer/components/userInfo/userInfo.vue
@@ -33,16 +33,16 @@
.top_right {
.top_right_name {
font-weight: 500;
- font-size: 18px;
+ font-size: 21px;
color: #000000;
- padding: 0 16px;
+ padding: 0 24px;
}
.top_right_btn {
font-weight: 500;
- font-size: 18px;
+ font-size: 21px;
color: #00C325;
line-height: 50px;
- padding-left: 16px;
+ padding-left: 24px;
cursor: pointer;
}
}
diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue
index ae8118a..ddc00cc 100644
--- a/src/renderer/views/dashboard/index.vue
+++ b/src/renderer/views/dashboard/index.vue
@@ -241,10 +241,10 @@
-
+
-
+
@@ -743,73 +743,74 @@ $red: #ff0000;
.container_box {
height: 100vh;
.top_box {
- height: 78px;
- padding: 0 32px;
+ height: 88px;
+ padding: 0 48px;
background-color: #ffffff;
.top_left {
.top_btn1 {
cursor: pointer;
- padding: 0 16px;
- height: 40px;
+ padding: 0 24px;
+ height: 45px;
background: #00c325;
border-radius: 6px;
- margin-right: 16px;
+ margin-right: 24px;
font-weight: 500;
- font-size: 18px;
+ font-size: 21px;
color: #ffffff;
img {
- width: 18px;
- height: 18px;
- margin-right: 8px;
+ width: 21px;
+ height: 21px;
+ margin-right: 12px;
}
}
.top_btn2 {
cursor: pointer;
- padding: 0 16px;
- height: 40px;
+ padding: 0 24px;
+ height: 45px;
background: rgba(0, 195, 37, 0.12);
border: 2px solid rgba(0, 195, 37, 0.32);
border-radius: 6px;
- margin-right: 16px;
+ margin-right: 24px;
font-weight: 500;
- font-size: 18px;
+ font-size: 21px;
color: #00c325;
img {
- width: 18px;
- height: 18px;
- margin-right: 8px;
+ width: 21px;
+ height: 21px;
+ margin-right: 12px;
}
}
.top_left_line {
width: 2px;
- height: 40px;
+ height: 45px;
background: #e0e0e0;
- margin: 0 16px;
+ margin: 0 24px;
}
.top_left_status_box {
width: 90px;
+ margin-right: 24px;
.top_left_status {
- padding: 0 16px;
- zoom: 1.3;
+ padding: 0 18px;
+ zoom: 2;
}
}
.top_left_option {
- margin-left: 16px;
+ margin-right: 24px;
.top_left_text {
font-weight: 500;
- font-size: 18px;
+ font-size: 21px;
color: #000000;
text-decoration: underline;
}
.top_left_num {
- padding: 0 10px;
- height: 28px;
+ padding: 0 12px;
+ height: 36px;
background: #00c325;
border-radius: 6px;
font-weight: 500;
- font-size: 18px;
+ font-size: 21px;
color: #ffffff;
- line-height: 28px;
+ line-height: 36px;
margin-left: 12px;
}
.top_left_num1 {
@@ -819,19 +820,20 @@ $red: #ff0000;
}
}
.device_box {
- padding: 16px;
+ padding: 24px;
background-color: #f8f8f8;
.device_left {
width: 50%;
- padding: 0 45px;
+ padding: 0 50px 40px;
.device_left_top {
margin-bottom: 24px;
.device_img {
- width: 255px;
+ width: 275px;
margin-right: 35px;
}
.device_info {
- width: calc(100% - 290px);
+ width: calc(100% - 310px);
+ padding-top: 40px;
.device_info_box {
width: calc(100% - 40px);
overflow: hidden;
@@ -843,13 +845,13 @@ $red: #ff0000;
display: inline-block;
.device_info_text {
font-weight: 500;
- font-size: 19px;
+ font-size: 21px;
color: #000000;
line-height: 38px;
}
.device_info_title {
font-weight: bold;
- font-size: 25px;
+ font-size: 27px;
color: #000000;
line-height: 38px;
}
@@ -871,7 +873,7 @@ $red: #ff0000;
background: #00bcc3;
border-radius: 6px;
font-weight: 500;
- font-size: 16px;
+ font-size: 18px;
margin: 0;
color: #ffffff;
}
@@ -933,7 +935,7 @@ $red: #ff0000;
.device_info_option_b_text1 {
width: 36px;
text-align: center;
- font-size: 16px;
+ font-size: 18px;
}
.el-icon-caret-bottom {
transition: all 0.5s;
@@ -1005,21 +1007,21 @@ $red: #ff0000;
}
}
.device_status {
- height: 44px;
+ height: 48px;
background: #ffffff;
- border-radius: 4px;
+ border-radius: 6px;
margin-bottom: 24px;
padding: 0 18px;
.device_status_dot {
- width: 22px;
- height: 22px;
+ width: 24px;
+ height: 24px;
border-radius: 50%;
background: #e54d4d;
margin-right: 18px;
}
.device_status_text {
font-weight: 500;
- font-size: 19px;
+ font-size: 21px;
color: #e54d4d;
line-height: 30px;
}
@@ -1050,14 +1052,14 @@ $red: #ff0000;
}
.device_run {
width: 100%;
- height: 44px;
+ height: 48px;
overflow: hidden;
background: #ffffff;
box-shadow: 0px 5 9px 2px rgba(102, 102, 102, 0.18);
border-radius: 6px;
.device_run_input {
width: calc(100% - 140px);
- height: 44px;
+ height: 48px;
border: 2px solid #00bcc3;
overflow: hidden;
border-radius: 6px 0 0 6px;
@@ -1069,14 +1071,14 @@ $red: #ff0000;
border: none;
font-weight: 500;
background-color: transparent;
- font-size: 20px;
+ font-size: 21px;
height: 40px;
line-height: 40px;
color: #000000;
}
.el-input__icon {
height: 40px;
- font-size: 20px;
+ font-size: 21px;
line-height: 40px;
font-weight: bold;
color: #000;
@@ -1086,11 +1088,11 @@ $red: #ff0000;
}
.device_run_btn {
width: 140px;
- height: 44px;
+ height: 48px;
background: #00bcc3;
border-radius: 0px 6px 6px 0px;
font-weight: 500;
- font-size: 19px;
+ font-size: 21px;
margin: 0;
color: #ffffff;
}
@@ -1099,9 +1101,9 @@ $red: #ff0000;
.device_right {
width: 50%;
.device_right_top {
- height: 200px;
+ height: 190px;
background: #ffffff;
- border-radius: 4px;
+ border-radius: 6px;
margin-bottom: 18px;
padding: 0 24px;
.device_right_top_item {
@@ -1138,13 +1140,13 @@ $red: #ff0000;
width: calc(100% - 136px);
.device_right_top_title {
font-weight: 500;
- font-size: 19px;
+ font-size: 21px;
color: #000000;
line-height: 34px;
}
.device_right_top_text {
font-weight: 500;
- font-size: 16px;
+ font-size: 18px;
color: #666666;
line-height: 30px;
}
@@ -1174,27 +1176,27 @@ $red: #ff0000;
background: #ffffff;
border-radius: 6px;
.notice_top {
- height: 75px;
- padding: 0 30px;
+ height: 64px;
+ padding: 0 24px;
border-bottom: 2px solid #e1f5e5;
.notice_title {
font-weight: 500;
- font-size: 19px;
+ font-size: 21px;
color: #000000;
img {
- width: 28px;
- height: 28px;
+ width: 36px;
+ height: 36px;
margin-right: 18px;
}
}
.notice_all {
font-weight: 500;
- font-size: 19px;
+ font-size: 21px;
color: #00c325;
cursor: pointer;
img {
- width: 28px;
- height: 28px;
+ width: 36px;
+ height: 36px;
margin-right: 18px;
}
}
@@ -1220,25 +1222,25 @@ $red: #ff0000;
background-color: #b5b5b5; /* 设置滑块hover状态时的背景颜色 */
}
.notice_item {
- height: 42px;
+ height: 45px;
background-color: #f8f8f8;
margin-bottom: 3px;
cursor: pointer;
.notice_content {
width: calc(100% - 108px);
- font-size: 16px;
+ font-size: 18px;
color: #000000;
line-height: 24px;
span {
display: inline-block;
- width: 42px;
+ width: 45px;
text-align: center;
}
}
.notice_time {
width: 160px;
text-align: center;
- font-size: 14px;
+ font-size: 15px;
color: #000000;
line-height: 24px;
}
@@ -1266,17 +1268,28 @@ $red: #ff0000;
}
}
.work_box {
- height: calc(100vh - 640px);
+ height: calc(100vh - 645px);
+ ::-webkit-scrollbar {
+ width: 0; /* 设置滚动条的宽度 */
+ height: 0;
+ }
+ .el-table.work_table {
+ height: calc(100vh - 725px) !important;
+ ::v-deep .el-table__body-wrapper {
+ height: calc(100% - 48px) !important;
+ overflow: scroll!important;
+ }
+ }
.work_top {
- height: 72px;
+ height: 60px;
.work_top_text {
width: 132px;
- height: 72px;
+ height: 60px;
background: linear-gradient(180deg, #c1ffcd 0%, #ffffff 100%);
font-weight: bold;
- font-size: 19px;
+ font-size: 21px;
color: #00c325;
- line-height: 72px;
+ line-height: 60px;
text-align: center;
}
}
@@ -1299,7 +1312,7 @@ $red: #ff0000;
}
.cell {
line-height: 28px;
- font-size: 16px;
+ font-size: 18px;
color: #000000;
}
}
@@ -1307,8 +1320,8 @@ $red: #ff0000;
width: 80%;
::v-deep {
.el-progress-bar__outer {
- height: 16px !important;
- line-height: 16px !important;
+ height: 18px !important;
+ line-height: 18px !important;
.el-progress-bar__innerText {
font-size: 12px !important;
color: #fff !important;
@@ -1318,7 +1331,7 @@ $red: #ff0000;
}
.work_status_box {
font-weight: 500;
- font-size: 14px;
+ font-size: 18px;
color: #000000;
height: 30px;
}
@@ -1328,11 +1341,11 @@ $red: #ff0000;
height: 36px;
background: #dcf5e1;
font-weight: 500;
- font-size: 14px;
+ font-size: 15px;
color: #666666;
.footer_line {
width: 2px;
- height: 14px;
+ height: 15px;
background-color: #666666;
margin: 0 20px;
}