From 6c795c01273e11f2e4e957e44919450ff5747ba0 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 22 Feb 2024 09:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E8=BF=9B=E5=BA=A6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=A7=84=E6=A0=BC=E5=92=8C=E5=BC=80=E5=B7=A5=E5=AE=8C?=
 =?UTF-8?q?=E5=B7=A5=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_7dept.vue | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/views/bigScreen/index_7dept.vue b/src/views/bigScreen/index_7dept.vue
index 03c12efc..a49c8fda 100644
--- a/src/views/bigScreen/index_7dept.vue
+++ b/src/views/bigScreen/index_7dept.vue
@@ -251,7 +251,7 @@ export default {
             table2Visible: false,
             refValue1: 'moocBox1',
             refValue2: 'moocBox2',
-            liData1: ['序号', '型号', '完成进度', '产量', '状态'],
+            liData1: ['序号', '规格', '型号', '完成进度', '产量', '任务时间', '状态'],
             processData: [],
             liData2: ['序号', '炉号', '产品名称', '型号', '规格', '最近产量', '锅数', '设备状态'],
             lineData: [],
@@ -334,20 +334,26 @@ export default {
                 console.log('任务进度:', res);
                 let processData = [];
                 res.forEach(item => {
-                    let arr = [], obj1 = {}, obj2 = {}, obj3 = {}, obj4 = {};
+                    let arr = [], obj1 = {}, obj2 = {}, obj3 = {}, obj4 = {}, obj5 = {}, obj6 = {};
                     obj1.elType = 'primary';
-                    obj1.value = item.material_.specification;
-                    obj2.elType = 'progress';
+                    obj1.value = item.material_.model;
+                    obj2.elType = 'primary';
+                    obj2.value = item.material_.specification;
+                    obj3.elType = 'progress';
                     let process = Math.round((item.count_ok / item.count) * 100)
-                    obj2.value = process;
-                    obj3.elType = 'primary';
-                    obj3.value = item.count_ok;
-                    obj4.elType = 'tag';
-                    obj4.value = item.state;
+                    obj3.value = process;
+                    obj4.elType = 'primary';
+                    obj4.value = item.count_ok;
+                    obj5.elType = 'primary';
+                    obj5.value = item.start_date + '-' + item.end_date;
+                    obj6.elType = 'tag';
+                    obj6.value = item.state;
                     arr.push(obj1);
                     arr.push(obj2);
                     arr.push(obj3);
                     arr.push(obj4);
+                    arr.push(obj5);
+                    arr.push(obj6);
                     processData.push(arr);
                 });
                 this.processData = processData;