From 3ebf2bbe2a63cf28ccaf28bdc145a903df17840e Mon Sep 17 00:00:00 2001
From: xiangxy <shione_xxy@163.com>
Date: Tue, 7 Mar 2023 17:37:01 +0800
Subject: [PATCH] screen

---
 src/assets/js/getData1.js     | 478 +++++++++++++++++++++++++++++++++-
 src/pages/StorageMonitor2.vue |  86 +++---
 2 files changed, 514 insertions(+), 50 deletions(-)

diff --git a/src/assets/js/getData1.js b/src/assets/js/getData1.js
index fea4510..fbae1f4 100644
--- a/src/assets/js/getData1.js
+++ b/src/assets/js/getData1.js
@@ -27,7 +27,483 @@ export const storageMonitor = () => {
     'materialTask': [
       {
         'point_id': '1597551506607968256',
-        'point_code': 'YZJHJ04',
+        'point_code': 'YZJHJ05',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ06',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ07',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ08',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ09',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ10',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ11',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ12',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ13',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ14',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ15',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ16',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ17',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ18',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ19',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ20',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ21',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ22',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ23',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ24',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ25',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ26',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ27',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ28',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ29',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ30',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ31',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ32',
+        'point_name': '压制机旧料盅货架04',
+        'point_status': '1',
+        'material_id': 1556534702800769024,
+        'material_code': 'HW00001',
+        'material_name': '木质花纹2cm',
+        'vehicle_code': '1M3000009',
+        'ivt_qty': 1000.000000,
+        'ivt_weight': 800.000000,
+        'instorage_time': '2023-2-27 16:07:09',
+        'standing_time': 20,
+        'standing_status': '静置完成',
+        'warn_time': '5',
+        'is_full': '是'
+      },
+      {
+        'point_id': '1597551506607968256',
+        'point_code': 'YZJHJ33',
         'point_name': '压制机旧料盅货架04',
         'point_status': '1',
         'material_id': 1556534702800769024,
diff --git a/src/pages/StorageMonitor2.vue b/src/pages/StorageMonitor2.vue
index badceab..6b7179c 100644
--- a/src/pages/StorageMonitor2.vue
+++ b/src/pages/StorageMonitor2.vue
@@ -4,15 +4,16 @@
     <div class="content clearfix">
       <div class="con1">
         <div class="yard-wrap">
+          <div class="corridor_2">原料仓储监控</div>
           <div class="yard_group clearfix">
             <div class="yard_group_ul yard_group_ul_1">
               <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.struct_code}}</p>
+                  <p class="fontselect">{{e.point_code}}</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="{blue:e.struct_status ==='01',green:e.struct_status ==='02',yellow:e.struct_status ==='03',red:e.struct_status ==='04',gray:e.struct_status ==='05'}"></div>
                 </div>
-                <div v-show="code1 === e.sequence_number" class="locate-wrap clearfix">
+                <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>
@@ -23,11 +24,11 @@
                   </div>
                   <div class="clearfix locate-content" :class="e.coordinate">
                     <div class="tan_pline">
-                      <p class="tan_p">货位：{{e.struct_code}}</p>
+                      <p class="tan_p">货位：{{e.point_code}}</p>
                       <p class="tan_p">载具：{{e.storagevehicle_code}}</p>
                       <p class="tan_p">物料：{{e.material_code}}</p>
                       <p class="tan_p">名称：{{e.material_name}}</p>
-                      <p class="tan_p">重量：{{e.ivt_qty}}</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>
@@ -37,16 +38,16 @@
               </div>
             </div>
           </div>
-          <div class="corridor_2">&nbsp;</div>
+          <div class="corridor_2">成品仓储监控</div>
           <div class="yard_group clearfix">
             <div class="yard_group_ul yard_group_ul_2">
               <div class="yard_group_cell" v-for="(e, i) in group02" :key="i" :class="{lock:e.lock_type ==='01'}">
                 <div class="yard_group_p" @click="getInfo1(e)">
-                  <p class="fontselect">{{e.struct_code}}</p>
+                  <p class="fontselect">{{e.point_code}}</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="{blue:e.struct_status ==='01',green:e.struct_status ==='02',yellow:e.struct_status ==='03',red:e.struct_status ==='04',gray:e.struct_status ==='05'}"></div>
                 </div>
-                <div v-show="code1 === e.sequence_number" class="locate-wrap clearfix">
+                <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>
@@ -57,47 +58,12 @@
                   </div>
                   <div class="clearfix locate-content" :class="e.coordinate">
                     <div class="tan_pline">
-                      <p class="tan_p">货位：{{e.struct_code}}</p>
+                      <p class="tan_p">货位：{{e.point_code}}</p>
                       <p class="tan_p">载具：{{e.storagevehicle_code}}</p>
                       <p class="tan_p">物料：{{e.material_code}}</p>
                       <p class="tan_p">名称：{{e.material_name}}</p>
-                      <p class="tan_p">重量：{{e.ivt_qty}}</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">&nbsp;</div>
-          <div class="yard_group clearfix">
-            <div class="yard_group_ul yard_group_ul_3">
-              <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.struct_code}}</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="{blue:e.struct_status ==='01',green:e.struct_status ==='02',yellow:e.struct_status ==='03',red:e.struct_status ==='04',gray:e.struct_status ==='05'}"></div>
-                </div>
-                <div v-show="code1 === e.sequence_number" 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.struct_code}}</p>
-                      <p class="tan_p">载具：{{e.storagevehicle_code}}</p>
-                      <p class="tan_p">物料：{{e.material_code}}</p>
-                      <p class="tan_p">名称：{{e.material_name}}</p>
-                      <p class="tan_p">重量：{{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>
@@ -275,6 +241,29 @@ export default {
       let res = await storageMonitor()
       this.array1 = res.materialList
       this.array2 = res.productionList
+      this.group01 = [...res.materialTask]
+      this.group02 = [...res.productionTask]
+      // for (let i = 0; i < this.structArr.length; i++) {
+      //   for (let j = 0; j < this.group01.length; j++) {
+      //     if (this.structArr[i].sequence_number === this.group01[j].sequence_number + '') {
+      //       this.group01[j] = Object.assign(this.group01[j], this.structArr[i])
+      //     }
+      //   }
+      // }
+      // for (let i = 0; i < this.structArr.length; i++) {
+      //   for (let j = 0; j < this.group02.length; j++) {
+      //     if (this.structArr[i].sequence_number === this.group02[j].sequence_number + '') {
+      //       this.group02[j] = Object.assign(this.group02[j], this.structArr[i])
+      //     }
+      //   }
+      // }
+      for (let i = 0; i < this.structArr.length; i++) {
+        for (let j = 0; j < this.group03.length; j++) {
+          if (this.structArr[i].sequence_number === this.group03[j].sequence_number + '') {
+            this.group03[j] = Object.assign(this.group03[j], this.structArr[i])
+          }
+        }
+      }
     },
     // getdata(e) {
     //   // getdata(21),22,23
@@ -289,7 +278,7 @@ export default {
     //   show:false
     // },
     getInfo1 (e) {
-      this.code1 = this.code1 === e.sequence_number ? '' : e.sequence_number
+      this.code1 = this.code1 === e.point_code ? '' : e.point_code
     },
     closebtn () {
       this.code1 = ''
@@ -482,7 +471,7 @@ export default {
     .tag_block
       position absolute
       // bottom .1rem
-      bottom 10px
+      top 25px
       right .3rem
     .tag_type
       display inline-block
@@ -589,9 +578,8 @@ export default {
         z-index 97 //
     .corridor_2
       width 100%
-      // line-height .1rem
-      line-height 10px
-      text-align center
+      height 60px
+      line-height 60px
     .locate-wrap
       position absolute
       width 100%