yangchunjin/SoonWorkerD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
24kycj
2024-11-27 12:32:22 +08:00
parent e82d0d5183
commit c9e658bfb3
2 changed files with 439 additions and 348 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/renderer/store/modules/chat.js
+79 -17
View File
@@ -124,23 +124,85 @@ const cd_types = [
const defaultData = {
// 任务列表
task_list: [
// {
// task_uuid: '20204215',
// task_name: '复制任务',
// task_size: 100000,
// finish_freq: 2,
// total_freq: 10,
// task_status: 2,
// ass_task: [
// {
// task_size: 100000,
// cd_type: 2,
// start_time: '2024-04-01 12:00:00',
// finish_time: '2024-04-01 12:00:00',
// task_status: 2
// }
// ]
// }
{
task_uuid: '20204215',
task_name: '复制任务',
task_size: 100000,
finish_freq: 2,
total_freq: 10,
task_status: 2,
ass_task: [
{
task_size: 100000,
cd_type: 2,
start_time: '2024-04-01 12:00:00',
finish_time: '2024-04-01 12:00:00',
task_status: 2
},
{
task_size: 100000,
cd_type: 2,
start_time: '2024-04-01 12:00:00',
finish_time: '2024-04-01 12:00:00',
task_status: 2
},
{
task_size: 100000,
cd_type: 2,
start_time: '2024-04-01 12:00:00',
finish_time: '2024-04-01 12:00:00',
task_status: 2
}
]
},
{
task_uuid: '20204215',
task_name: '复制任务',
task_size: 100000,
finish_freq: 2,
total_freq: 10,
task_status: 2,
ass_task: [
{
task_size: 100000,
cd_type: 2,
start_time: '2024-04-01 12:00:00',
finish_time: '2024-04-01 12:00:00',
task_status: 2
},
{
task_size: 100000,
cd_type: 2,
start_time: '2024-04-01 12:00:00',
finish_time: '2024-04-01 12:00:00',
task_status: 2
},
{
task_size: 100000,
cd_type: 2,
start_time: '2024-04-01 12:00:00',
finish_time: '2024-04-01 12:00:00',
task_status: 2
}
]
},
{
task_uuid: '20204215',
task_name: '复制任务',
task_size: 100000,
finish_freq: 2,
total_freq: 10,
task_status: 2,
ass_task: [
{
task_size: 100000,
cd_type: 2,
start_time: '2024-04-01 12:00:00',
finish_time: '2024-04-01 12:00:00',
task_status: 2
}
]
}
],
// 打印机信息
printer_info: {
src/renderer/views/dashboard/index.vue
+110 -81
View File
@@ -37,6 +37,7 @@
</div>
<user-info></user-info>
</div>
<div class="content_body">
<!-- 设备 -->
<div class="flex_box device_box">
<!-- 左侧 -->
@@ -120,7 +121,7 @@
<div class="device_info_option_b_text device_info_option_b_text1">{{ parseInt(printer_info.yellow_last) }}%</div>
</div>
<div v-if="isLast" @click="isLast = false" class="flex_box flex_row_center device_info_option_b">
<div class="device_info_option_b_text device_info_option_b_text1">{{ $accDiv($accAdd($accAdd(printer_info.blue_last,printer_info.red_last),printer_info.yellow_last),3) }}%</div>
<div class="device_info_option_b_text device_info_option_b_text1">{{ $accDiv($accAdd($accAdd(printer_info.blue_last,printer_info.red_last),printer_info.yellow_last),3).toFixed(2) }}%</div>
</div>
</div>
</div>
@@ -244,7 +245,7 @@
<el-table default-expand-all class="work_table" :data="task_list" empty-text="暂无作业列表">
<el-table-column type="expand">
<template slot-scope="scope">
<el-table :show-header="false" :data="scope.row.ass_task">
<el-table class="child_table" :show-header="false" :data="scope.row.ass_task">
<el-table-column width="48" label=""></el-table-column>
<el-table-column type="index" width="80" label="序号">
<template slot-scope="child">
@@ -316,6 +317,7 @@
</el-table-column>
</el-table>
</div>
</div>
<!-- 底部 -->
<div class="flex_box flex_row_center footer_box">
<div>Copyright @ 2023 CARDSOON Corporation</div>
@@ -743,74 +745,73 @@ $red: #ff0000;
.container_box {
height: 100vh;
.top_box {
height: 88px;
padding: 0 48px;
height: 78px;
padding: 0 32px;
background-color: #ffffff;
.top_left {
.top_btn1 {
cursor: pointer;
padding: 0 24px;
height: 45px;
padding: 0 16px;
height: 40px;
background: #00c325;
border-radius: 6px;
margin-right: 24px;
margin-right: 16px;
font-weight: 500;
font-size: 21px;
font-size: 18px;
color: #ffffff;
img {
width: 21px;
height: 21px;
margin-right: 12px;
width: 18px;
height: 18px;
margin-right: 8px;
}
}
.top_btn2 {
cursor: pointer;
padding: 0 24px;
height: 45px;
padding: 0 16px;
height: 40px;
background: rgba(0, 195, 37, 0.12);
border: 2px solid rgba(0, 195, 37, 0.32);
border-radius: 6px;
margin-right: 24px;
margin-right: 16px;
font-weight: 500;
font-size: 21px;
font-size: 18px;
color: #00c325;
img {
width: 21px;
height: 21px;
margin-right: 12px;
width: 18px;
height: 18px;
margin-right: 8px;
}
}
.top_left_line {
width: 2px;
height: 45px;
height: 40px;
background: #e0e0e0;
margin: 0 24px;
margin: 0 16px;
}
.top_left_status_box {
width: 90px;
margin-right: 24px;
.top_left_status {
padding: 0 18px;
zoom: 2;
padding: 0 16px;
zoom: 1.3;
}
}
.top_left_option {
margin-right: 24px;
margin-left: 16px;
.top_left_text {
font-weight: 500;
font-size: 21px;
font-size: 18px;
color: #000000;
text-decoration: underline;
}
.top_left_num {
padding: 0 12px;
height: 36px;
padding: 0 10px;
height: 28px;
background: #00c325;
border-radius: 6px;
font-weight: 500;
font-size: 21px;
font-size: 18px;
color: #ffffff;
line-height: 36px;
line-height: 28px;
margin-left: 12px;
}
.top_left_num1 {
@@ -819,20 +820,24 @@ $red: #ff0000;
}
}
}
.content_body {
background-color: #f8f8f8;
padding: 0 100px;
}
.device_box {
padding: 24px;
padding: 16px 0;
background-color: #f8f8f8;
.device_left {
width: 50%;
padding: 0 50px;
padding: 0 45px;
.device_left_top {
margin-bottom: 24px;
.device_img {
width: 275px;
width: 255px;
margin-right: 35px;
}
.device_info {
width: calc(100% - 310px);
width: calc(100% - 290px);
.device_info_box {
width: calc(100% - 40px);
overflow: hidden;
@@ -844,13 +849,13 @@ $red: #ff0000;
display: inline-block;
.device_info_text {
font-weight: 500;
font-size: 21px;
font-size: 19px;
color: #000000;
line-height: 38px;
}
.device_info_title {
font-weight: bold;
font-size: 27px;
font-size: 25px;
color: #000000;
line-height: 38px;
}
@@ -872,7 +877,7 @@ $red: #ff0000;
background: #00bcc3;
border-radius: 6px;
font-weight: 500;
font-size: 18px;
font-size: 16px;
margin: 0;
color: #ffffff;
}
@@ -934,7 +939,7 @@ $red: #ff0000;
.device_info_option_b_text1 {
width: 36px;
text-align: center;
font-size: 18px;
font-size: 16px;
}
.el-icon-caret-bottom {
transition: all 0.5s;
@@ -1006,21 +1011,21 @@ $red: #ff0000;
}
}
.device_status {
height: 48px;
height: 44px;
background: #ffffff;
border-radius: 6px;
border-radius: 4px;
margin-bottom: 24px;
padding: 0 18px;
.device_status_dot {
width: 24px;
height: 24px;
width: 22px;
height: 22px;
border-radius: 50%;
background: #e54d4d;
margin-right: 18px;
}
.device_status_text {
font-weight: 500;
font-size: 21px;
font-size: 19px;
color: #e54d4d;
line-height: 30px;
}
@@ -1051,14 +1056,14 @@ $red: #ff0000;
}
.device_run {
width: 100%;
height: 48px;
height: 44px;
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: 48px;
height: 44px;
border: 2px solid #00bcc3;
overflow: hidden;
border-radius: 6px 0 0 6px;
@@ -1070,14 +1075,14 @@ $red: #ff0000;
border: none;
font-weight: 500;
background-color: transparent;
font-size: 21px;
font-size: 20px;
height: 40px;
line-height: 40px;
color: #000000;
}
.el-input__icon {
height: 40px;
font-size: 21px;
font-size: 20px;
line-height: 40px;
font-weight: bold;
color: #000;
@@ -1087,11 +1092,11 @@ $red: #ff0000;
}
.device_run_btn {
width: 140px;
height: 48px;
height: 44px;
background: #00bcc3;
border-radius: 0px 6px 6px 0px;
font-weight: 500;
font-size: 21px;
font-size: 19px;
margin: 0;
color: #ffffff;
}
@@ -1100,9 +1105,9 @@ $red: #ff0000;
.device_right {
width: 50%;
.device_right_top {
height: 190px;
height: 200px;
background: #ffffff;
border-radius: 6px;
border-radius: 4px;
margin-bottom: 18px;
padding: 0 24px;
.device_right_top_item {
@@ -1139,13 +1144,13 @@ $red: #ff0000;
width: calc(100% - 136px);
.device_right_top_title {
font-weight: 500;
font-size: 21px;
font-size: 19px;
color: #000000;
line-height: 34px;
}
.device_right_top_text {
font-weight: 500;
font-size: 18px;
font-size: 16px;
color: #666666;
line-height: 30px;
}
@@ -1175,27 +1180,27 @@ $red: #ff0000;
background: #ffffff;
border-radius: 6px;
.notice_top {
height: 64px;
padding: 0 24px;
height: 75px;
padding: 0 30px;
border-bottom: 2px solid #e1f5e5;
.notice_title {
font-weight: 500;
font-size: 21px;
font-size: 19px;
color: #000000;
img {
width: 36px;
height: 36px;
width: 28px;
height: 28px;
margin-right: 18px;
}
}
.notice_all {
font-weight: 500;
font-size: 21px;
font-size: 19px;
color: #00c325;
cursor: pointer;
img {
width: 36px;
height: 36px;
width: 28px;
height: 28px;
margin-right: 18px;
}
}
@@ -1221,25 +1226,25 @@ $red: #ff0000;
background-color: #b5b5b5; /* 设置滑块hover状态时的背景颜色 */
}
.notice_item {
height: 45px;
height: 42px;
background-color: #f8f8f8;
margin-bottom: 3px;
cursor: pointer;
.notice_content {
width: calc(100% - 108px);
font-size: 18px;
font-size: 16px;
color: #000000;
line-height: 24px;
span {
display: inline-block;
width: 45px;
width: 42px;
text-align: center;
}
}
.notice_time {
width: 160px;
text-align: center;
font-size: 15px;
font-size: 14px;
color: #000000;
line-height: 24px;
}
@@ -1267,51 +1272,55 @@ $red: #ff0000;
}
}
.work_box {
height: calc(100vh - 645px);
height: calc(100vh - 640px);
::-webkit-scrollbar {
width: 0; /* 设置滚动条的宽度 */
height: 0;
}
.el-table.work_table {
height: calc(100vh - 725px) !important;
height: calc(100vh - 720px) !important;
::v-deep .el-table__body-wrapper {
height: calc(100% - 48px) !important;
overflow: scroll!important;
}
}
.work_top {
height: 60px;
background-color: #fff;
height: 72px;
.work_top_text {
width: 132px;
height: 60px;
height: 72px;
background: linear-gradient(180deg, #c1ffcd 0%, #ffffff 100%);
font-weight: bold;
font-size: 21px;
font-size: 19px;
color: #00c325;
line-height: 60px;
line-height: 72px;
text-align: center;
}
}
.work_table {
background-color: #f8f8f8;
background-color: #ffffff;
&::before {
height: 0;
}
::v-deep {
tr {
background-color: #f8f8f8;
background-color: #ffffff;
}
td.el-table__cell {
background-color: #f8f8f8;
border-bottom: 3px solid #ffffff;
background-color: #ffffff;
border-bottom: 2px solid #f8f8f8;
}
th.el-table__cell {
background-color: #f2f9f4;
border-bottom: 3px solid #ffffff;
border-bottom: 2px solid #f8f8f8;
}
.el-table__cell {
padding: 6px 0;
}
.cell {
line-height: 28px;
font-size: 18px;
font-size: 16px;
color: #000000;
}
}
@@ -1319,8 +1328,8 @@ $red: #ff0000;
width: 80%;
::v-deep {
.el-progress-bar__outer {
height: 18px !important;
line-height: 18px !important;
height: 16px !important;
line-height: 16px !important;
.el-progress-bar__innerText {
font-size: 12px !important;
color: #fff !important;
@@ -1330,21 +1339,41 @@ $red: #ff0000;
}
.work_status_box {
font-weight: 500;
font-size: 18px;
font-size: 14px;
color: #000000;
height: 30px;
}
}
.child_table {
&::before {
height: 0;
}
::v-deep {
td.el-table__cell {
border-bottom: 2px solid #f8f8f8;
}
tr {
&:last-child {
td.el-table__cell {
border-bottom: none;
}
}
}
th.el-table__cell {
border-bottom: 2px solid #f8f8f8;
}
}
}
}
.footer_box {
height: 36px;
background: #dcf5e1;
font-weight: 500;
font-size: 15px;
font-size: 14px;
color: #666666;
.footer_line {
width: 2px;
height: 15px;
height: 14px;
background-color: #666666;
margin: 0 20px;
}