From b5958a6bb0045ac149e441e7abeda5514ccf9d8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Fri, 27 Sep 2024 16:15:36 +0800
Subject: [PATCH] no message

---
 src/pages/modules/home/devicepop.vue | 4 ++--
 src/pages/modules/home/index.vue     | 8 ++++----
 src/pages/modules/home/workshop.vue  | 7 +++++--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/pages/modules/home/devicepop.vue b/src/pages/modules/home/devicepop.vue
index de8bbc6..7e12b32 100644
--- a/src/pages/modules/home/devicepop.vue
+++ b/src/pages/modules/home/devicepop.vue
@@ -108,8 +108,8 @@ export default {
     background top center / 100% 18px url(../../../images/popup_line.png) no-repeat
 .pop_name
   width 50%
-  _font(14px,28px,#32C5FF,,left)
-  text-shadow 2px 2px 4px #A6E6FF
+  _font(16px,28px,#32C5FF,700,left)
+  text-shadow 2px 2px 4px rgba(166, 230, 255, 50%)
   margin-bottom 8px
 .pop_status
   _wh(50%, 28px)
diff --git a/src/pages/modules/home/index.vue b/src/pages/modules/home/index.vue
index 1df1cce..acbede5 100644
--- a/src/pages/modules/home/index.vue
+++ b/src/pages/modules/home/index.vue
@@ -80,8 +80,8 @@
                     <ul class="scroll_tab_1">
                       <li>设备编号</li>
                       <li>物料编号</li>
-                      <li>计划重量</li>
-                      <li>实际重量</li>
+                      <li>计划数量</li>
+                      <li>实际数量</li>
                     </ul>
                     <div class="scroll_container_1">
                       <vue-seamless-scroll :data="pressdayList" :class-option="defaultOption">
@@ -107,8 +107,8 @@
                     <ul class="scroll_tab_1">
                       <li>设备编号</li>
                       <li>物料编号</li>
-                      <li>计划重量</li>
-                      <li>实际重量</li>
+                      <li>计划数量</li>
+                      <li>实际数量</li>
                     </ul>
                     <div class="scroll_container_1">
                       <vue-seamless-scroll :data="unstackingdayList" :class-option="defaultOption">
diff --git a/src/pages/modules/home/workshop.vue b/src/pages/modules/home/workshop.vue
index e5d0323..96318d4 100644
--- a/src/pages/modules/home/workshop.vue
+++ b/src/pages/modules/home/workshop.vue
@@ -70,7 +70,9 @@ export default {
         {type: 'xlw', device_code: 'FJ04CDW01', coords: '539,483,556,506', coord: {x: 539, y: 483}, shape: 'rect'},
         {type: 'xlw', device_code: 'FJ04CDW02', coords: '491,487,506,506', coord: {x: 491, y: 487}, shape: 'rect'},
         {type: 'xlw', device_code: 'FJ04MDW01', coords: '540,571,553,580', coord: {x: 540, y: 571}, shape: 'rect'},
-        {type: 'xlw', device_code: 'FJ04MDW02', coords: '489,570,504,580', coord: {x: 489, y: 570}, shape: 'rect'}
+        {type: 'xlw', device_code: 'FJ04MDW02', coords: '489,570,504,580', coord: {x: 489, y: 570}, shape: 'rect'},
+        {type: 'yao', device_code: '窑', coords: '456,270,881,335', coord: {}, shape: 'rect'},
+        {type: 'rgv', device_code: 'RGV', coords: '726,590,758,614', coord: {}, shape: 'rect'}
       ],
       interTime: this.$store.getters.setTime,
       wsTimer: null,
@@ -125,7 +127,8 @@ export default {
       this.StackingPositionList = [...res.StackingPositionList]
       this.SortingPositionList = [...res.SortingPositionList]
       this.SortAndPalletizingList = [...res.SortAndPalletizingList]
-      this.allData = [...this.PressMachineList, ...this.StackingPositionList, ...this.SortingPositionList, ...this.SortAndPalletizingList]
+      let arr = [{device_code: '窑'}, {device_code: 'RGV'}]
+      this.allData = [...this.PressMachineList, ...this.StackingPositionList, ...this.SortingPositionList, ...this.SortAndPalletizingList, ...arr]
       this.pushArr(this.areaList, this.allData)
     },
     pushArr (arr1, arr2) {