From e0454252b4a21814a7f712a057f946225b0be118 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Thu, 21 Sep 2023 17:59:21 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/getData11.js          | 34 +++++++++---------
 src/pages/shunhe/StorageMonitor.vue | 53 ++++++++++++++++-------------
 2 files changed, 47 insertions(+), 40 deletions(-)

diff --git a/src/assets/js/getData11.js b/src/assets/js/getData11.js
index 76111dd..0677c2c 100644
--- a/src/assets/js/getData11.js
+++ b/src/assets/js/getData11.js
@@ -2003,8 +2003,8 @@ export const storageMonitor = () => {
           }
         ],
         'storageLocation': '压机1困料货位',
-        'pointStatus': '1',
-        'standStatus': ''
+        'pointStatus': '3',
+        'standStatus': '1'
       },
       {
         'data': [
@@ -2038,8 +2038,8 @@ export const storageMonitor = () => {
           }
         ],
         'storageLocation': '压机2困料货位',
-        'pointStatus': '1',
-        'standStatus': ''
+        'pointStatus': '3',
+        'standStatus': '2'
       },
       {
         'data': [
@@ -2073,8 +2073,8 @@ export const storageMonitor = () => {
           }
         ],
         'storageLocation': '压机3困料货位',
-        'pointStatus': '1',
-        'standStatus': ''
+        'pointStatus': '3',
+        'standStatus': '3'
       },
       {
         'data': [
@@ -2108,8 +2108,8 @@ export const storageMonitor = () => {
           }
         ],
         'storageLocation': '压机4困料货位',
-        'pointStatus': '1',
-        'standStatus': ''
+        'pointStatus': '3',
+        'standStatus': '4'
       },
       {
         'data': [
@@ -2143,8 +2143,8 @@ export const storageMonitor = () => {
           }
         ],
         'storageLocation': '压机5困料货位',
-        'pointStatus': '1',
-        'standStatus': ''
+        'pointStatus': '3',
+        'standStatus': '5'
       },
       {
         'data': [
@@ -2213,7 +2213,7 @@ export const storageMonitor = () => {
           }
         ],
         'storageLocation': '液压机困料货位1',
-        'pointStatus': '1',
+        'pointStatus': '2',
         'standStatus': ''
       },
       {
@@ -2248,8 +2248,8 @@ export const storageMonitor = () => {
           }
         ],
         'storageLocation': '液压机困料货位2',
-        'pointStatus': '1',
-        'standStatus': ''
+        'pointStatus': '3',
+        'standStatus': '2'
       },
       {
         'data': [
@@ -2423,7 +2423,7 @@ export const storageMonitor = () => {
           }
         ],
         'storageLocation': '公用困料货位3',
-        'pointStatus': '2',
+        'pointStatus': '1',
         'standStatus': ''
       },
       {
@@ -2739,7 +2739,7 @@ export const storageMonitor = () => {
         ],
         'storageLocation': '压机9困料货位3',
         'pointStatus': '1',
-        'standStatus': ''
+        'standStatus': '4'
       },
       {
         'data': [
@@ -2809,7 +2809,7 @@ export const storageMonitor = () => {
         ],
         'storageLocation': '压机8困料货位2',
         'pointStatus': '1',
-        'standStatus': ''
+        'standStatus': '2'
       },
       {
         'data': [
@@ -2844,7 +2844,7 @@ export const storageMonitor = () => {
         ],
         'storageLocation': '压机8困料货位3',
         'pointStatus': '1',
-        'standStatus': ''
+        'standStatus': '1'
       },
       {
         'data': [
diff --git a/src/pages/shunhe/StorageMonitor.vue b/src/pages/shunhe/StorageMonitor.vue
index b17c17f..b702de1 100644
--- a/src/pages/shunhe/StorageMonitor.vue
+++ b/src/pages/shunhe/StorageMonitor.vue
@@ -16,20 +16,24 @@
               <div class="corridor_2">困料监控</div>
               <div class="tags">
                 <div class="tag_type">
-                  <div class="type_color green"></div>
+                  <div class="type_color yellow"></div>
                   <div class="tag_text">静置中</div>
                 </div>
                 <div class="tag_type">
-                  <div class="type_color blue"></div>
-                  <div class="tag_text">空盅</div>
-                </div>
-                <div class="tag_type">
-                  <div class="type_color yellow"></div>
+                  <div class="type_color green"></div>
                   <div class="tag_text">静置完成</div>
                 </div>
+                <div class="tag_type">
+                  <div class="type_color blue"></div>
+                  <div class="tag_text">强制静置完成</div>
+                </div>
+                <div class="tag_type">
+                  <div class="type_color orange"></div>
+                  <div class="tag_text">静置超时</div>
+                </div>
                 <div class="tag_type">
                   <div class="type_color red"></div>
-                  <div class="tag_text">强制完成</div>
+                  <div class="tag_text">强制静置超时</div>
                 </div>
               </div>
             </div>
@@ -39,8 +43,9 @@
                   <div class="conn1"  v-for="(e, i) in group01.slice(0, 12)" :key="i" :class="{mgl10: i === 2 || i === 4 || i === 6 || i === 8 || i === 10}">
                     <div class="a-box" @click="showInfo(e)">
                       <div class="atext">{{e.storageLocation}}</div>
-                      <div class="acon">
-                        <div class="maskbox" :class="{green:e.standStatus ==='1',yellow:e.standStatus ==='2',red:e.standStatus ==='3',blue:e.pointStatus ==='2'}"></div>
+                      <div class="acon" :class="{noImg: e.pointStatus === '1' && e.standStatus === ''}">
+                        <div class="maskbox" :class="{yellow:e.standStatus ==='1',green:e.standStatus ==='2',blue:e.standStatus ==='3',orange:e.standStatus ==='4',red:e.standStatus ==='5'}"></div>
+                        <!-- <div class="maskbox" :class="['yellow', 'green', 'blue', 'orange', 'red'][Number(e.standStatus) - 1]"></div> -->
                       </div>
                     </div>
                     <div class="b-box" v-show="flg === e.storageLocation">
@@ -67,8 +72,8 @@
                   <div class="conn1"  v-for="(e, i) in group01.slice(12, 26)" :key="i">
                     <div class="a-box" @click="showInfo(e)">
                       <div class="atext">{{e.storageLocation}}</div>
-                      <div class="acon">
-                        <div class="maskbox" :class="{green:e.standStatus ==='1',yellow:e.standStatus ==='2',red:e.standStatus ==='3',blue:e.pointStatus ==='2'}"></div>
+                      <div class="acon" :class="{noImg: e.pointStatus === '1' && e.standStatus === ''}">
+                        <div class="maskbox" :class="{yellow:e.standStatus ==='1',green:e.standStatus ==='2',blue:e.standStatus ==='3',orange:e.standStatus ==='4',red:e.standStatus ==='5'}"></div>
                       </div>
                     </div>
                     <div class="b-box" v-show="flg === e.storageLocation">
@@ -88,8 +93,8 @@
                   <div class="conn1"  v-for="(e, i) in group01.slice(26, 30)" :key="i">
                     <div class="a-box" @click="showInfo(e)">
                       <div class="atext">{{e.storageLocation}}</div>
-                      <div class="acon">
-                        <div class="maskbox" :class="{green:e.standStatus ==='1',yellow:e.standStatus ==='2',red:e.standStatus ==='3',blue:e.pointStatus ==='2'}"></div>
+                      <div class="acon" :class="{noImg: e.pointStatus === '1' && e.standStatus === ''}">
+                        <div class="maskbox" :class="{yellow:e.standStatus ==='1',green:e.standStatus ==='2',blue:e.standStatus ==='3',orange:e.standStatus ==='4',red:e.standStatus ==='5'}"></div>
                       </div>
                     </div>
                     <div class="b-box" v-show="flg === e.storageLocation">
@@ -107,8 +112,8 @@
                   <div class="conn1"  v-for="(e, i) in group01.slice(30, 34)" :key="i">
                     <div class="a-box" @click="showInfo(e)">
                       <div class="atext">{{e.storageLocation}}</div>
-                      <div class="acon">
-                        <div class="maskbox" :class="{green:e.standStatus ==='1',yellow:e.standStatus ==='2',red:e.standStatus ==='3',blue:e.pointStatus ==='2'}"></div>
+                      <div class="acon" :class="{noImg: e.pointStatus === '1' && e.standStatus === ''}">
+                        <div class="maskbox" :class="{yellow:e.standStatus ==='1',green:e.standStatus ==='2',blue:e.standStatus ==='3',orange:e.standStatus ==='4',red:e.standStatus ==='5'}"></div>
                       </div>
                     </div>
                     <div class="b-box" v-show="flg === e.storageLocation">
@@ -126,8 +131,8 @@
                   <div class="conn1"  v-for="(e, i) in group01.slice(34, 38)" :key="i">
                     <div class="a-box" @click="showInfo(e)">
                       <div class="atext">{{e.storageLocation}}</div>
-                      <div class="acon">
-                        <div class="maskbox" :class="{green:e.standStatus ==='1',yellow:e.standStatus ==='2',red:e.standStatus ==='3',blue:e.pointStatus ==='2'}"></div>
+                      <div class="acon" :class="{noImg: e.pointStatus === '1' && e.standStatus === ''}">
+                        <div class="maskbox" :class="{yellow:e.standStatus ==='1',green:e.standStatus ==='2',blue:e.standStatus ==='3',orange:e.standStatus ==='4',red:e.standStatus ==='5'}"></div>
                       </div>
                     </div>
                     <div class="b-box" v-show="flg === e.storageLocation">
@@ -147,8 +152,8 @@
                   <div class="conn1"  v-for="(e, i) in group01.slice(38, 41)" :key="i" :class="{mgl10: i === 1 || i === 2 || i === 3}">
                     <div class="a-box" @click="showInfo(e)">
                       <div class="atext">{{e.storageLocation}}</div>
-                      <div class="acon">
-                        <div class="maskbox" :class="{green:e.standStatus ==='1',yellow:e.standStatus ==='2',red:e.standStatus ==='3',blue:e.pointStatus ==='2'}"></div>
+                      <div class="acon" :class="{noImg: e.pointStatus === '1' && e.standStatus === ''}">
+                        <div class="maskbox" :class="{yellow:e.standStatus ==='1',green:e.standStatus ==='2',blue:e.standStatus ==='3',orange:e.standStatus ==='4',red:e.standStatus ==='5'}"></div>
                       </div>
                     </div>
                     <div class="b-box" v-show="flg === e.storageLocation">
@@ -166,8 +171,8 @@
                   <div class="conn1"  v-for="(e, i) in group01.slice(16, 17)" :key="i">
                     <div class="a-box" @click="showInfo(e)">
                       <div class="atext">{{e.storageLocation}}</div>
-                      <div class="acon">
-                        <div class="maskbox" :class="{green:e.standStatus ==='1',yellow:e.standStatus ==='2',red:e.standStatus ==='3',blue:e.pointStatus ==='2'}"></div>
+                      <div class="acon" :class="{noImg: e.pointStatus === '1' && e.standStatus === ''}">
+                        <div class="maskbox" :class="{yellow:e.standStatus ==='1',green:e.standStatus ==='2',blue:e.standStatus ==='3',orange:e.standStatus ==='4',red:e.standStatus ==='5'}"></div>
                       </div>
                     </div>
                     <div class="b-box" v-show="flg === e.storageLocation">
@@ -531,7 +536,6 @@ export default {
       this.group01 = res.standMonitor
       this.group02 = res.frontWarehouseMonitor
       this.group03 = res.backWarehouseMonitor
-      console.log(this.group01, 666)
       // for (let i = 0; i < this.group01.length; i++) {
       //   this.group01[i] = Object.assign(this.group01[i], {mgl: 'mgl1', coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0})
       // }
@@ -1026,7 +1030,7 @@ height 90px
   display flex
 .tags
   display flex
-  width 20%
+  width 40%
   align-items center
   justify-content space-around
 .mgt5
@@ -1071,6 +1075,7 @@ height 90px
     white-space:normal
     text-align center
     height 35px
+    width 55px
   .acon
     width 100%
     height 61%
@@ -1151,4 +1156,6 @@ height 90px
 .colbox
   display flex
   flex-direction column
+.noImg
+  background none !important
 </style>