From 26e9c0a75b25d37c01a45e788be549a369763d7d Mon Sep 17 00:00:00 2001
From: 24kycj <1637269896@qq.com>
Date: Sat, 16 Nov 2024 17:40:39 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/renderer/components/workAdd/workAdd.vue |  5 +++-
 src/renderer/store/modules/chat.js          |  6 +++--
 src/renderer/views/dashboard/index.vue      | 26 +++++++--------------
 3 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/renderer/components/workAdd/workAdd.vue b/src/renderer/components/workAdd/workAdd.vue
index 490407d..c82b927 100644
--- a/src/renderer/components/workAdd/workAdd.vue
+++ b/src/renderer/components/workAdd/workAdd.vue
@@ -776,6 +776,7 @@ export default {
               font-weight: 500;
             }
             .el-input__icon {
+              font-size: 16px;
               height: 32px;
               line-height: 32px;
               font-weight: bold;
@@ -1062,6 +1063,7 @@ export default {
             font-weight: 500;
           }
           .el-input__icon {
+            font-size: 16px;
             height: 32px;
             line-height: 32px;
             font-weight: bold;
@@ -1121,6 +1123,7 @@ export default {
             font-weight: 500;
           }
           .el-input__icon {
+            font-size: 16px;
             height: 32px;
             line-height: 32px;
             font-weight: bold;
@@ -1128,7 +1131,7 @@ export default {
           }
         }
         .el-switch {
-          zoom: 1.3;
+          zoom: 1.2;
         }
         .el-radio-group {
           padding: 10px 0;
diff --git a/src/renderer/store/modules/chat.js b/src/renderer/store/modules/chat.js
index 6094422..2651aa0 100644
--- a/src/renderer/store/modules/chat.js
+++ b/src/renderer/store/modules/chat.js
@@ -284,15 +284,17 @@ const actions = {
       } else if (data.resp_name === 'add_log') {
         let logs = data.resp_info.add_log
         let loglist = []
+        let logLists = [...state.logList]
         for (let i = 0; i < logs.length; i++) {
           let texts = logs[i].split('|')
-          loglist.push({
+          if (logLists.length > 20) logLists.splice(logLists.length - 1, 1)
+          loglist.unshift({
             time: texts[0],
             text: texts[2],
             status: texts[1]
           })
         }
-        let list = [...state.logList, ...loglist]
+        let list = [...loglist, ...state.logList]
         commit('setData', { name: 'logList', data: list })
       }
     } else {
diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue
index 9fa8eb7..53b358d 100644
--- a/src/renderer/views/dashboard/index.vue
+++ b/src/renderer/views/dashboard/index.vue
@@ -182,16 +182,16 @@
                   <span>{{ index + 1 }}</span
                   >[{{ item.status }}]{{ item.text }}
                 </div>
-                <div class="notice_time">{{ item.time.split(' ')[0] }}</div>
+                <div class="notice_time">{{ item.time }}</div>
               </div>
             </template>
             <template v-if="showAll">
-              <div v-for="(item, index) in allLogList" :key="index" :class="`flex_box flex_row_between notice_item notice_${item.status}`">
+              <div v-for="(item, index) in logList" :key="index" :class="`flex_box flex_row_between notice_item notice_${item.status}`">
                 <div class="notice_content">
                   <span>{{ index + 1 }}</span
                   >[{{ item.status }}]{{ item.text }}
                 </div>
-                <div class="notice_time">{{ item.time.split(' ')[0] }}</div>
+                <div class="notice_time">{{ item.time }}</div>
               </div>
             </template>
           </div>
@@ -213,7 +213,6 @@
                   <div>{{ scope.$index+1 }}_{{ child.$index+1 }}</div>
                 </template>
               </el-table-column>
-              <el-table-column prop="task_label" label="子任务名称"></el-table-column>
               <el-table-column prop="task_size" label="大小">
                 <template slot-scope="child">
                   <div>{{ $filterSize(child.row.task_size) }}</div>
@@ -221,13 +220,6 @@
               </el-table-column>
               <el-table-column prop="start_time" label="开始时间"></el-table-column>
               <el-table-column prop="finish_time" label="结束时间"></el-table-column>
-              <el-table-column label="进度">
-                <template slot-scope="child">
-                  <div class="work_progress">
-                    <el-progress :text-inside="true" :percentage="child.row.copy_scheduler" status="success"></el-progress>
-                  </div>
-                </template>
-              </el-table-column>
               <el-table-column prop="task_status" label="状态">
                 <template slot-scope="child">
                   <div class="flex_box work_status_box">
@@ -333,14 +325,14 @@ export default {
       // 作业列表
       task_list: [],
       statusList: {
-        '0': '新建',
-        '1': '等待中',
-        '2': '文件准备中',
-        '3': '正在刻录',
+        '0': '新建中',
+        '1': '准备中',
+        '2': '等待中',
+        '3': '正在拷贝',
         '4': '正在打印',
         '5': '已失败',
-        '6': '已取消',
-        '7': '已完成'
+        '6': '运行中',
+        '100': '已完成'
       },
       // 设备信息
       printer_info: {},