设备

src/config/getData2.js

@@ -3879,4 +3879,4 @@ export const sortingAndPackaging = () => post('api/cockpit/sortingAndPackaging',
  */
 export const homepageDataLeft = () => post('api/dashboard/homepageDataLeft', {})
 export const homepageDataRight = () => post('api/dashboard/homepageDataRight', {})
-export const homepageEquipment = () => post('api/dashboard/homepageEquipment', {})
+export const deviceCondition = () => post('api/cockpit/deviceCondition', {})

src/pages/modules/home/index.vue

@@ -189,9 +189,9 @@ export default {
     }
   },
   created () {
-    this._homepageDataLeft()
+    // this._homepageDataLeft()
-    this._homepageDataRight()
+    // this._homepageDataRight()
-    this.refresh()
+    // this.refresh()
   },
   beforeDestroy () {
     clearInterval(this.timer)

src/pages/modules/home/workshop.vue

@@ -21,41 +21,29 @@
     </div>
     <div class="m_block m_block_2">
       <div class="m_wraper">
-        <div class="p_device ddxt_wrap_1" v-for="(e, i) in [1, 1]" :key="i" :class="'ddxt_wrap_' + (i +1)">
+        <div class="p_device ddxt_wrap" v-for="(e, i) in [1, 1]" :key="i" :class="'ddxt_wrap_' + (i +1)">
-          <div class="p_device weilan_ddxt_wrap_1">
+          <div class="p_device weilan_ddxt_wrap">
-            <img class="device_img" src="../../../images/device/wl_cmd_1.png" alt="">
+            <div class="weilan_ddxt" v-for="(e, i) in [1, 1]" :key="i">
-          </div>
+              <img class="device_img" :class="{'rotatey180': i === 1}" src="../../../images/device/wl_cmd_1.png" alt="">
-          <div class="p_device weilan_ddxt_wrap_2">
+            </div>
-            <img class="device_img" src="../../../images/device/wl_cmd_1.png" alt="">
           </div>
           <div class="p_device ssj_wrap">
             <img class="device_img" src="../../../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)">
+          <div class="p_device ktp_cmd_wrap">
-            <img v-show="e.status === 1" class="device_img" src="../../../images/device/ktpv_green.png" alt="" @click="getInfo(e)">
+            <div class="ktp_cmd" v-for="(e, i) in [1,2]" :key="i">
-            <img v-show="e.status === 2" class="device_img" src="../../../images/device/ktpv_yellow.png" alt="" @click="getInfo(e)">
+              <img class="device_img" src="../../../images/device/ktpv_yellow.png" alt="">
-            <img v-show="e.status === 3" class="device_img" src="../../../images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
+            </div>
-            <img v-show="e.status === 4" class="device_img" src="../../../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 cmdssj_1">
+          <div class="p_device ktp_cmd_wrap cmdssj_wrap">
-            <img class="device_img" src="../../../images/device/cmdssj_gray.png" alt="">
+            <div class="ktp_cmd" v-for="(e, i) in [1,2]" :key="i">
+              <img class="device_img" :class="{'rotatex180': i === 1}" src="../../../images/device/cmdssj_gray.png" alt="">
+            </div>
           </div>
-          <div class="p_device cmdssj_1 cmdssj_2">
+          <div class="p_device robot_cmd_wrap robot_cmd_wrap_1 rotate_3">
-            <img class="device_img" src="../../../images/device/cmdssj_gray.png" alt="">
+            <img class="device_img" src="../../../images/device/robot_cmd_green.png" alt="">
           </div>
-          <div class="p_device robot_cmd_wrap_1" :class="depalletizingRobot.status === 1 ? 'rotate_2' : ''">
+          <div class="p_device robot_cmd_wrap robot_cmd_wrap_2 rotate_4">
-            <img v-show="depalletizingRobot.status === 1" class="device_img" src="../../../images/device/robot_cmd_green.png" alt="" @click="getInfo(depalletizingRobot)">
-            <img v-show="depalletizingRobot.status === 2" class="device_img" src="../../../images/device/robot_cmd_yellow.png" alt="" @click="getInfo(depalletizingRobot)">
-            <img v-show="depalletizingRobot.status === 3" class="device_img" src="../../../images/device/robot_cmd_gray.png" alt="" @click="getInfo(depalletizingRobot)">
-            <img v-show="depalletizingRobot.status === 4" class="device_img" src="../../../images/device/robot_cmd_red.png" alt="" @click="getInfo(depalletizingRobot)">
-          </div>
-          <div class="p_device robot_cmd_wrap_1 robot_cmd_wrap_2 rotate_3">
             <img class="device_img" src="../../../images/device/robot_cmd_green.png" alt="">
           </div>
         </div>
@@ -80,74 +68,45 @@
           <img class="device_img" src="../../../images/device/rgv_ct.png" alt="">
         </div>
         <div class="p_device ggtj_wrap ggtj_wrap_1">
-          <img class="device_img" src="../../../images/device/ggtssj_yellow.png" alt="" v-for="(e,i) in [1,2]" :key="i">
+          <img class="gtssj" src="../../../images/device/gtssj_yellow.png" alt="" v-for="(e,i) in [1,2]" :key="i">
         </div>
         <div class="p_device ggtj_wrap ggtj_wrap_2">
-          <img class="device_img" src="../../../images/device/ggtssj_yellow.png" alt="" v-for="(e,i) in [1,2,3,4,5,6]" :key="i">
+          <img class="fmj" src="../../../images/device/fmj_yellow.png" alt="">
-          <div class="p_device fmj_wrap">
+          <img class="gtssj" src="../../../images/device/gtssj_yellow.png" alt="" v-for="(e,i) in [1,2,3,4]" :key="i">
-            <img class="device_img" src="../../../images/device/fmj.png" alt="">
+        </div>
-          </div>
+        <div class="p_device rgpt"></div>
+        <div class="p_device fmj2">
+          <img class="device_img" src="../../../images/device/fmj2_yellow.png" alt="">
         </div>
         <div class="p_device ggtj_wrap ggtj_wrap_3">
-          <img class="device_img" src="../../../images/device/ggtssj_yellow.png" alt="" v-for="(e,i) in [1,2,3,4,5,6,1,2,3,4,5,]" :key="i">
+          <img class="gtssj" src="../../../images/device/gtssj_yellow.png" alt="" v-for="(e,i) in [1,2,3]" :key="i">
+          <img class="ltssj" src="../../../images/device/ltssj_yellow.png" alt="">
+          <img class="gtssj" src="../../../images/device/gtssj_yellow.png" alt="" v-for="(e,i) in [1,2]" :key="i">
+          <img class="crj" src="../../../images/device/crj_yellow.png" alt="">
+          <img class="gtssj" src="../../../images/device/gtssj_yellow.png" alt="" v-for="(e,i) in [1,2,3,4]" :key="i">
         </div>
       </div>
     </div>
     <div class="m_block m_block_1">
       <div class="m_wraper">
-        <div class="yao_wrap" v-for="(e, i) in kiln" :key="e.equipment" :class="'yao_' + (i + 1)" @click="getInfo(e)">
+        <div class="yao_wrap" v-for="(e, i) in [1,1]" :key="i" :class="'yao_' + (i + 1)">
-          <device-pop
-            type="yao"
-            :pkId="pkId"
-            :data="e"
-            direction="down"
-            @closePop="closePop"
-          ></device-pop>
           <div class="yao_layer3"></div>
-          <div class="yao_layer1" :class="Number(e.status) === 3 ? 'yao_layer1_2' : 'yao_layer1_1'"></div>
+          <div class="yao_layer1 yao_layer1_1 yao_layer1_2"></div>
-          <div class="yao_layer2" :class="Number(e.status) === 3 ? 'yao_layer2_2' : 'yao_layer2_1'"><p>{{i+1}}号窑</p></div>
+          <div class="yao_layer2 yao_layer2_1 yao_layer2_2"><p>{{i+1}}号窑</p></div>
         </div>
         <div class="p_device jyw_wrap">
-          <div class="p_device" v-for="(e, i) in  conveyorLine" :key="e.equipment" :class="'jyw' + (i+1)">
+          <div class="p_device" v-for="(e, i) in  [1,1]" :key="i" :class="'jyw' + (i+1)">
-            <img v-show="e.status === 1" class="device_img" src="../../../images/device/ktpv_green.png" alt="" @click="getInfo(e)">
+            <img class="device_img" src="../../../images/device/ktpv_green.png" alt="">
-            <img v-show="e.status === 2" class="device_img" src="../../../images/device/ktpv_green.png" alt="" @click="getInfo(e)">
-            <img v-show="e.status === 3" class="device_img" src="../../../images/device/ktpv_gray.png" alt="" @click="getInfo(e)">
-            <img v-show="e.status === 4" class="device_img" src="../../../images/device/ktpv_green.png" alt="" @click="getInfo(e)">
-            <device-pop
-              type="ssx"
-              :pkId="pkId"
-              :data="e"
-              @closePop="closePop"
-            ></device-pop>
           </div>
         </div>
         <div class="p_device dpw_wrap">
           <img class="device_img" src="../../../images/device/ktp_green.png" alt="">
         </div>
         <div class="p_device cpj_wrap">
-          <img v-show="trayStacker.status === 1" class="device_img" src="../../../images/device/cpj_green.png" alt="" @click="getInfo(trayStacker)">
+          <img class="device_img" src="../../../images/device/cpj_green.png" alt="">
-          <img v-show="trayStacker.status === 2" class="device_img" src="../../../images/device/cpj_yellow.png" alt="" @click="getInfo(trayStacker)">
-          <img v-show="trayStacker.status === 3" class="device_img" src="../../../images/device/cpj_gray.png" alt="" @click="getInfo(trayStacker)">
-          <img v-show="trayStacker.status === 4" class="device_img" src="../../../images/device/cpj_red.png" alt="" @click="getInfo(trayStacker)">
-          <device-pop
-            type="cpj"
-            :pkId="pkId"
-            :data="trayStacker"
-            @closePop="closePop"
-          ></device-pop>
         </div>
-        <div class="p_device" v-for="(e, i) in gantryRobot" :key="e.equipment" :class="'yjbyx_' + (i + 1)">
+        <div class="p_device" v-for="(e, i) in [1,1]" :key="i" :class="'yjbyx_' + (i + 1)">
-          <img v-show="e.status === 1" class="device_img" src="../../../images/device/yjbyx_green.png" alt="" @click="getInfo(e)">
+          <img class="device_img" src="../../../images/device/yjbyx_green.png" alt="">
-          <img v-show="e.status === 2" class="device_img" src="../../../images/device/yjbyx_yellow.png" alt="" @click="getInfo(e)">
-          <img v-show="e.status === 3" class="device_img" src="../../../images/device/yjbyx_gray.png" alt="" @click="getInfo(e)">
-          <img v-show="e.status === 4" class="device_img" src="../../../images/device/yjbyx_red.png" alt="" @click="getInfo(e)">
-          <device-pop
-            type="hangj"
-            :pkId="pkId"
-            :data="e"
-            :direction="i === 0 ? 'down' : ''"
-            @closePop="closePop"
-          ></device-pop>
         </div>
         <div class="p_device ktp_yao_enter_wrap">
           <div class="ktp_yao" v-for="(e, i) in [1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9,10,1,2,3,4,5,6,7,8,9]" :key="i">
@@ -202,7 +161,7 @@
       <div class="m_wraper">
         <div class="yj_block" v-for="(e, i) in [1,1]" :key="i" >
           <div class="p_device weilan_630_wrap">
-            <img class="device_img" src="../../../images/device/630/wl.png" alt="">
+            <img class="device_img" src="../../../images/device/wl.png" alt="">
           </div>
           <div class="p_device flexwrap slw_630_wrap">
             <div class="slw_630" v-for="(e, i) in [1,1,1,1]" :key="i">
@@ -215,12 +174,15 @@
             </div>
           </div>
           <div class="p_device yj_630_wrap">
-            <div class="yj_630" v-for="(e, i) in [1,1]" :key="i">
+            <div v-show="i === 0" class="yj_630" v-for="e in PressMachineList.slice(0,2)" :key="e.device_code">
-              <img class="device_img" src="../../../images/device/yj_gray.png">
+              <img class="device_img" :src="require('../../../images/device/yj_' + ['green', 'yellow', 'gray', 'red'][Number(e.device_status) - 1] + '.png')">
+            </div>
+            <div v-show="i === 1" class="yj_630" v-for="e in PressMachineList.slice(2,4)" :key="e.device_code">
+              <img class="device_img" :src="require('../../../images/device/yj_' + ['green', 'yellow', 'gray', 'red'][Number(e.device_status) - 1] + '.png')">
             </div>
           </div>
           <div class="p_device robot_630_wrap rotate_1">
-            <img src="../../../images/device/robot_2500_green.png" alt="">
+            <img src="../../../images/device/robot_green.png" alt="">
           </div>
         </div>
       </div>
@@ -229,7 +191,7 @@
       <div class="m_wraper">
         <div class="yj_block">
           <div class="p_device weilan_630_wrap">
-            <img class="device_img" src="../../../images/device/630/wl.png" alt="">
+            <img class="device_img" src="../../../images/device/wl.png" alt="">
           </div>
           <div class="p_device flexwrap slw_630_wrap">
             <div class="slw_630" v-for="(e, i) in [1,1,1,1]" :key="i">
@@ -242,17 +204,17 @@
             </div>
           </div>
           <div class="p_device yj_630_wrap">
-            <div class="yj_630" v-for="(e, i) in [1,1]" :key="i">
+            <div class="yj_630" v-for="e in PressMachineList.slice(4,6)" :key="e.device_code">
-              <img class="device_img" src="../../../images/device/yj_gray.png">
+              <img class="device_img" :src="require('../../../images/device/yj_' + ['green', 'yellow', 'gray', 'red'][Number(e.device_status) - 1] + '.png')">
             </div>
           </div>
           <div class="p_device robot_630_wrap rotate_1">
-            <img src="../../../images/device/robot_2500_green.png" alt="">
+            <img src="../../../images/device/robot_green.png" alt="">
           </div>
         </div>
         <div class="yj_block yj_1250_block" v-for="(e, i) in [1, 1]" :key="i">
           <div class="p_device weilan_630_wrap">
-            <img class="device_img" src="../../../images/device/630/wl.png" alt="">
+            <img class="device_img" src="../../../images/device/wl.png" alt="">
           </div>
           <div class="p_device flexwrap slw_630_wrap slw_1250_wrap">
             <div class="slw_630" v-for="(e, i) in [1,1]" :key="i">
@@ -265,17 +227,17 @@
             </div>
           </div>
           <div class="p_device yj_630_wrap">
-            <div class="yj_630 yj_1250" v-for="(e, i) in [1]" :key="i">
+            <div class="yj_630 yj_1250">
-              <img class="device_img" src="../../../images/device/yj_gray.png">
+              <img class="device_img" :src="require('../../../images/device/yj_' + ['green', 'yellow', 'gray', 'red'][Number(PressMachineList[6+i].device_status) - 1] + '.png')">
             </div>
           </div>
-          <div class="p_device robot_630_wrap rotate_1">
+          <div class="p_device robot_630_wrap rotate_5">
-            <img src="../../../images/device/robot_2500_green.png" alt="">
+            <img src="../../../images/device/robot_green.png" alt="">
           </div>
         </div>
         <div class="yj_block yyj_block" v-for="(e, i) in [1, 1]" :key="i">
           <div class="p_device weilan_630_wrap">
-            <img class="device_img" src="../../../images/device/630/wl.png" alt="">
+            <img class="device_img" src="../../../images/device/wl.png" alt="">
           </div>
           <div v-show="i === 0" class="p_device flexwrap slw_630_wrap slw_1250_wrap">
             <div class="slw_630" v-for="(e, i) in [1,1]" :key="i">
@@ -293,39 +255,28 @@
             </div>
           </div>
           <div class="p_device yj_630_wrap yyj_wrap">
-            <div class="yj_630" v-for="(e, i) in [1]" :key="i">
+            <div class="yj_630" style="opacity:0.1">
-              <img class="device_img" src="../../../images/device/2500/yj_gray.png">
+              <img class="device_img" src="../../../images/device/yyj_gray.png" alt="">
+              <!-- <img class="device_img" :src="require('../../../images/device/yyj_' + ['green', 'yellow', 'gray', 'red'][Number(PressMachineList[8+i].device_status) - 1] + '.png')"> -->
             </div>
           </div>
-          <div class="p_device robot_630_wrap rotate_1">
+          <div class="p_device robot_630_wrap rotate_5">
-            <img src="../../../images/device/robot_2500_green.png" alt="">
+            <img src="../../../images/device/robot_green.png" alt="">
           </div>
         </div>
       </div>
     </div>
     <div class="m_block m_block_5">
-      <div class="p_device agv_1" v-for="(e, i) in agv" :key="e.equipment" :class="'agv_' + (i+1)">
+      <div class="p_device agv_1" v-for="(e, i) in [1,1]" :key="i" :class="'agv_' + (i+1)">
-        <img v-show="e.status === 1" src="../../../images/device/agv_green.png" alt="" @click="getInfo(e)">
+        <img src="../../../images/device/agv_green.png" alt="">
-        <img v-show="e.status === 2" src="../../../images/device/agv_yellow.png" alt="" @click="getInfo(e)">
-        <img v-show="e.status === 3" src="../../../images/device/agv_gray.png" alt="" @click="getInfo(e)">
-        <img v-show="e.status === 4" src="../../../images/device/agv_red.png" alt="" @click="getInfo(e)">
-        <device-pop
-          type="agv"
-          :pkId="pkId"
-          :data="e"
-          @closePop="closePop"
-        ></device-pop>
       </div>
     </div>
     <div class="m_block m_block_6">
       <div class="m_wraper">
         <div class="lzhlj_wrap">
           <div class="lz_wrap">
-            <div class="lz" v-for="e in unloadLocation.slice(0, 6)" :key="e.equipment">
+            <div class="lz" v-for="e in MixBlankingList.slice(0, 6)" :key="e.pointCode">
-              <img class="device_img" v-show="e.status === 1" src="../../../images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
+              <img class="device_img" :src="require('../../../images/device/lz_hj_' + ['green', 'yellow', 'gray', 'red'][Number(e.pointStatus) - 1] + '.png')" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 2" src="../../../images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 3" src="../../../images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 4" src="../../../images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
               <device-pop
                 type="hlz"
                 :pkId="pkId"
@@ -338,11 +289,8 @@
             </div>
           </div>
           <div class="hlj_wrap">
-            <div class="hlj" v-for="e in mixingMachine.slice(0, 6)" :key="e.equipment">
+            <div class="hlj" v-for="e in MixMachineList" :key="e.device_code">
-              <img class="device_img" v-show="e.status === 1" src="../../../images/device/hlj_green.png" alt="" @click="getInfo(e)">
+              <img class="device_img" :src="require('../../../images/device/hlj_' + ['green', 'yellow', 'gray', 'red'][Number(e.device_status) - 1] + '.png')" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 2" src="../../../images/device/hlj_yellow.png" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 3" src="../../../images/device/hlj_gray.png" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 4" src="../../../images/device/hlj_red.png" alt="" @click="getInfo(e)">
               <device-pop
                 type="hlj"
                 :pkId="pkId"
@@ -350,41 +298,16 @@
                 @closePop="closePop"
               ></device-pop>
             </div>
-            <div class="hlj" v-for="(e,i) in [1,1]" :key="i" style="opacity: 0.1">
-              <img class="device_img" src="../../../images/device/hlj_gray.png" alt="">
-            </div>
           </div>
         </div>
-        <div class="cbj_wrap">
+        <!-- <div class="lzhlj_wrap cbj_wrap">
           <div class="lz_wrap">
-            <div class="lz" v-for="e in unloadLocation.slice(0, 1)" :key="e.equipment">
+            拆包机没图片
-              <img class="device_img" v-show="e.status === 1" src="../../../images/device/lz_hj_green.png" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 2" src="../../../images/device/lz_hj_yellow.png" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 3" src="../../../images/device/lz_hj_gray.png" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 4" src="../../../images/device/lz_hj_red.png" alt="" @click="getInfo(e)">
-              <device-pop
-                type="hlz"
-                :pkId="pkId"
-                :data="e"
-                @closePop="closePop"
-              ></device-pop>
-            </div>
           </div>
           <div class="hlj_wrap">
-            <div class="hlj" v-for="e in mixingMachine.slice(0, 1)" :key="e.equipment">
+            拆包机没图片
-              <img class="device_img" v-show="e.status === 1" src="../../../images/device/hlj_green.png" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 2" src="../../../images/device/hlj_yellow.png" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 3" src="../../../images/device/hlj_gray.png" alt="" @click="getInfo(e)">
-              <img class="device_img" v-show="e.status === 4" src="../../../images/device/hlj_red.png" alt="" @click="getInfo(e)">
-              <device-pop
-                type="hlj"
-                :pkId="pkId"
-                :data="e"
-                @closePop="closePop"
-              ></device-pop>
-            </div>
           </div>
-        </div>
+        </div> -->
       </div>
     </div>
     <div class="m_block_7">
@@ -420,8 +343,8 @@
 <script>
 // import TCanvas from './canvas.vue'
 import DevicePop from './devicepop.vue'
-// import {homepageEquipment} from '@js/getData2.js'
+// import {deviceCondition} from '@js/getData2.js'
-import {homepageEquipment} from '@js/mork2.js'
+import {deviceCondition} from '@js/mork2.js'
 export default {
   name: 'workshop',
   components: {
@@ -432,24 +355,10 @@ export default {
     return {
       interTime: this.$store.getters.setTime,
       timer3: null,
-      mixingMachine: [],
+      MixMachineList: [], // 混碾机
-      unloadLocation: [],
+      MixBlankingList: [], // 混碾机对接位
-      palletizingRobot: {},
+      PressMachineList: [], // 压机
-      sunloadLocation: [],
+      ManipulatorInfoList: [], // 压制、分拣机械手
-      depalletizingRobot: {},
-      loadLocation: [],
-      laminatingMachine: {},
-      press: [],
-      frontWarehouse: [],
-      backWarehouse: [],
-      conveyorLine: [],
-      gantryRobot: [],
-      kiln: [],
-      coolingConveyorLine: [],
-      trayStacker: {},
-      vconveyorLine: [],
-      trayDestacker: {},
-      agv: [],
       pkId: ''
     }
   },
@@ -464,59 +373,18 @@ export default {
   },
   methods: {
     refresh () {
-      this._homepageEquipment()
+      this._deviceCondition()
       this.timer3 = setInterval(() => {
-        this._homepageEquipment()
+        this._deviceCondition()
       }, this.interTime)
     },
-    async _homepageEquipment () {
+    async _deviceCondition () {
-      let res = await homepageEquipment()
+      let res = await deviceCondition()
-      // 混料机
+      console.log(res)
-      this.mixingMachine = [...res.mix.mixingMachine]
+      this.MixMachineList = [...res.MixMachineList]
-      // 混料机下料位
+      this.MixBlankingList = [...res.MixBlankingList]
-      this.unloadLocation = [...res.mix.unloadLocation]
+      this.PressMachineList = [...res.PressMachineList]
-      // 分拣区
+      this.ManipulatorInfoList = [...res.ManipulatorInfoList]
-      this.palletizingRobot = res.sort.palletizingRobot.length > 0 ? [...res.sort.palletizingRobot][0] : {}
-      this.sunloadLocation = [...res.sort.unloadLocation]
-      this.depalletizingRobot = res.sort.depalletizingRobot.length > 0 ? [...res.sort.depalletizingRobot][0] : {}
-      this.loadLocation = [...res.sort.loadLocation]
-      this.laminatingMachine = res.sort.laminatingMachine.length > 0 ? [...res.sort.laminatingMachine][0] : {}
-      // 压机
-      this.press = []
-      res.press.palletizingRobot.map((e, i) => {
-        // 压机上料位
-        let loadLocation = []
-        if (i < 3) {
-          loadLocation = res.stand.storageLocation.slice(2 * i, 2 * i + 2)
-        } else if (i === 3) {
-          loadLocation = res.stand.storageLocation.slice(6, 10)
-        } else if (i === 4) {
-          loadLocation = res.stand.storageLocation.slice(10, 14)
-        } else if (i === 5) {
-          loadLocation = res.stand.storageLocation.slice(14, 26)
-        }
-        // 压机
-        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({pkid: 'key' + i + 1, palletizingRobot: e, loadLocation: loadLocation, pressMachine: pressMachine, unloadLocation: unloadLocation})
-      })
-      // console.log(this.press)
-      // 窑前货架
-      this.frontWarehouse = [...res.frontWarehouse.storageLocation]
-      // 窑后货架
-      this.backWarehouse = [...res.backWarehouse.storageLocation]
-      // 干燥区
-      this.conveyorLine = [...res.dry.conveyorLine]
-      this.gantryRobot = [...res.dry.gantryRobot]
-      this.kiln = [...res.dry.kiln]
-      this.coolingConveyorLine = [...res.dry.coolingConveyorLine]
-      // 托盘输送线
-      this.trayStacker = res.vehicleConveyorLine.trayStacker.length > 0 ? [...res.vehicleConveyorLine.trayStacker][0] : {}
-      this.vconveyorLine = [...res.vehicleConveyorLine.conveyorLine].reverse()
-      // 拆盘机暂时不显示
-      // this.trayDestacker = res.vehicleConveyorLine.trayDestacker.length > 0 ? [...res.vehicleConveyorLine.trayDestacker][0] : {}
-      this.agv = [...res.agv.agv]
     },
     getInfo (e) {
       this.pkId = this.pkId !== e.equipment ? e.equipment : ''
@@ -585,61 +453,59 @@ export default {
   left: auto
   right: 2%
   top: 7%;
-.ddxt_wrap_1
+.ddxt_wrap
   width 30%
   height 49%
 .ddxt_wrap_2
   top auto
   bottom 0
-.weilan_ddxt_wrap_1
+.weilan_ddxt_wrap
-  width 45%
+  width 100%
   height 100%
-.weilan_ddxt_wrap_2
+  display flex
+.weilan_ddxt
   width 45%
-  height 100%
+  display inline-flex
-  left auto
-  right 0
-  img
-    transform rotate(180deg)
 .ssj_wrap
-  width: 40%;
+  width: 36%;
-  top: 40%;
+  top: 46%;
-  left: 30%;
+  left: 32%;
 .ktp_cmd_wrap
-  width 18.31px
+  width 19px
-.ktp_cmd_wrap_1
+  height 90%
-  left: 1%;
+  display flex
-  top: 6%;
+  flex-direction column
-.ktp_cmd_wrap_2
+  top 5%
-  left 1%
+  left 3%
-  top 67%
+.ktp_cmd
-.cmdssj_1
+  width 100%
-  width 27.5px
+  display inline-flex
-  height 22px
+.cmdssj_wrap
-  left 82%
+  width 28px
-  top 16%
+  left auto
-.cmdssj_2
+  right 3%
-  top 70%
+.rotatex180
-  img
+  transform rotateX(180deg)
-    transform rotate(180deg)
+.rotatey180
-.robot_cmd_wrap_1
+  transform rotateY(180deg)
-  width 1px
+.robot_cmd_wrap
-  height 1px
+  width: 18px;
-  left: 14%;
+  height: 18px;
-  top: 50%;
   img
     position absolute
-    width: 37px;
+    width: 36px;
-    height: auto;
+    height: 20px;
-    top: -11px;
+    top: -2px;
-    left: -7px;
+    left: -1px;
+.robot_cmd_wrap_1
+  left: 11%;
+  top: 42%;
 .robot_cmd_wrap_2
-  left 82%
+  left: 79%;
-  top 54%
+  top: 41%;
   img
-    transform rotate(180deg)
+    transform rotateY(180deg)
-    top: -9px;
+    left -19px
-    left: -27px;
 .rgv_line_wrap
   position absolute
   top 0
@@ -704,24 +570,38 @@ export default {
 .ggtj_wrap
   display flex
   justify-content flex-start
-  img
+  left 36.5%
-    width 27px
+.gtssj
-    height auto
+  width 27px
+  height 25px
+.fmj
+  width 30px
+  height 30px
+.rgpt
+  width 50px
+  height 50px
+  background-color #b4b4b4
+  left 51.8%
+  top 56%
+.ltssj
+  width 53.59px
+  height 25px
+.crj
+  width auto
+  height 40px
+  position relative
+  top -14px
+.fmj2
+  width 26px
+  height 32px
+  left 68%
+  top 62%
 .ggtj_wrap_1
-  left: 36%;
+  top 18%
-  top: 18%;
 .ggtj_wrap_2
-  left: 36%;
+  top 37%
-  top: 37%;
 .ggtj_wrap_3
-  left: 36%;
+  top 64%
-  top: 64%;
-.fmj_wrap
-  height: 122%;
-  left: 14%;
-  img
-    height 100%
-    width auto
 // 分拣拆垛位end
 // 压机模块start
 .m_block_3
@@ -837,34 +717,39 @@ export default {
   top auto
   bottom 2%
   left 2%
+  padding 6px
 .lzhlj_wrap
-  width 60%
+  width 70%
-  padding 6px 0
+  height 100%
+  display: flex;
+  flex-direction: column;
+  justify-content: space-around
 .cbj_wrap
-  width 10%
+  width 14%
-  padding 6px 2.5%
   border 2px solid #465e7b
   border-radius 5px
+  .lz_wrap,.hlj_wrap
+    justify-content center
 .lz_wrap
   width 100%
-  height 40%
   display flex
   justify-content space-between
   align-items center
 .hlj_wrap
   width 100%
-  height 60%
   display flex
   justify-content space-between
   align-items center
 .lz
   width 40px
+  height 26.31px
   img
     position relative
     left 5px
     width 30px
 .hlj
   width 40px
+  height 30.3px
 // 混料机end
 // 窑start
 .m_block_1
@@ -1198,34 +1083,34 @@ export default {
   animation rotate_5 4s linear 1s infinite
 @keyframes rotate_5 {
     0% {
-      transform: rotateZ(-20deg)
+      transform: rotateZ(0deg)
     }
     3% {
-        transform: rotateZ(-20deg)
+        transform: rotateZ(0deg)
-    }
-    22% {
-      transform: rotateZ(90deg)
     }
     25% {
-        transform: rotateZ(90deg)
+      transform: rotateZ(120deg)
     }
-    43% {
+    28% {
-      transform: rotateZ(-20deg)
+        transform: rotateZ(120deg)
     }
     50% {
-        transform: rotateZ(-20deg)
+      transform: rotateZ(0deg)
     }
-    72% {
+    53% {
-      transform: rotateZ(-90deg)
+        transform: rotateZ(0deg)
     }
     75% {
-        transform: rotateZ(-90deg)
+        transform: rotateZ(-130deg)
     }
-    93% {
+    78% {
-        transform: rotateZ(-20deg)
+        transform: rotateZ(-130deg)
+    }
+    97% {
+        transform: rotateZ(0deg)
     }
     100% {
-        transform: rotateZ(-20deg)
+        transform: rotateZ(0deg)
     }
 }
 </style>