diff --git a/src/assets/images/device/arrow.png b/src/assets/images/device/arrow.png
new file mode 100644
index 0000000..e6cc51c
Binary files /dev/null and b/src/assets/images/device/arrow.png differ
diff --git a/src/assets/js/mork2.js b/src/assets/js/mork2.js
index b36c775..8c4574b 100644
--- a/src/assets/js/mork2.js
+++ b/src/assets/js/mork2.js
@@ -715,24 +715,72 @@ export const homepageEquipment = () => {
           'equipment': '压机7上料位1',
           'status': '4'
         },
+        {
+          'equipment': '压机7上料位2',
+          'status': '4'
+        },
+        {
+          'equipment': '压机7上料位3',
+          'status': '4'
+        },
+        {
+          'equipment': '压机7上料位4',
+          'status': '4'
+        },
         {
           'equipment': '压机8上料位1',
           'status': '4'
         },
+        {
+          'equipment': '压机8上料位2',
+          'status': '4'
+        },
         {
           'equipment': '压机9上料位1',
           'status': '1'
         },
         {
-          'equipment': '压机10上料位1',
+          'equipment': '压机9上料位2',
           'status': '1'
         },
         {
-          'equipment': '压机11上料位1',
+          'equipment': '压机9上料位3',
           'status': '1'
         },
         {
-          'equipment': '压机12上料位1',
+          'equipment': '压机9上料位4',
+          'status': '1'
+        },
+        {
+          'equipment': '压机9上料位5',
+          'status': '1'
+        },
+        {
+          'equipment': '压机9上料位6',
+          'status': '1'
+        },
+        {
+          'equipment': '压机9上料位7',
+          'status': '1'
+        },
+        {
+          'equipment': '压机9上料位8',
+          'status': '1'
+        },
+        {
+          'equipment': '压机9上料位9',
+          'status': '1'
+        },
+        {
+          'equipment': '压机9上料位10',
+          'status': '1'
+        },
+        {
+          'equipment': '压机9上料位11',
+          'status': '1'
+        },
+        {
+          'equipment': '压机9上料位12',
           'status': '1'
         }
       ]
diff --git a/src/components/canvas.vue b/src/components/canvas.vue
index 5be81a2..beaadba 100644
--- a/src/components/canvas.vue
+++ b/src/components/canvas.vue
@@ -1,5 +1,6 @@
 <template>
-  <div class="canvas_container" @click="rectClick">
+  <!-- <div class="canvas_container" @click="rectClick"> -->
+  <div class="canvas_container">
     <canvas id="myCanvas" width="946" height="982"></canvas>
   </div>
 </template>
diff --git a/src/components/devicepop.vue b/src/components/devicepop.vue
new file mode 100644
index 0000000..83279c6
--- /dev/null
+++ b/src/components/devicepop.vue
@@ -0,0 +1,338 @@
+<template>
+  <div v-if="pkId === data.equipment" class="popup_wraper" :class="{'popup_wraper_down': hangj === 1}">
+    <div class="popup_arrow" :class="{'popup_arrow_down': hangj === 1}">
+      <img src="../assets/images/device/arrow.png">
+    </div>
+    <div class="popup_bg">
+      <div class="popup_block">
+        <div v-show="type !== 'tp'" class="pop_header">
+          <div v-show="type !== 'lz' && type !== 'tp'" class="pop_name">{{data.equipment}}</div>
+          <div class="pop_status">
+            <div class="pop_status_dot" :class="data.status ==='1' ? 'green' : ''"></div>
+            <div class="pop_status_text fgray">运行</div>
+          </div>
+        </div>
+        <div v-if="type === 'lz' || type === 'tp'" class="pop_content">
+          <div class="pop_item">
+            <div class="pop_label">点位</div>
+            <div class="pop_val">{{data.equipment}}</div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">载具</div>
+            <div class="pop_val">L007</div>
+          </div>
+          <div class="pop_item pop_item_l">
+            <div class="pop_label">物料</div>
+            <div class="pop_val">W001</div>
+          </div>
+          <div class="pop_item pop_item_l">
+            <div class="pop_label">名称</div>
+            <div class="pop_val">物料1</div>
+          </div>
+          <div v-if="type === 'lz'" class="pop_item">
+            <div class="pop_label">重量</div>
+            <div class="pop_val">80&nbsp;<span>KG</span></div>
+          </div>
+          <div v-if="type === 'tp'" class="pop_item">
+            <div class="pop_label">数量</div>
+            <div class="pop_val">800&nbsp;<span>块</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">批次</div>
+            <div class="pop_val">20201010</div>
+          </div>
+          <div class="pop_item">
+            <div v-if="type === 'lz'" class="pop_label">组盘时间</div>
+            <div v-if="type === 'tp'" class="pop_label">组盘/入库时间</div>
+            <div class="pop_val">2020-10-10 19:20:20</div>
+          </div>
+          <div v-if="type === 'lz'" class="pop_item">
+            <div class="pop_label">已静置</div>
+            <div class="pop_val">8&nbsp;<span>h</span></div>
+          </div>
+        </div>
+        <div v-if="type === 'hlj' || type === 'yj' || type === 'yao' || type === 'cdjxs'" class="pop_content">
+          <div v-if="type !== 'yao'" class="pop_item pop_item_l">
+            <div class="pop_label">当前生产</div>
+            <div class="pop_val">铝碳化硅碳ACTTEXDA10M250X150X7523Z002</div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">已工作时间</div>
+            <div class="pop_val">8&nbsp;<span>h</span></div>
+          </div>
+          <div v-if="type === 'hlj' || type === 'yj'" class="pop_item">
+            <div class="pop_label">已生产总量</div>
+            <div class="pop_val">2300&nbsp;<span>KG</span></div>
+          </div>
+          <div v-if="type === 'yao'" class="pop_item">
+            <div class="pop_label">窑内物料数量</div>
+            <div class="pop_val">2300&nbsp;<span>块</span></div>
+          </div>
+          <div v-if="type === 'yao'" class="pop_item">
+            <div class="pop_label">当日已生产</div>
+            <div class="pop_val">2300&nbsp;<span>块</span></div>
+          </div>
+          <div v-if="type === 'cdjxs'" class="pop_item">
+            <div class="pop_label">完成托盘数</div>
+            <div class="pop_val">2300&nbsp;<span>托</span></div>
+          </div>
+          <div v-if="type === 'cdjxs'" class="pop_item">
+            <div class="pop_label">完成数量</div>
+            <div class="pop_val">2300&nbsp;<span>块</span></div>
+          </div>
+          <table class="popup_table">
+            <tr>
+              <th>本日生产</th>
+              <th v-if="type === 'hlj'">已生产数量</th>
+              <th v-else>客户</th>
+              <th v-if="type === 'hlj'">单位</th>
+              <th v-else>已生产（块）</th>
+            </tr>
+            <tr>
+              <td>铝碳化硅碳ACTTEXDA10M250X150X7523Z002</td>
+              <td v-if="type === 'hlj'">1500</td>
+              <td v-else>新余</td>
+              <td v-if="type === 'hlj'">KG</td>
+              <td v-else>1000</td>
+            </tr>
+            <tr>
+              <td>铝碳化硅碳ACTTEXDA10M250X150X7523Z002</td>
+              <td v-if="type === 'hlj'">1500</td>
+              <td v-else>新余</td>
+              <td v-if="type === 'hlj'">KG</td>
+              <td v-else>1000</td>
+            </tr>
+            <tr>
+              <td>铝碳化硅碳ACTTEXDA10M250X150X7523Z002</td>
+              <td v-if="type === 'hlj'">1500</td>
+              <td v-else>新余</td>
+              <td v-if="type === 'hlj'">KG</td>
+              <td v-else>1000</td>
+            </tr>
+          </table>
+        </div>
+        <div v-if="type === 'hangj'" class="pop_content">
+          <div class="pop_item pop_item_l">
+            <div class="pop_label">当前物料</div>
+            <div class="pop_val">L007</div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">当前载具</div>
+            <div class="pop_val">T001</div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">当前物料数量</div>
+            <div class="pop_val">800&nbsp;<span>块</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">当日搬运托盘数</div>
+            <div class="pop_val">800&nbsp;<span>托</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">当日搬运数量</div>
+            <div class="pop_val">800&nbsp;<span>块</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">当日搬运物料数</div>
+            <div class="pop_val">800&nbsp;<span>个</span></div>
+          </div>
+        </div>
+        <div v-if="type === 'ssx'" class="pop_content">
+          <div class="pop_item">
+            <div class="pop_label">已工作时间</div>
+            <div class="pop_val">3&nbsp;<span>h</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">输入托盘数</div>
+            <div class="pop_val">800&nbsp;<span>托</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">输入数量</div>
+            <div class="pop_val">800&nbsp;<span>块</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">输出托盘数</div>
+            <div class="pop_val">800&nbsp;<span>托</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">输出数量</div>
+            <div class="pop_val">800&nbsp;<span>块</span></div>
+          </div>
+        </div>
+        <div v-if="type === 'cpj'" class="pop_content">
+          <div class="pop_item">
+            <div class="pop_label">已工作时间</div>
+            <div class="pop_val">3&nbsp;<span>h</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">完成托盘数</div>
+            <div class="pop_val">800&nbsp;<span>托</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">完成垛数</div>
+            <div class="pop_val">800&nbsp;<span>垛</span></div>
+          </div>
+        </div>
+        <div v-if="type === 'tpccx'" class="pop_content">
+          <div class="pop_item">
+            <div class="pop_label">已工作时间</div>
+            <div class="pop_val">3&nbsp;<span>h</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">当前托盘垛数</div>
+            <div class="pop_val">800&nbsp;<span>垛</span></div>
+          </div>
+          <div class="pop_item">
+            <div class="pop_label">当前托盘数量</div>
+            <div class="pop_val">100&nbsp;<span>个</span></div>
+          </div>
+        </div>
+      </div>
+    </div>
+    <!-- <div class="iconfont icon-guanbi close_btn" @click="closePop"></div> -->
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'devicepop',
+  props: {
+    type: String,
+    pkId: String,
+    data: Object,
+    hangj: Number
+  },
+  methods: {
+    closePop () {
+      this.$emit('closePop')
+    }
+  }
+}
+</script>
+
+<style lang="stylus" scoped>
+@import '~@css/mixin'
+.popup_wraper
+  position absolute
+  left 50%
+  transform translateX(-50%) translateY(-80px)
+  bottom 0
+  z-index 100
+  padding 20px 0 30px 0
+  background top center / 100% 100% url(../assets/images/screen3/popup_bg.png) no-repeat
+  _wh(530px, auto)
+.popup_wraper_down
+  bottom auto
+  top 0
+  transform translateX(-50%) translateY(80px)
+.popup_arrow
+  position absolute
+  _wh(22px, 23px)
+  left calc(50% - 11px)
+  bottom -20px
+  animation todown 1.5s ease-in infinite
+  img
+    _wh(100%, 100%)
+.popup_arrow_down
+  bottom auto
+  top -20px
+  animation toup 1.5s ease-in infinite
+  img
+    transform rotateZ(180deg)
+.popup_bg
+  _wh(100%, auto)
+  background none
+  overflow hidden
+.popup_block
+  _wh(100%,100%)
+  padding 0
+.pop_header
+    _wh(calc(100% - 28px), 43px)
+    padding 15px 5px 0 5px
+    margin 0 14px
+    _fj(flex-end)
+    background top center / 100% 18px url(../assets/images/screen3/popup_line.png) no-repeat
+.pop_name
+  width 50%
+  _font(14px,28px,#32C5FF,,left)
+  text-shadow 2px 2px 4px #A6E6FF
+  margin-bottom 8px
+.pop_status
+  _wh(50%, 28px)
+  _fj(flex-end)
+.pop_status_dot
+    _wh(15px, 15px)
+    border-radius 50%
+    margin-right 10px
+.pop_status_text
+    _font(16px, 28px, #fff,,)
+.pop_content
+  _wh(calc(100% - 14px), auto)
+  padding 0 5px
+  margin 0 7px
+  overflow-y auto
+  _fj(flex-start)
+  align-content flex-start
+  flex-wrap wrap
+.pop_item
+    _wh(calc(50% - 14px), 24px)
+    _fj(row,flex-start)
+    background-color rgba(50,197,255,50%)
+    border-left 3px solid #fdfd0f
+    margin 0 7px 5px 7px
+    padding 0 10px 0 5px
+.pop_item_l
+  width calc(100% - 14px)
+.pop_label
+    width 80px
+    _font(12px, 24px, #fff,,left)
+.pop_val
+    width calc(100% - 80px)
+    _font(13px, 24px, #0ff,,left)
+    white-space nowrap
+    span
+      font-size 13px
+      color #fff
+.icon-guanbi
+    position absolute
+    top -30px
+    right -30px
+    _wh(30px, 30px)
+    _font(18px, 30px, #fff,,center)
+    border 1px solid #fff
+    border-radius 50%
+    background transparent
+@keyframes todown {
+    0% {
+      transform: translateY(0)
+    }
+    100% {
+      transform: translateY(20px)
+    }
+}
+@keyframes toup {
+    0% {
+      transform: translateY(0)
+    }
+    100% {
+      transform: translateY(-20px)
+    }
+}
+.popup_table
+  width calc(100% - 14px)
+  margin 0 7px
+  tr
+    th
+      _font(12px, 24px, #0ff,,left)
+      background-color #262f52
+      padding 0 10px
+    td
+      _font(13px, 24px, #fff,,left)
+      padding 0 10px
+    &:nth-child(2n)
+      td
+        background rgba(38,47,82,0.50)
+    &:nth-child(2n+1)
+      td
+        background rgba(38,47,82,0.80)
+</style>
diff --git a/src/components/workshop.vue b/src/components/workshop.vue
index 091a87a..ebdd35a 100644
--- a/src/components/workshop.vue
+++ b/src/components/workshop.vue
@@ -19,89 +19,6 @@
           <div class="status_name">故障</div>
       </div>
     </div>
-    <div class="machine_block machine_block_1">
-      <div class="machine_combine">
-        <div class="yao_line_1">
-          <div v-for="(e, i) in [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]" :key="i" class="yao_line_dot"></div>
-        </div>
-        <div class="yao_line_1 yao_line_2">
-          <div v-for="(e, i) in [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]" :key="i" class="yao_line_dot"></div>
-        </div>
-        <!-- <div class="yao_bg_1"></div> -->
-        <!-- <div class="yao_bg_1 yao_bg_2"></div> -->
-        <div class="yao_wrap" v-for="(e, i) in kiln" :key="e.equipment" :class="'yao_' + (i + 1)">
-          <div class="yao_layer1"></div>
-          <div class="yao_layer2"></div>
-          <div class="yao_layer3" :style="{background: ['#11ff0d', '#fdfd0f', '#bfbfbf', '#ff1016'][Number(e.status) - 1]}"></div>
-          <div class="yao_layer4"></div>
-          <div class="yao_layer4 yao_layer5"></div>
-        </div>
-        <div class="yao_wrap" v-for="(e, i) in coolingConveyorLine" :key="e.equipment" :class="'yao_' + (i + 4)">
-          <div class="yao_layer1"></div>
-          <div class="yao_layer2"></div>
-          <div class="yao_layer3" :style="{background: ['#11ff0d', '#fdfd0f', '#bfbfbf', '#ff1016'][Number(e.status) - 1]}"></div>
-          <div class="p_device yytsj_wrap">
-            <img class="device_img" src="../assets/images/device/yytsj_green.png" alt="">
-          </div>
-          <div class="p_device yygcj_wrap">
-            <img class="device_img" src="../assets/images/device/yygcj_green.png" alt="">
-          </div>
-        </div>
-        <div class="p_device" v-for="(e, i) in gantryRobot" :key="e.equipment" :class="'yjbyx_' + (i + 1)">
-          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/yjbyx_green.png" alt="">
-          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/yjbyx_yellow.png" alt="">
-          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/yjbyx_gray.png" alt="">
-          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/yjbyx_red.png" alt="">
-        </div>
-        <div class="p_device ktp_yao_back_wrap_1">
-          <div class="ktp_yao_back" v-for="e in backWarehouse" :key="e.equipment">
-            <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
-            <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
-            <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
-            <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="">
-          </div>
-        </div>
-        <div class="p_device dpj_wrap">
-          <img v-show="trayStacker.status === '1'" class="device_img" src="../assets/images/device/dpj_green.png" alt="">
-          <img v-show="trayStacker.status === '2'" class="device_img" src="../assets/images/device/dpj_yellow.png" alt="">
-          <img v-show="trayStacker.status === '3'" class="device_img" src="../assets/images/device/dpj_gray.png" alt="">
-          <img v-show="trayStacker.status === '4'" class="device_img" src="../assets/images/device/dpj_red.png" alt="">
-        </div>
-        <div class="p_device ltssj_wrap">
-          <!-- <img class="device_img" src="../assets/images/device/ltssj_green.png" alt=""> -->
-          <div class="ltssj" v-for="e in  conveyorLine" :key="e.equipment">
-            <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
-            <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
-            <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
-            <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="">
-          </div>
-        </div>
-      </div>
-    </div>
-    <div class="p_device ktp_yao_front_wrap">
-      <div class="ktp_yao_front" v-for="e in  frontWarehouse" :key="e.equipment">
-        <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktp_green.png" alt="">
-        <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktp_yellow.png" alt="">
-        <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktp_gray.png" alt="">
-        <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktp_red.png" alt="">
-      </div>
-    </div>
-    <div class="p_device cpj_ssx_wrap">
-      <div class="ssx_wrap">
-        <div class="ssx" v-for="(e, i) in vconveyorLine" :key="i">
-          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ssx_green.png" alt="">
-          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ssx_yellow.png" alt="">
-          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ssx_gray.png" alt="">
-          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ssx_red.png" alt="">
-        </div>
-      </div>
-      <div class="p_device cpj_wrap">
-        <img v-show="trayDestacker.status === '1'" class="device_img" src="../assets/images/device/cpj_green.png" alt="">
-        <img v-show="trayDestacker.status === '2'" class="device_img" src="../assets/images/device/cpj_yellow.png" alt="">
-        <img v-show="trayDestacker.status === '3'" class="device_img" src="../assets/images/device/cpj_gray.png" alt="">
-        <img v-show="trayDestacker.status === '4'" class="device_img" src="../assets/images/device/cpj_red.png" alt="">
-      </div>
-    </div>
     <div class="machine_block machine_block_2">
       <div class="machine_combine">
         <div class="p_device weilan_wrap_1">
@@ -117,37 +34,211 @@
           <img class="device_img" src="../assets/images/device/ssj_gray.png" alt="">
         </div>
         <div class="p_device ktp_cmd_wrap" v-for="(e, i) in loadLocation" :key="i" :class="'ktp_cmd_wrap_' + (i + 1)">
-          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
-          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
-          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
-          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="">
+          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="" @click="getInfo(e)">
+          <device-pop
+            type="tp"
+            :pkId="pkId"
+            :data="e"
+            @closePop="closePop"
+          ></device-pop>
         </div>
         <div class="p_device robot_cmd_wrap_1" :class="depalletizingRobot.status === '1' ? 'rotate_2' : ''">
-          <img v-show="depalletizingRobot.status === '1'" class="device_img" src="../assets/images/device/robot_cmd_green.png" alt="">
-          <img v-show="depalletizingRobot.status === '2'" class="device_img" src="../assets/images/device/robot_cmd_yellow.png" alt="">
-          <img v-show="depalletizingRobot.status === '3'" class="device_img" src="../assets/images/device/robot_cmd_gray.png" alt="">
-          <img v-show="depalletizingRobot.status === '4'" class="device_img" src="../assets/images/device/robot_cmd_red.png" alt="">
+          <img v-show="depalletizingRobot.status === '1'" class="device_img" src="../assets/images/device/robot_cmd_green.png" alt="" @click="getInfo(depalletizingRobot)">
+          <img v-show="depalletizingRobot.status === '2'" class="device_img" src="../assets/images/device/robot_cmd_yellow.png" alt="" @click="getInfo(depalletizingRobot)">
+          <img v-show="depalletizingRobot.status === '3'" class="device_img" src="../assets/images/device/robot_cmd_gray.png" alt="" @click="getInfo(depalletizingRobot)">
+          <img v-show="depalletizingRobot.status === '4'" class="device_img" src="../assets/images/device/robot_cmd_red.png" alt="" @click="getInfo(depalletizingRobot)">
+        </div>
+        <div class="p_device robot_cmd_wrap_1">
+          <device-pop
+            type="cdjxs"
+            :pkId="pkId"
+            :data="depalletizingRobot"
+            @closePop="closePop"
+          ></device-pop>
         </div>
         <div class="p_device robot_cmd_wrap_1 robot_cmd_wrap_2" :class="palletizingRobot.status === '1' ? 'rotate_3' : ''">
-          <img v-show="palletizingRobot.status === '1'" class="device_img" src="../assets/images/device/robot_cmd_green.png" alt="">
-          <img v-show="palletizingRobot.status === '2'" class="device_img" src="../assets/images/device/robot_cmd_yellow.png" alt="">
-          <img v-show="palletizingRobot.status === '3'" class="device_img" src="../assets/images/device/robot_cmd_gray.png" alt="">
-          <img v-show="palletizingRobot.status === '4'" class="device_img" src="../assets/images/device/robot_cmd_red.png" alt="">
+          <img v-show="palletizingRobot.status === '1'" class="device_img" src="../assets/images/device/robot_cmd_green.png" alt="" @click="getInfo(palletizingRobot)">
+          <img v-show="palletizingRobot.status === '2'" class="device_img" src="../assets/images/device/robot_cmd_yellow.png" alt="" @click="getInfo(palletizingRobot)">
+          <img v-show="palletizingRobot.status === '3'" class="device_img" src="../assets/images/device/robot_cmd_gray.png" alt="" @click="getInfo(palletizingRobot)">
+          <img v-show="palletizingRobot.status === '4'" class="device_img" src="../assets/images/device/robot_cmd_red.png" alt="" @click="getInfo(palletizingRobot)">
+        </div>
+        <div class="p_device robot_cmd_wrap_1 robot_cmd_wrap_2">
+          <device-pop
+            type="cdjxs"
+            :pkId="pkId"
+            :data="palletizingRobot"
+            @closePop="closePop"
+          ></device-pop>
         </div>
         <div class="p_device fmjxt_wrap">
-          <img v-show="laminatingMachine.status === '1'" class="device_img" src="../assets/images/device/fmjxt_green.png" alt="">
-          <img v-show="laminatingMachine.status === '2'" class="device_img" src="../assets/images/device/fmjxt_yellow.png" alt="">
-          <img v-show="laminatingMachine.status === '3'" class="device_img" src="../assets/images/device/fmjxt_gray.png" alt="">
-          <img v-show="laminatingMachine.status === '4'" class="device_img" src="../assets/images/device/fmjxt_red.png" alt="">
+          <img v-show="laminatingMachine.status === '1'" class="device_img" src="../assets/images/device/fmjxt_green.png" alt="" @click="getInfo(laminatingMachine)">
+          <img v-show="laminatingMachine.status === '2'" class="device_img" src="../assets/images/device/fmjxt_yellow.png" alt="" @click="getInfo(laminatingMachine)">
+          <img v-show="laminatingMachine.status === '3'" class="device_img" src="../assets/images/device/fmjxt_gray.png" alt="" @click="getInfo(laminatingMachine)">
+          <img v-show="laminatingMachine.status === '4'" class="device_img" src="../assets/images/device/fmjxt_red.png" alt="" @click="getInfo(laminatingMachine)">
+          <device-pop
+            type="cdjxs"
+            :pkId="pkId"
+            :data="laminatingMachine"
+            @closePop="closePop"
+          ></device-pop>
         </div>
         <div class="p_device ktp_cmd_wrap" v-for="(e, i) in sunloadLocation" :key="e.equipment" :class="'ktp_cmd_wrap_' + (i + 3)">
-          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
-          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
-          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
-          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="">
+          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="" @click="getInfo(e)">
+          <device-pop
+            type="tp"
+            :pkId="pkId"
+            :data="e"
+            @closePop="closePop"
+          ></device-pop>
         </div>
       </div>
     </div>
+    <div class="machine_block machine_block_1">
+      <div class="machine_combine">
+        <div class="yao_line_1">
+          <div v-for="(e, i) in [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]" :key="i" class="yao_line_dot"></div>
+        </div>
+        <div class="yao_line_1 yao_line_2">
+          <div v-for="(e, i) in [1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1]" :key="i" class="yao_line_dot"></div>
+        </div>
+        <!-- <div class="yao_bg_1"></div> -->
+        <!-- <div class="yao_bg_1 yao_bg_2"></div> -->
+        <div class="yao_wrap" v-for="(e, i) in kiln" :key="e.equipment" :class="'yao_' + (i + 1)" @click="getInfo(e)">
+          <div class="yao_layer1"></div>
+          <div class="yao_layer2"></div>
+          <div class="yao_layer3" :style="{background: ['#11ff0d', '#fdfd0f', '#bfbfbf', '#ff1016'][Number(e.status) - 1]}">
+          </div>
+          <div class="yao_layer4"></div>
+          <div class="yao_layer4 yao_layer5"></div>
+          <device-pop
+            type="yao"
+            :pkId="pkId"
+            :data="e"
+            @closePop="closePop"
+          ></device-pop>
+        </div>
+        <div class="yao_wrap" v-for="(e, i) in coolingConveyorLine" :key="e.equipment" :class="'yao_' + (i + 4)">
+          <div class="yao_layer1"></div>
+          <div class="yao_layer2"></div>
+          <div class="yao_layer3" :style="{background: ['#11ff0d', '#fdfd0f', '#bfbfbf', '#ff1016'][Number(e.status) - 1]}" @click="getInfo(e)">
+            <device-pop
+              type="ssx"
+              :pkId="pkId"
+              :data="e"
+              @closePop="closePop"
+            ></device-pop>
+          </div>
+          <div class="p_device yytsj_wrap">
+            <img class="device_img" src="../assets/images/device/yytsj_green.png" alt="">
+          </div>
+          <div class="p_device yygcj_wrap">
+            <img class="device_img" src="../assets/images/device/yygcj_green.png" alt="">
+          </div>
+        </div>
+        <div class="p_device" v-for="(e, i) in gantryRobot" :key="e.equipment" :class="'yjbyx_' + (i + 1)">
+          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/yjbyx_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/yjbyx_yellow.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/yjbyx_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/yjbyx_red.png" alt="" @click="getInfo(e)">
+          <device-pop
+            type="hangj"
+            :pkId="pkId"
+            :data="e"
+            :hangj="i"
+            @closePop="closePop"
+          ></device-pop>
+        </div>
+        <div class="p_device ktp_yao_back_wrap_1">
+          <div class="ktp_yao_back" v-for="e in backWarehouse" :key="e.equipment">
+            <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="" @click="getInfo(e)">
+            <device-pop
+            type="tp"
+            :pkId="pkId"
+            :data="e"
+            @closePop="closePop"
+          ></device-pop>
+          </div>
+        </div>
+        <div class="p_device dpj_wrap">
+          <img v-show="trayStacker.status === '1'" class="device_img" src="../assets/images/device/dpj_green.png" alt="" @click="getInfo(trayStacker)">
+          <img v-show="trayStacker.status === '2'" class="device_img" src="../assets/images/device/dpj_yellow.png" alt="" @click="getInfo(trayStacker)">
+          <img v-show="trayStacker.status === '3'" class="device_img" src="../assets/images/device/dpj_gray.png" alt="" @click="getInfo(trayStacker)">
+          <img v-show="trayStacker.status === '4'" class="device_img" src="../assets/images/device/dpj_red.png" alt="" @click="getInfo(trayStacker)">
+          <device-pop
+            type="cpj"
+            :pkId="pkId"
+            :data="trayStacker"
+            @closePop="closePop"
+          ></device-pop>
+        </div>
+        <div class="p_device ltssj_wrap">
+          <!-- <img class="device_img" src="../assets/images/device/ltssj_green.png" alt=""> -->
+          <div class="ltssj" v-for="e in  conveyorLine" :key="e.equipment">
+            <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="" @click="getInfo(e)">
+            <device-pop
+              type="ssx"
+              :pkId="pkId"
+              :data="e"
+              @closePop="closePop"
+            ></device-pop>
+          </div>
+        </div>
+      </div>
+    </div>
+    <div class="p_device ktp_yao_front_wrap">
+      <div class="ktp_yao_front" v-for="e in  frontWarehouse" :key="e.equipment">
+        <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktp_green.png" alt="" @click="getInfo(e)">
+        <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktp_yellow.png" alt="" @click="getInfo(e)">
+        <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktp_gray.png" alt="" @click="getInfo(e)">
+        <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktp_red.png" alt="" @click="getInfo(e)">
+        <device-pop
+          type="tp"
+          :pkId="pkId"
+          :data="e"
+          @closePop="closePop"
+        ></device-pop>
+      </div>
+    </div>
+    <div class="p_device cpj_ssx_wrap">
+      <div class="ssx_wrap">
+        <div class="ssx" v-for="(e, i) in vconveyorLine" :key="i">
+          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ssx_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ssx_yellow.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ssx_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ssx_red.png" alt="" @click="getInfo(e)">
+          <device-pop
+            type="ssx"
+            :pkId="pkId"
+            :data="e"
+            @closePop="closePop"
+          ></device-pop>
+        </div>
+      </div>
+      <div class="p_device cpj_wrap">
+        <img v-show="trayDestacker.status === '1'" class="device_img" src="../assets/images/device/cpj_green.png" alt="" @click="getInfo(trayDestacker)">
+        <img v-show="trayDestacker.status === '2'" class="device_img" src="../assets/images/device/cpj_yellow.png" alt="" @click="getInfo(trayDestacker)">
+        <img v-show="trayDestacker.status === '3'" class="device_img" src="../assets/images/device/cpj_gray.png" alt="" @click="getInfo(trayDestacker)">
+        <img v-show="trayDestacker.status === '4'" class="device_img" src="../assets/images/device/cpj_red.png" alt="" @click="getInfo(trayDestacker)">
+        <device-pop
+          type="ssx"
+          :pkId="pkId"
+          :data="trayDestacker"
+          @closePop="closePop"
+        ></device-pop>
+      </div>
+    </div>
     <div class="machine_block machine_block_3">
       <div class="machine_combine">
         <div class="yj_630_blocks">
@@ -183,63 +274,73 @@
               <img class="device_img" src="../assets/images/device/robot_630_gray.png" alt="">
             </div>
           </div>
-          <div class="yj_630_block" v-for="e in press.slice(0,3)" :key="e.equipment">
-            <div class="p_device yj_630_wrap_1">
-              <img v-show="e.pressMachine1 === '1'" class="device_img" src="../assets/images/device/630/yj_green.png" alt="">
-              <img v-show="e.pressMachine1 === '2'" class="device_img" src="../assets/images/device/630/yj_yellow.png" alt="">
-              <img v-show="e.pressMachine1 === '3'" class="device_img" src="../assets/images/device/630/yj_gray.png" alt="">
-              <img v-show="e.pressMachine1 === '4'" class="device_img" src="../assets/images/device/630/yj_red.png" alt="">
+          <div class="yj_630_block yj_630_block_reverse" v-for="e in press.slice(0,3)" :key="e.equipment">
+            <div class="p_device slw_630_wrap_1" v-for="(el, j) in e.loadLocation" :key="el.equipment" :class="{'slw_630_wrap_2': j === 1}">
+              <img v-show="el.status === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(el)">
+              <img v-show="el.status === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(el)">
+              <img v-show="el.status === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(el)">
+              <img v-show="el.status === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(el)">
+              <device-pop
+                type="lz"
+                :pkId="pkId"
+                :data="el"
+                @closePop="closePop"
+              ></device-pop>
             </div>
-            <div class="p_device yj_630_wrap_1 yj_630_wrap_2">
-              <img v-show="e.pressMachine2 === '1'" class="device_img" src="../assets/images/device/630/yj_green.png" alt="">
-              <img v-show="e.pressMachine2 === '2'" class="device_img" src="../assets/images/device/630/yj_yellow.png" alt="">
-              <img v-show="e.pressMachine2 === '3'" class="device_img" src="../assets/images/device/630/yj_gray.png" alt="">
-              <img v-show="e.pressMachine2 === '4'" class="device_img" src="../assets/images/device/630/yj_red.png" alt="">
-            </div>
-            <div class="p_device slw_630_wrap_1">
-              <img v-show="e.loadLocation1 === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
-              <img v-show="e.loadLocation1 === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="">
-              <img v-show="e.loadLocation1 === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="">
-              <img v-show="e.loadLocation1 === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="">
-            </div>
-            <div class="p_device slw_630_wrap_1 slw_630_wrap_2">
-              <img v-show="e.loadLocation1 === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
-              <img v-show="e.loadLocation1 === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="">
-              <img v-show="e.loadLocation1 === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="">
-              <img v-show="e.loadLocation1 === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="">
-            </div>
-            <div class="p_device mdssj_630_wrap_1">
-              <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/630/mdssj_green.png" alt="">
-              <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/630/mdssj_yellow.png" alt="">
-              <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/630/mdssj_gray.png" alt="">
-              <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/630/mdssj_red.png" alt="">
-            </div>
-            <div class="p_device mdssj_630_wrap_1 mdssj_630_wrap_2">
-              <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/630/mdssj_green.png" alt="">
-              <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/630/mdssj_yellow.png" alt="">
-              <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/630/mdssj_gray.png" alt="">
-              <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/630/mdssj_red.png" alt="">
+            <div v-for="(el, j) in e.pressMachine" :key="el.equipment">
+              <div class="p_device yj_630_wrap_1" :class="{'yj_630_wrap_2': j === 1}">
+                <img v-show="el.status === '1'" class="device_img" src="../assets/images/device/630/yj_green.png" alt="" @click="getInfo(el)">
+                <img v-show="el.status === '2'" class="device_img" src="../assets/images/device/630/yj_yellow.png" alt="" @click="getInfo(el)">
+                <img v-show="el.status === '3'" class="device_img" src="../assets/images/device/630/yj_gray.png" alt="" @click="getInfo(el)">
+                <img v-show="el.status === '4'" class="device_img" src="../assets/images/device/630/yj_red.png" alt="" @click="getInfo(el)">
+                <device-pop
+                  type="yj"
+                  :pkId="pkId"
+                  :data="el"
+                  @closePop="closePop"
+                ></device-pop>
+              </div>
+              <div class="p_device mdssj_630_wrap_1" :class="{'mdssj_630_wrap_2': j === 1}">
+                <img v-show="el.status === '1'" class="device_img" src="../assets/images/device/630/mdssj_green.png" alt="">
+                <img v-show="el.status === '2'" class="device_img" src="../assets/images/device/630/mdssj_yellow.png" alt="">
+                <img v-show="el.status === '3'" class="device_img" src="../assets/images/device/630/mdssj_gray.png" alt="">
+                <img v-show="el.status === '4'" class="device_img" src="../assets/images/device/630/mdssj_red.png" alt="">
+              </div>
             </div>
             <div class="p_device lmyzj_630_wrap_1">
-              <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/630/lmyzj_green.png" alt="">
-              <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/630/lmyzj_yellow.png" alt="">
-              <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/630/lmyzj_gray.png" alt="">
-              <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/630/lmyzj_red.png" alt="">
+              <img v-show="e.palletizingRobot.status === '1'" class="device_img" src="../assets/images/device/630/lmyzj_green.png" alt="">
+              <img v-show="e.palletizingRobot.status === '2'" class="device_img" src="../assets/images/device/630/lmyzj_yellow.png" alt="">
+              <img v-show="e.palletizingRobot.status === '3'" class="device_img" src="../assets/images/device/630/lmyzj_gray.png" alt="">
+              <img v-show="e.palletizingRobot.status === '4'" class="device_img" src="../assets/images/device/630/lmyzj_red.png" alt="">
             </div>
             <div class="p_device weilan_630_wrap">
               <img class="device_img" src="../assets/images/device/630/wl.png" alt="">
             </div>
             <div class="p_device ktp_630_wrap" v-for="(el, j) in e.unloadLocation" :key="el.equipment" :class="'ktp_630_wrap_' + (j+1)">
-              <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
-              <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
-              <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
-              <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="">
+              <img v-show="el.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="" @click="getInfo(el)">
+              <img v-show="el.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="" @click="getInfo(el)">
+              <img v-show="el.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(el)">
+              <img v-show="el.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="" @click="getInfo(el)">
+              <device-pop
+                type="tp"
+                :pkId="pkId"
+                :data="el"
+                @closePop="closePop"
+              ></device-pop>
             </div>
-            <div class="p_device robot_630_wrap" :class="e.status === '1' ? 'rotate_1' : ''">
-              <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/robot_630_green.png" alt="">
-              <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/robot_630_yellow.png" alt="">
-              <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/robot_630_gray.png" alt="">
-              <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/robot_630_red.png" alt="">
+            <div class="p_device robot_630_wrap" :class="e.palletizingRobot.status === '1' ? 'rotate_1' : ''">
+              <img v-show="e.palletizingRobot.status === '1'" class="device_img" src="../assets/images/device/robot_2500_green.png" alt="" @click="getInfo(e.palletizingRobot)">
+              <img v-show="e.palletizingRobot.status === '2'" class="device_img" src="../assets/images/device/robot_2500_yellow.png" alt="" @click="getInfo(e.palletizingRobot)">
+              <img v-show="e.palletizingRobot.status === '3'" class="device_img" src="../assets/images/device/robot_2500_gray.png" alt="" @click="getInfo(e.palletizingRobot)">
+              <img v-show="e.palletizingRobot.status === '4'" class="device_img" src="../assets/images/device/robot_2500_red.png" alt="" @click="getInfo(e.palletizingRobot)">
+            </div>
+            <div class="p_device robot_630_wrap">
+              <device-pop
+                type="yj"
+                :pkId="pkId"
+                :data="e.palletizingRobot"
+                @closePop="closePop"
+              ></device-pop>
             </div>
           </div>
         </div>
@@ -248,86 +349,114 @@
     <div class="blue_line blue_line_1"></div>
     <div class="blue_line blue_line_2"></div>
     <div class="machine_block machine_block_4">
-      <div v-if="press.length > 3" class="yj_1600_block_1">
+      <div v-if="press.length >= 3" class="yj_1600_block_1">
         <div class="p_device weilan_1600_wrap">
           <img class="device_img" src="../assets/images/device/630/wl.png" alt="">
         </div>
-        <div class="p_device slw_1600_wrap slw_1600_wrap_1">
-          <img v-show="press[3].loadLocation1 === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
-          <img v-show="press[3].loadLocation1 === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="">
-          <img v-show="press[3].loadLocation1 === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="">
-          <img v-show="press[3].loadLocation1 === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="">
-        </div>
-        <div class="p_device slw_1600_wrap slw_1600_wrap_2">
-          <img v-show="press[3].loadLocation2 === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
-          <img v-show="press[3].loadLocation2 === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="">
-          <img v-show="press[3].loadLocation2 === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="">
-          <img v-show="press[3].loadLocation2 === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="">
-        </div>
-        <div class="p_device slw_1600_wrap slw_1600_wrap_3">
-          <img class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="">
-        </div>
-        <div class="p_device slw_1600_wrap slw_1600_wrap_4">
-          <img class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="">
+        <div class="p_device slw_1600_wrap" v-for="(e, i) in press[3].loadLocation" :key="e.equipment" :class="'slw_1600_wrap_' + (i + 1)">
+          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
+          <device-pop
+            type="lz"
+            :pkId="pkId"
+            :data="e"
+            @closePop="closePop"
+          ></device-pop>
         </div>
         <div class="p_device yj_1600_wrap_1">
-          <img v-show="press[3].pressMachine1 === '1'" class="device_img" src="../assets/images/device/630/yj_green.png" alt="">
-          <img v-show="press[3].pressMachine1 === '2'" class="device_img" src="../assets/images/device/630/yj_yellow.png" alt="">
-          <img v-show="press[3].pressMachine1 === '3'" class="device_img" src="../assets/images/device/630/yj_gray.png" alt="">
-          <img v-show="press[3].pressMachine1 === '4'" class="device_img" src="../assets/images/device/630/yj_red.png" alt="">
+          <img v-show="press[3].pressMachine[0].status === '1'" class="device_img" src="../assets/images/device/630/yj_green.png" alt="" @click="getInfo(press[3].pressMachine[0])">
+          <img v-show="press[3].pressMachine[0].status === '2'" class="device_img" src="../assets/images/device/630/yj_yellow.png" alt="" @click="getInfo(press[3].pressMachine[0])">
+          <img v-show="press[3].pressMachine[0].status === '3'" class="device_img" src="../assets/images/device/630/yj_gray.png" alt="" @click="getInfo(press[3].pressMachine[0])">
+          <img v-show="press[3].pressMachine[0].status === '4'" class="device_img" src="../assets/images/device/630/yj_red.png" alt="" @click="getInfo(press[3].pressMachine[0])">
+          <device-pop
+            type="yj"
+            :pkId="pkId"
+            :data="press[3].pressMachine[0]"
+            @closePop="closePop"
+          ></device-pop>
         </div>
-        <!-- <div class="p_device qzj_1600_wrap">
-          <img class="device_img" src="../assets/images/device/1600/qzj_gray.png" alt="">
+        <div class="p_device ktp_1600_wrap" v-for="(e, i) in press[3].unloadLocation" :key="e.equipment" :class="'ktp_1600_wrap_' + (i+1)">
+          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="" @click="getInfo(e)">
+          <device-pop
+            type="tp"
+            :pkId="pkId"
+            :data="e"
+            @closePop="closePop"
+          ></device-pop>
         </div>
-        <div class="p_device jcj_1600_wrap">
-          <img class="device_img" src="../assets/images/device/1600/jcj_gray.png" alt="">
-        </div> -->
-        <div class="p_device ktp_1600_wrap" v-for="(e, i) in press[3].unloadLocation" :key="i" :class="'ktp_1600_wrap_' + (i+1)">
-          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
-          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
-          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
-          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="">
+        <div class="p_device robot_1600_wrap" :class="press[3].palletizingRobot.status === '1' ? 'rotate_4' : ''">
+          <img v-show="press[3].palletizingRobot.status === '1'" class="device_img" src="../assets/images/device/robot_630_green.png" alt="" @click="getInfo(press[3].palletizingRobot)">
+          <img v-show="press[3].palletizingRobot.status === '2'" class="device_img" src="../assets/images/device/robot_630_yellow.png" alt="" @click="getInfo(press[3].palletizingRobot)">
+          <img v-show="press[3].palletizingRobot.status === '3'" class="device_img" src="../assets/images/device/robot_630_gray.png" alt="" @click="getInfo(press[3].palletizingRobot)">
+          <img v-show="press[3].palletizingRobot.status === '4'" class="device_img" src="../assets/images/device/robot_630_red.png" alt="" @click="getInfo(press[3].palletizingRobot)">
         </div>
-        <div class="p_device robot_1600_wrap" :class="press[3].status === '1' ? 'rotate_4' : ''">
-          <img v-show="press[3].status === '1'" class="device_img" src="../assets/images/device/robot_630_green.png" alt="">
-          <img v-show="press[3].status === '2'" class="device_img" src="../assets/images/device/robot_630_yellow.png" alt="">
-          <img v-show="press[3].status === '3'" class="device_img" src="../assets/images/device/robot_630_gray.png" alt="">
-          <img v-show="press[3].status === '4'" class="device_img" src="../assets/images/device/robot_630_red.png" alt="">
+        <div class="p_device robot_1600_wrap">
+          <device-pop
+            type="yj"
+            :pkId="pkId"
+            :data="press[3].palletizingRobot"
+            @closePop="closePop"
+          ></device-pop>
         </div>
       </div>
-      <div v-if="press.length > 4" class="yj_1600_block_1 yj_1600_block_2">
+      <div v-if="press.length >= 4" class="yj_1600_block_1 yj_1600_block_2">
         <div class="p_device weilan_1600_wrap">
           <img class="device_img" src="../assets/images/device/630/wl.png" alt="">
         </div>
-        <div class="p_device slw_1600_wrap slw_1600_wrap_2">
-          <img v-show="press[3].loadLocation1 === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
-          <img v-show="press[3].loadLocation1 === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="">
-          <img v-show="press[3].loadLocation1 === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="">
-          <img v-show="press[3].loadLocation1 === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="">
-        </div>
-        <div class="p_device slw_1600_wrap slw_1600_wrap_4">
-          <img v-show="press[3].loadLocation2 === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
-          <img v-show="press[3].loadLocation2 === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="">
-          <img v-show="press[3].loadLocation2 === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="">
-          <img v-show="press[3].loadLocation2 === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="">
+        <div class="p_device slw_1600_wrap slw_1600_wrap_2" v-for="(e, i) in press[4].loadLocation" :key="e.equipment" :class="'slw_1600_wrap_' + (2 * i + 2)">
+          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
+          <device-pop
+            type="lz"
+            :pkId="pkId"
+            :data="e"
+            @closePop="closePop"
+          ></device-pop>
         </div>
         <div class="p_device yj_1600_wrap_1">
-          <img v-show="press[3].pressMachine1 === '1'" class="device_img" src="../assets/images/device/630/yj_green.png" alt="">
-          <img v-show="press[3].pressMachine1 === '2'" class="device_img" src="../assets/images/device/630/yj_yellow.png" alt="">
-          <img v-show="press[3].pressMachine1 === '3'" class="device_img" src="../assets/images/device/630/yj_gray.png" alt="">
-          <img v-show="press[3].pressMachine1 === '4'" class="device_img" src="../assets/images/device/630/yj_red.png" alt="">
+          <img v-show="press[4].pressMachine[0].status === '1'" class="device_img" src="../assets/images/device/630/yj_green.png" alt="" @click="getInfo(press[4].pressMachine[0])">
+          <img v-show="press[4].pressMachine[0].status === '2'" class="device_img" src="../assets/images/device/630/yj_yellow.png" alt="" @click="getInfo(press[4].pressMachine[0])">
+          <img v-show="press[4].pressMachine[0].status === '3'" class="device_img" src="../assets/images/device/630/yj_gray.png" alt="" @click="getInfo(press[4].pressMachine[0])">
+          <img v-show="press[4].pressMachine[0].status === '4'" class="device_img" src="../assets/images/device/630/yj_red.png" alt="" @click="getInfo(press[4].pressMachine[0])">
+          <device-pop
+            type="yj"
+            :pkId="pkId"
+            :data="press[4].pressMachine[0]"
+            @closePop="closePop"
+          ></device-pop>
         </div>
-        <div class="p_device ktp_1600_wrap" v-for="(e, i) in press[3].unloadLocation" :key="i" :class="'ktp_1600_wrap_' + (i+1)">
-          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
-          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
-          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
-          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="">
+        <div class="p_device ktp_1600_wrap" v-for="(e, i) in press[4].unloadLocation" :key="e.equipment" :class="'ktp_1600_wrap_' + (i+1)">
+          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="" @click="getInfo(e)">
+          <device-pop
+            type="tp"
+            :pkId="pkId"
+            :data="e"
+            @closePop="closePop"
+          ></device-pop>
         </div>
-        <div class="p_device robot_1600_wrap" :class="press[3].status === '1' ? 'rotate_4' : ''">
-          <img v-show="press[3].status === '1'" class="device_img" src="../assets/images/device/robot_630_green.png" alt="">
-          <img v-show="press[3].status === '2'" class="device_img" src="../assets/images/device/robot_630_yellow.png" alt="">
-          <img v-show="press[3].status === '3'" class="device_img" src="../assets/images/device/robot_630_gray.png" alt="">
-          <img v-show="press[3].status === '4'" class="device_img" src="../assets/images/device/robot_630_red.png" alt="">
+        <div class="p_device robot_1600_wrap" :class="press[4].palletizingRobot.status === '1' ? 'rotate_4' : ''">
+          <img v-show="press[4].palletizingRobot.status === '1'" class="device_img" src="../assets/images/device/robot_630_green.png" alt="" @click="getInfo(press[4].palletizingRobot)">
+          <img v-show="press[4].palletizingRobot.status === '2'" class="device_img" src="../assets/images/device/robot_630_yellow.png" alt="" @click="getInfo(press[4].palletizingRobot)">
+          <img v-show="press[4].palletizingRobot.status === '3'" class="device_img" src="../assets/images/device/robot_630_gray.png" alt="" @click="getInfo(press[4].palletizingRobot)">
+          <img v-show="press[4].palletizingRobot.status === '4'" class="device_img" src="../assets/images/device/robot_630_red.png" alt="" @click="getInfo(press[4].palletizingRobot)">
+        </div>
+        <div class="p_device robot_1600_wrap">
+          <device-pop
+            type="yj"
+            :pkId="pkId"
+            :data="press[4].palletizingRobot"
+            @closePop="closePop"
+          ></device-pop>
         </div>
       </div>
       <div class="yj_1600_block_1 yj_1250_block">
@@ -350,48 +479,89 @@
           <img class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
         </div>
       </div>
-      <div v-if="press.length > 4" class="yj_1600_block_1 yj_2500_block">
+      <div v-if="press.length >= 5" class="yj_1600_block_1 yj_2500_block">
         <div class="p_device weilan_2500_wrap">
           <img class="device_img" src="../assets/images/device/2500/wl.png" alt="">
         </div>
-        <!-- <div class="p_device slw_2500_wrap">
-          <img v-show="press[4].loadLocation1 === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
-          <img v-show="press[4].loadLocation1 === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="">
-          <img v-show="press[4].loadLocation1 === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="">
-          <img v-show="press[4].loadLocation1 === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="">
-        </div> -->
         <div class="p_device yj_2500_wrap">
-          <img v-show="press[4].pressMachine1 === '1'" class="device_img" src="../assets/images/device/1600/yj_green.png" alt="">
-          <img v-show="press[4].pressMachine1 === '2'" class="device_img" src="../assets/images/device/1600/yj_yellow.png" alt="">
-          <img v-show="press[4].pressMachine1 === '3'" class="device_img" src="../assets/images/device/1600/yj_gray.png" alt="">
-          <img v-show="press[4].pressMachine1 === '4'" class="device_img" src="../assets/images/device/1600/yj_red.png" alt="">
+          <img v-show="press[5].pressMachine[0].status === '1'" class="device_img" src="../assets/images/device/1600/yj_green.png" alt="" @click="getInfo(press[5].pressMachine[0])">
+          <img v-show="press[5].pressMachine[0].status === '2'" class="device_img" src="../assets/images/device/1600/yj_yellow.png" alt="" @click="getInfo(press[5].pressMachine[0])">
+          <img v-show="press[5].pressMachine[0].status === '3'" class="device_img" src="../assets/images/device/1600/yj_gray.png" alt="" @click="getInfo(press[5].pressMachine[0])">
+          <img v-show="press[5].pressMachine[0].status === '4'" class="device_img" src="../assets/images/device/1600/yj_red.png" alt="" @click="getInfo(press[5].pressMachine[0])">
+          <device-pop
+            type="yj"
+            :pkId="pkId"
+            :data="press[5].pressMachine[0]"
+            @closePop="closePop"
+          ></device-pop>
         </div>
         <div class="p_device lz_yyj_wrap_1">
-          <div class="lz_yyj_1" v-for="(e, i) in [1,1,1,1,1,1,1,1]" :key="i">
-            <img class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
+          <div class="lz_yyj_1" v-for="e in press[5].loadLocation.slice(0, 8)" :key="e.equipment">
+            <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
+            <device-pop
+              type="lz"
+              :pkId="pkId"
+              :data="e"
+              @closePop="closePop"
+            ></device-pop>
           </div>
         </div>
         <div class="p_device lz_yyj_wrap_2">
-          <div class="lz_yyj_2" v-for="(e, i) in [1,1,1]" :key="i">
-            <img class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
+          <div class="lz_yyj_2" v-for="(e, i) in press[5].loadLocation.slice(8, 11)" :key="i">
+            <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
+            <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
+            <device-pop
+              type="lz"
+              :pkId="pkId"
+              :data="e"
+              @closePop="closePop"
+            ></device-pop>
           </div>
         </div>
         <div class="p_device ktp_yyj_wrap_3">
           <div class="lz_yyj_3">
-            <img class="device_img" src="../assets/images/device/lz_hj_green.png" alt="">
+            <img v-show="press[5].loadLocation[11].status === '1'" class="device_img" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(press[5].loadLocation[11])">
+            <img v-show="press[5].loadLocation[11].status === '2'" class="device_img" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(press[5].loadLocation[11])">
+            <img v-show="press[5].loadLocation[11].status === '3'" class="device_img" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(press[5].loadLocation[11])">
+            <img v-show="press[5].loadLocation[11].status === '4'" class="device_img" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(press[5].loadLocation[11])">
+            <device-pop
+              type="lz"
+              :pkId="pkId"
+              :data="press[5].loadLocation[11]"
+              @closePop="closePop"
+            ></device-pop>
           </div>
         </div>
-        <div class="p_device ktp_2500_wrap" v-for="(e, i) in press[4].unloadLocation" :key="i" :class="'ktp_2500_wrap_' + (i+1)">
-          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="">
-          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="">
-          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="">
-          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="">
+        <div class="p_device ktp_2500_wrap" v-for="(e, i) in press[5].unloadLocation" :key="e.equipment" :class="'ktp_2500_wrap_' + (i+1)">
+          <img v-show="e.status === '1'" class="device_img" src="../assets/images/device/ktpv_green.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '2'" class="device_img" src="../assets/images/device/ktpv_yellow.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '3'" class="device_img" src="../assets/images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
+          <img v-show="e.status === '4'" class="device_img" src="../assets/images/device/ktpv_red.png" alt="" @click="getInfo(e)">
+          <device-pop
+            type="tp"
+            :pkId="pkId"
+            :data="e"
+            @closePop="closePop"
+          ></device-pop>
         </div>
-        <div class="p_device robot_2500_wrap" :class="press[4].status === '1' ? 'rotate_5' : ''">
-          <img v-show="press[4].status === '1'" class="device_img" src="../assets/images/device/robot_2500_green.png" alt="">
-          <img v-show="press[4].status === '2'" class="device_img" src="../assets/images/device/robot_2500_yellow.png" alt="">
-          <img v-show="press[4].status === '3'" class="device_img" src="../assets/images/device/robot_2500_gray.png" alt="">
-          <img v-show="press[4].status === '4'" class="device_img" src="../assets/images/device/robot_2500_red.png" alt="">
+        <div class="p_device robot_2500_wrap" :class="press[5].palletizingRobot.status === '1' ? 'rotate_5' : ''">
+          <img v-show="press[5].palletizingRobot.status === '1'" class="device_img" src="../assets/images/device/robot_2500_green.png" alt="" @click="getInfo(press[5].palletizingRobot)">
+          <img v-show="press[5].palletizingRobot.status === '2'" class="device_img" src="../assets/images/device/robot_2500_yellow.png" alt="" @click="getInfo(press[5].palletizingRobot)">
+          <img v-show="press[5].palletizingRobot.status === '3'" class="device_img" src="../assets/images/device/robot_2500_gray.png" alt="" @click="getInfo(press[5].palletizingRobot)">
+          <img v-show="press[5].palletizingRobot.status === '4'" class="device_img" src="../assets/images/device/robot_2500_red.png" alt="" @click="getInfo(press[5].palletizingRobot)">
+        </div>
+        <div class="p_device robot_2500_wrap">
+          <device-pop
+            type="tp"
+            :pkId="pkId"
+            :data="press[5].palletizingRobot"
+            @closePop="closePop"
+          ></device-pop>
         </div>
       </div>
     </div>
@@ -411,36 +581,60 @@
         <div class="lz_wrap">
           <div class="lz_inner">
             <div class="lz" v-for="e in unloadLocation.slice(0, 12)" :key="e.equipment">
-              <img v-show="e.status === '1'" src="../assets/images/device/lz_hj_green.png" alt="">
-              <img v-show="e.status === '2'" src="../assets/images/device/lz_hj_yellow.png" alt="">
-              <img v-show="e.status === '3'" src="../assets/images/device/lz_hj_gray.png" alt="">
-              <img v-show="e.status === '4'" src="../assets/images/device/lz_hj_red.png" alt="">
+              <img v-show="e.status === '1'" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '2'" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '3'" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '4'" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
+              <device-pop
+                type="lz"
+                :pkId="pkId"
+                :data="e"
+                @closePop="closePop"
+              ></device-pop>
             </div>
           </div>
           <div class="lz_s_inner lz_s_border">
             <div class="lz_s" v-for="e in unloadLocation.slice(12, 14)" :key="e.equipment">
-              <img v-show="e.status === '1'" src="../assets/images/device/lz_hj_green.png" alt="">
-              <img v-show="e.status === '2'" src="../assets/images/device/lz_hj_yellow.png" alt="">
-              <img v-show="e.status === '3'" src="../assets/images/device/lz_hj_gray.png" alt="">
-              <img v-show="e.status === '4'" src="../assets/images/device/lz_hj_red.png" alt="">
+              <img v-show="e.status === '1'" src="../assets/images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '2'" src="../assets/images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '3'" src="../assets/images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '4'" src="../assets/images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
+              <device-pop
+                type="lz"
+                :pkId="pkId"
+                :data="e"
+                @closePop="closePop"
+              ></device-pop>
             </div>
           </div>
         </div>
         <div class="lz_wrap hlj_wrap">
           <div class="lz_inner">
-            <div class="lz hlj" v-for="e in mixingMachine.slice(0, 12)" :key="e.equipment">
-              <img v-show="e.status === '1'" src="../assets/images/device/hlj_green.png" alt="">
-              <img v-show="e.status === '2'" src="../assets/images/device/hlj_yellow.png" alt="">
-              <img v-show="e.status === '3'" src="../assets/images/device/hlj_gray.png" alt="">
-              <img v-show="e.status === '4'" src="../assets/images/device/hlj_red.png" alt="">
+            <div class="hlj" v-for="e in mixingMachine.slice(0, 12)" :key="e.equipment">
+              <img v-show="e.status === '1'" src="../assets/images/device/hlj_green.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '2'" src="../assets/images/device/hlj_yellow.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '3'" src="../assets/images/device/hlj_gray.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '4'" src="../assets/images/device/hlj_red.png" alt="" @click="getInfo(e)">
+              <device-pop
+                type="hlj"
+                :pkId="pkId"
+                :data="e"
+                @closePop="closePop"
+              ></device-pop>
             </div>
           </div>
           <div class="lz_s_inner hlj_s_border">
-            <div class="lz_s hlj_s" v-for="e in mixingMachine.slice(12, 14)" :key="e.equipment">
-              <img v-show="e.status === '1'" src="../assets/images/device/hlj_s_green.png" alt="">
-              <img v-show="e.status === '2'" src="../assets/images/device/hlj_s_yellow.png" alt="">
-              <img v-show="e.status === '3'" src="../assets/images/device/hlj_s_gray.png" alt="">
-              <img v-show="e.status === '4'" src="../assets/images/device/hlj_s_red.png" alt="">
+            <div class="hlj_s" v-for="e in mixingMachine.slice(12, 14)" :key="e.equipment">
+              <img v-show="e.status === '1'" src="../assets/images/device/hlj_s_green.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '2'" src="../assets/images/device/hlj_s_yellow.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '3'" src="../assets/images/device/hlj_s_gray.png" alt="" @click="getInfo(e)">
+              <img v-show="e.status === '4'" src="../assets/images/device/hlj_s_red.png" alt="" @click="getInfo(e)">
+              <device-pop
+                type="hlj"
+                :pkId="pkId"
+                :data="e"
+                @closePop="closePop"
+              ></device-pop>
             </div>
           </div>
         </div>
@@ -451,12 +645,14 @@
 
 <script>
 import TCanvas from '@components/canvas.vue'
+import DevicePop from '@components/devicepop.vue'
 // import {homepageEquipment} from '@js/getData2.js'
 import {homepageEquipment} from '@js/mork2.js'
 export default {
   name: 'workshop',
   components: {
-    TCanvas
+    TCanvas,
+    DevicePop
   },
   data () {
     return {
@@ -477,7 +673,8 @@ export default {
       coolingConveyorLine: [],
       trayStacker: {},
       vconveyorLine: [],
-      trayDestacker: {}
+      trayDestacker: {},
+      pkId: ''
     }
   },
   created () {
@@ -501,15 +698,22 @@ export default {
       // 压机
       this.press = []
       res.press.palletizingRobot.map((e, i) => {
-        let loadLocation1 = res.press.loadLocation[2 * i].status
-        let loadLocation2 = res.press.loadLocation[2 * i + 1].status
-        let pressMachine1 = i < 3 ? res.press.pressMachine[2 * i].status : res.press.pressMachine[i + 3].status
-        let pressMachine2 = i < 3 ? res.press.pressMachine[2 * i + 1].status : ''
-        let unloadLocation1 = i < 3 ? res.press.unloadLocation[4 * i] : res.press.unloadLocation[4 * i - (i - 3) * 2]
-        let unloadLocation2 = i < 3 ? res.press.unloadLocation[4 * i + 1] : res.press.unloadLocation[4 * i - (i - 3) * 2 + 1]
-        let unloadLocation3 = i < 3 ? res.press.unloadLocation[4 * i + 2] : {}
-        let unloadLocation4 = i < 3 ? res.press.unloadLocation[4 * i + 3] : {}
-        this.press.push({equipment: e.equipment, status: e.status, palletizingRobot: e.palletizingRobot, loadLocation1: loadLocation1, loadLocation2: loadLocation2, pressMachine1: pressMachine1, pressMachine2: pressMachine2, unloadLocation: i < 3 ? [unloadLocation1, unloadLocation2, unloadLocation3, unloadLocation4] : [unloadLocation1, unloadLocation2]})
+        // 压机上料位
+        let loadLocation = []
+        if (i < 3) {
+          loadLocation = res.press.loadLocation.slice(2 * i, 2 * i + 2)
+        } else if (i === 3) {
+          loadLocation = res.press.loadLocation.slice(6, 10)
+        } else if (i === 4) {
+          loadLocation = res.press.loadLocation.slice(10, 12)
+        } else if (i === 5) {
+          loadLocation = res.press.loadLocation.slice(12, 24)
+        }
+        // 压机
+        let pressMachine = i < 3 ? res.press.pressMachine.slice(2 * i, 2 * i + 2) : res.press.pressMachine.slice(i + 3, i + 4)
+        // 压机下料位
+        let unloadLocation = i < 3 ? res.press.unloadLocation.slice(4 * i, 4 * i + 4) : res.press.unloadLocation.slice(2 * i + 6, 2 * i + 8)
+        this.press.push({palletizingRobot: e, loadLocation: loadLocation, pressMachine: pressMachine, unloadLocation: unloadLocation})
       })
       console.log(this.press)
       // 窑前货架
@@ -530,6 +734,12 @@ export default {
       })
       this.vconveyorLine = vconveyorLine
       this.trayDestacker = [...res.vehicleConveyorLine.trayDestacker][0]
+    },
+    getInfo (e) {
+      this.pkId = this.pkId !== e.equipment ? e.equipment : ''
+    },
+    closePop () {
+      this.pkId = ''
     }
   }
 }
@@ -760,7 +970,6 @@ export default {
     margin-right 8%
   &:nth-child(n+4)
     margin-top 4%
-    transform rotate(180deg)
 .yj_630_wrap_1
   _wh(45%, 26%)
 .yj_630_wrap_2
@@ -813,6 +1022,48 @@ export default {
     left auto
     right 10%
     top 75%
+.yj_630_block_reverse
+  .yj_630_wrap_1
+    top auto
+    bottom 0
+  .slw_630_wrap_1
+    top auto
+    bottom 21%
+    left auto
+    right -24%
+  .slw_630_wrap_2
+    top auto
+    bottom 5%
+  .mdssj_630_wrap_1
+    top auto
+    bottom 25%
+    transform rotate(180deg)
+  .lmyzj_630_wrap_1
+    top auto
+    bottom 31%
+    transform rotate(180deg)
+  .weilan_630_wrap
+    top 0
+    bottom auto
+    transform rotate(180deg)
+  .ktp_630_wrap_1
+    top auto
+    bottom 75%
+  .ktp_630_wrap_2
+    top auto
+    bottom 75%
+  .ktp_630_wrap_3
+    top auto
+    bottom 47%
+  .ktp_630_wrap_4
+    top auto
+    bottom 47%
+  .robot_630_wrap
+    top auto
+    bottom 73%
+    img
+      top: -700%;
+      left: -1200%;
 .yj_1600_block_1
   position absolute
   left: 5%;
@@ -981,23 +1232,33 @@ export default {
   border-bottom-right-radius: 5px;
   border-bottom-left-radius: 5px
 .lz
-  _wh(calc(100% / 12), 100%)
+  position relative
+  _wh(3.3%, 100%)
+  margin 0 2.5166666666666666%
   _fj(center)
   img
-    _wh(40%, auto)
+    _wh(100%, auto)
 .lz_s
-  _wh(calc(100% / 2), 100%)
+  position relative
+  _wh(16%, 100%)
+  margin 0 17%
   _fj(center)
   img
-    _wh(32%, auto)
+    _wh(100%, auto)
 .hlj
+  position relative
+  _wh(5.876%, 100%)
+  margin 0 1.2286666666666666%
+  _fj(center)
   img
-    _wh(70%, auto)
-    left 15%
+    _wh(100%, auto)
 .hlj_s
+  position relative
+  _wh(28%, 100%)
+  margin 0 11%
+  _fj(center)
   img
-    _wh(56%, auto)
-    left 22%
+    _wh(100%, auto)
 .ktp_yao_front_wrap
   _wh(38%, auto)
   top: 52%;
@@ -1044,59 +1305,59 @@ export default {
   animation rotate_1 9s linear 1s infinite
 @keyframes rotate_1 {
     0% {
-      transform: rotateZ(-20deg)
+      transform: rotateZ(20deg)
     }
     2% {
-        transform: rotateZ(-20deg)
+        transform: rotateZ(20deg)
     }
     8% {
-        transform: rotateZ(-60deg)
-    }
-    10% {
-        transform: rotateZ(-60deg)
-    }
-    18% {
-      transform: rotateZ(-20deg)
-    }
-    20% {
-        transform: rotateZ(-20deg)
-    }
-    28% {
-      transform: rotateZ(-120deg)
-    }
-    30% {
-        transform: rotateZ(-120deg)
-    }
-    43% {
-      transform: rotateZ(20deg)
-    }
-    50% {
-        transform: rotateZ(20deg)
-    }
-    58% {
-      transform: rotateZ(60deg)
-    }
-    60% {
         transform: rotateZ(60deg)
     }
-    68% {
+    10% {
+        transform: rotateZ(60deg)
+    }
+    18% {
       transform: rotateZ(20deg)
     }
-    70% {
+    20% {
         transform: rotateZ(20deg)
     }
-    78% {
+    28% {
       transform: rotateZ(100deg)
     }
-    80% {
+    30% {
         transform: rotateZ(100deg)
     }
-    93% {
+    43% {
       transform: rotateZ(-20deg)
     }
-    100% {
+    50% {
         transform: rotateZ(-20deg)
     }
+    58% {
+      transform: rotateZ(-60deg)
+    }
+    60% {
+        transform: rotateZ(-60deg)
+    }
+    68% {
+      transform: rotateZ(-20deg)
+    }
+    70% {
+        transform: rotateZ(-20deg)
+    }
+    78% {
+      transform: rotateZ(-120deg)
+    }
+    80% {
+        transform: rotateZ(-120deg)
+    }
+    93% {
+      transform: rotateZ(20deg)
+    }
+    100% {
+        transform: rotateZ(20deg)
+    }
 }
 .rotate_2
   animation rotate_2 4s linear 1s infinite
diff --git a/src/pages/shunhe/LogisticsProcess.vue b/src/pages/shunhe/LogisticsProcess.vue
index b521d2c..3c5b138 100644
--- a/src/pages/shunhe/LogisticsProcess.vue
+++ b/src/pages/shunhe/LogisticsProcess.vue
@@ -695,7 +695,6 @@ export default {
 .container
   _wh(100%, calc(100% - 1.38rem))
   padding .3rem .2509rem 0
-  overflow hidden
   clear both
 .bottom
   _wh(100%, .38rem)