From a3c0df775abcdbecbb3448d8fe76955ad9c1cb35 Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Wed, 10 May 2023 15:14:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=9F=E6=96=99=E5=88=86=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/StorageMonitor2.vue | 64 +++++++++++++++++++++++++----------
 1 file changed, 47 insertions(+), 17 deletions(-)

diff --git a/src/pages/StorageMonitor2.vue b/src/pages/StorageMonitor2.vue
index 11c7959..27c1f75 100644
--- a/src/pages/StorageMonitor2.vue
+++ b/src/pages/StorageMonitor2.vue
@@ -6,7 +6,7 @@
         <div class="yard-wrap">
           <div class="corridor_2">原料仓储监控</div>
           <div class="yard_group clearfix">
-            <div class="yard_group_ul yard_group_ul_2">
+            <div class="yard_group_ul yard_group_ul_1 fl">
               <div class="yard_group_cell" v-for="(e, i) in group01" :key="i" :class="{lock:e.lock_type ==='01'}">
                 <div class="yard_group_p" @click="getInfo1(e)">
                   <p class="fontselect">{{e.point_name}}</p>
@@ -36,6 +36,36 @@
                 </div>
               </div>
             </div>
+            <div class="yard_group_ul yard_group_ul_3 fr">
+              <div class="yard_group_cell" v-for="(e, i) in group03" :key="i" :class="{lock:e.lock_type ==='01'}">
+                <div class="yard_group_p" @click="getInfo1(e)">
+                  <p class="fontselect">{{e.point_name}}</p>
+                  <div v-if="e.struct_url == '1'" class="machine_1"></div>
+                  <div class="ingbox" :style="{height:(Number(e.show_struct_qty)/1000*60+'px')}" :class="{green:e.stand_status ==='2',yellow:e.stand_status ==='3',red:e.stand_status ==='4',blue:e.stand_status ==='5'}"></div>
+                </div>
+                <div v-show="code1 === e.point_code" class="locate-wrap clearfix">
+                  <div :class="e.aline">
+                    <div class="foldcricle0 foldcricle1"></div>
+                    <div class="foldline0 foldline1"></div>
+                  </div>
+                  <div :class="e.bline">
+                    <div class="foldline0 foldline2"></div>
+                    <div class="foldcricle0 foldcricle2"></div>
+                  </div>
+                  <div class="clearfix locate-content" :class="e.coordinate">
+                    <div class="tan_pline">
+                      <p class="tan_p">货位：{{e.point_name}}</p>
+                      <p class="tan_p">载具：{{e.vehicle_code}}</p>
+                      <p class="tan_p">物料：{{e.material_code}}</p>
+                      <p class="tan_p">重量(kg)：{{e.ivt_qty}}</p>
+                      <p class="tan_p">入库时间：{{e.instorage_time}}</p>
+                      <p class="tan_p">静置(h)：{{e.finish_times}}</p>
+                    </div>
+                    <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
+                  </div>
+                </div>
+              </div>
+            </div>
           </div>
           <div class="corridor_2">成品仓储监控</div>
           <div class="yard_group clearfix">
@@ -44,7 +74,7 @@
                 <div class="yard_group_p" @click="getInfo1(e)">
                   <p class="fontselect">{{e.point_name}}</p>
                   <div v-if="e.struct_url == '2'" class="machine_2"></div>
-                  <div class="ingbox" :style="{height:(Number(e.show_struct_qty)/1000*60+'px')}" :class="{green:e.stand_status ==='2',yellow:e.stand_status ==='3',red:e.stand_status ==='4',blue:e.stand_status ==='5'}"></div>
+                  <div class="ingbox" :style="{height:(Number(e.show_struct_qty)/1000*60+'px')}"></div>
                 </div>
                 <div v-show="code1 === e.point_code" class="locate-wrap clearfix">
                   <div :class="e.aline">
@@ -241,12 +271,12 @@ export default {
       this.array2 = res.result.productionList
       this.group01 = [...res.result.materialTask]
       this.group02 = [...res.result.productionTask]
+      this.group03 = [...res.result.materialYJTask]
       for (let i = 0; i < this.group01.length; i++) {
-        if (i === 16 || i === 17 || i === 18 || i === 19 || i === 36 || i === 37 || i === 38 || i === 39) {
-          this.group01[i] = Object.assign(this.group01[i], {coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0})
-        } else {
-          this.group01[i] = Object.assign(this.group01[i], {coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0})
-        }
+        this.group01[i] = Object.assign(this.group01[i], {coordinate: 'coordinate1', aline: 'aline1', bline: 'bline1', show: 0})
+      }
+      for (let i = 0; i < this.group03.length; i++) {
+        this.group03[i] = Object.assign(this.group03[i], {coordinate: 'coordinate2', aline: 'aline2', bline: 'bline2', show: 0})
       }
       for (let i = 0; i < this.group02.length; i++) {
         if (i === 16 || i === 17 || i === 18 || i === 19 || i === 36 || i === 37 || i === 38 || i === 39) {
@@ -326,7 +356,7 @@ export default {
   margin 12px auto
 .top_wrapper
   position relative
-  height 50%
+  height 60%
 .tag_block
   position absolute
   // bottom .1rem
@@ -379,20 +409,20 @@ export default {
 .yard_group_ul_1
   width 100%
   position absolute
-  grid-template-columns repeat(20, 100% / 20)
+  grid-template-columns repeat(16, 80% / 16)
   // grid-template-rows repeat(2, 1.8rem / 2)
-  grid-template-rows repeat(2, 90px)
+  grid-template-rows repeat(3, 110px)
 .yard_group_ul_2
   width 100%
   position absolute
   grid-template-columns repeat(20, 100% / 20)
   // grid-template-rows repeat(2, 1.8rem / 2)
-  grid-template-rows repeat(3, 90px)
+  grid-template-rows repeat(3, 110px)
 .yard_group_ul_3
-  width 40%
-  grid-template-columns repeat(8, 100% / 8)
+  width 15%
+  grid-template-columns repeat(3, 100% / 3)
   // grid-template-rows repeat(2, 1.8rem / 2)
-  grid-template-rows repeat(3, 90px)
+  grid-template-rows repeat(2, 110px)
 .yard_group_cell
   position relative
   display inline-block
@@ -436,7 +466,7 @@ height 90px
   position absolute
   width 60%
   width 100%
-  height 60px
+  height 80px
   overflow hidden
   background center center / 100% 100% url(../assets/images/cp1.jpg) no-repeat
   margin 0 auto
@@ -462,7 +492,7 @@ height 90px
 .locate-content
   position absolute
   width 2.9rem
-  height 2.56rem
+  height 2.74rem
   z-index 99
   background center center / 100% 100% url(../assets/images/popover_1.png) no-repeat
   padding .36rem .15rem
@@ -487,7 +517,7 @@ height 90px
   cursor pointer
 .bottom_wrapper
   width 100%
-  height 50%
+  height 40%
   padding-top 20px
   _fj(row)
 .bottom_wrapper_l