From 25d3aaa0e2d3c09aab414853df2e84c4307e5d2f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 20 Mar 2024 17:23:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/bigScreen/index_10dept.vue | 12 ++++++++----
 src/views/bigScreen/index_6dept.vue  |  4 ++--
 src/views/bigScreen/index_7dept.vue  | 10 ++++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/views/bigScreen/index_10dept.vue b/src/views/bigScreen/index_10dept.vue
index dc439fb7..9bb26fce 100644
--- a/src/views/bigScreen/index_10dept.vue
+++ b/src/views/bigScreen/index_10dept.vue
@@ -36,7 +36,7 @@
                                     <span>{{ yesterdayObjet.物料名 }}</span>
                                     <span
                                         style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">{{
-                                            yesterdayObjet.合格数 }}</span>
+                yesterdayObjet.合格数 }}</span>
                                 </div>
                             </div>
                         </el-col>
@@ -68,7 +68,8 @@
                             <div style="height: 2px;"></div>
                             <div class="boxmain" id="scrollContainer1">
                                 <scScrollTavle v-if="table1Visible" :tableHeight="containerHeight1"
-                                    :rowData="attendanceData" :titleData="liData1" :refValue="refValue1"></scScrollTavle>
+                                    :rowData="attendanceData" :titleData="liData1" :refValue="refValue1">
+                                </scScrollTavle>
                             </div>
                         </div>
                     </el-row>
@@ -282,7 +283,7 @@ export default {
             refValue2: 'moocBox2',
             liData1: ['序号', '姓名', '岗位', '班次', '状态'],
             attendanceData: [],
-            liData2: ['序号', '产品名称', '型号', '计划开始时间', '计划结束时间', '完成进度', '产量', '状态'],
+            liData2: ['序号', '产品名称', '规格', '型号', '计划开始时间', '计划结束时间', '完成进度', '产量', '状态'],
             processData: [],
             todayMtask: [],
             speed: 2000,
@@ -405,11 +406,13 @@ export default {
                 console.log('任务进度:', res);
                 let processData = [];
                 res.forEach(item => {
-                    let arr = [], obj1 = {}, obj2 = {}, obj3 = {}, obj4 = {}, obj5 = {}, obj6 = {}, obj7 = {};
+                    let arr = [], obj1 = {}, obj2 = {}, obj3 = {}, obj4 = {}, obj5 = {}, obj6 = {}, obj7 = {}, obj8 = {};
                     obj1.elType = 'primary';
                     obj1.value = item.material_.name;
                     obj2.elType = 'primary';
                     obj2.value = item.material_.specification;
+                    obj8.elType = 'primary';
+                    obj8.value = item.material_.model;
                     obj3.elType = 'primary';
                     obj3.value = item.start_date;
                     obj4.elType = 'primary';
@@ -423,6 +426,7 @@ export default {
                     obj7.value = item.state;
                     arr.push(obj1);
                     arr.push(obj2);
+                    arr.push(obj8);
                     arr.push(obj3);
                     arr.push(obj4);
                     arr.push(obj5);
diff --git a/src/views/bigScreen/index_6dept.vue b/src/views/bigScreen/index_6dept.vue
index ddc1a5c5..3a53ae2a 100644
--- a/src/views/bigScreen/index_6dept.vue
+++ b/src/views/bigScreen/index_6dept.vue
@@ -348,7 +348,7 @@ export default {
         this.weekLast = last.getFullYear() + '-' + (last.getMonth() + 1) + '-' + last.getDate();
         this.getsaleOut();
         this.getMioItem();//发货情况
-        // this.getTodayMtask();//今日任务
+        this.getTodayMtask();//今日任务
         //昨日工序进度
         this.getMtask();
         //时间
@@ -435,7 +435,7 @@ export default {
             let obj = {
                 query: {
                     start_date: this.weekFirst, end_date: this.weekLast, dept_name: "6车间",
-                    select_cols_material: ", material.model AS 型号", group_bys_material: ", material.model",
+                    select_cols_material: ", material.model AS 型号", group_bys_material: ", material.model", order_bys_material: "",
                     select_cols_mgroup: ", mgroup.name AS 工段", group_bys_mgroup: ", mgroup.name",
                     is_count_utask: -1
                 },
diff --git a/src/views/bigScreen/index_7dept.vue b/src/views/bigScreen/index_7dept.vue
index a49c8fda..b716a6a1 100644
--- a/src/views/bigScreen/index_7dept.vue
+++ b/src/views/bigScreen/index_7dept.vue
@@ -15,7 +15,8 @@
                         <div class="boxmain  bigdata border" style="overflow:scroll;padding:5px;">
                             <div v-for="item in todayMtask" :key="item.id"
                                 style="width:50%;display:inline-block;height: 40px;line-height:40px;padding:0 20px;">
-                                <div style="display:flex;justify-content:space-between;border-bottom:1px dashed #eeeeee">
+                                <div
+                                    style="display:flex;justify-content:space-between;border-bottom:1px dashed #eeeeee">
                                     <span style="font-size:12px">{{ item.material_out_name }}</span>
                                     <span
                                         style="color: #fef000;margin-left: 10px;font-weight:bold;font-family:electronicFont">
@@ -36,7 +37,8 @@
                                 <div style="height: 4px;"></div>
                                 <div class="boxmain" id="scrollContainer1">
                                     <scScrollTavle v-if="table1Visible" :tableHeight="containerHeight1"
-                                        :rowData="processData" :titleData="liData1" :refValue="refValue1"></scScrollTavle>
+                                        :rowData="processData" :titleData="liData1" :refValue="refValue1">
+                                    </scScrollTavle>
                                 </div>
                             </div>
                         </el-col>
@@ -374,9 +376,9 @@ export default {
                         obj2.elType = 'primary';
                         obj2.value = item.material_name;
                         obj3.elType = 'primary';
-                        obj3.value = item.material_specification;
+                        obj3.value = item.material_model;
                         obj4.elType = 'primary';
-                        obj4.value = item.material_model;
+                        obj4.value = item.material_specification;
                         obj5.elType = 'primary';
                         let process = item.count_real
                         obj5.value = process;