diff --git a/src/pages/DeviceMonitor.vue b/src/pages/DeviceMonitor.vue
index 7db930c..76e9708 100644
--- a/src/pages/DeviceMonitor.vue
+++ b/src/pages/DeviceMonitor.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="container" @click="uid = ''">
+  <section class="container" @click="pkObj = {}">
     <t-header index='3'></t-header>
     <div class="content">
       <div class="item_tr clearfix">
@@ -43,284 +43,22 @@
               </div>
             </div>
           </div>
-          <div v-if="e.device_code === uid" class="popover_block">
+          <div v-if="e.device_code === pkObj.device_code" class="popover_block">
             <div class="foldline" :class="e.postion1"></div>
             <div class="popver_bg" :class="e.postion2">
               <div class="popver_block">
-                <div class="pop_info_name">{{form.device_name}}</div>
+                <div class="pop_info_name">{{pkObj.device_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.device_status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.device_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(pkObj.device_status)]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
                   </div>
-                  <div v-if="form.material_name !== ''" class="pop_tip">当前生产：{{form.material_name}}</div>
-                  <div v-if="form.real_qty !== ''" class="pop_tip">已生产：{{form.real_qty}}KG</div>
-                  <div v-if="form.vehicle_code !== ''" class="pop_tip">载具：{{form.vehicle_code}}</div>
-                  <div v-if="form.instorage_time !== ''" class="pop_tip">入库时间：{{form.instorage_time}}</div>
-                  <div v-if="form.vehicle_qty !== ''" class="pop_tip">载具数量：{{form.vehicle_qty}}托</div>
-                  <div v-if="form.ivt_weight !== ''" class="pop_tip">重量：{{form.ivt_weight}}</div>
-                  <div v-if="form.pallet_qty !== ''" class="pop_tip">搬运托盘数：{{form.pallet_qty}}托</div>
-                  <div v-if="form.ready_lane !== ''" class="pop_tip">搬入准备车道：{{form.ready_lane}}托</div>
-                  <div v-if="form.move_first_kiln !== ''" class="pop_tip">搬入1号窑：{{form.move_first_kiln}}托</div>
-                  <div v-if="form.move_second_kiln !== ''" class="pop_tip">搬入2号窑：{{form.move_second_kiln}}托</div>
-                  <div v-if="form.first_kiln_qty !== ''" class="pop_tip">窑1窑车数：{{form.first_kiln_qty}}托</div>
-                  <div v-if="form.second_kiln_qty !== ''" class="pop_tip">窑2窑车数：{{form.second_kiln_qty}}托</div>
-                  <div v-if="form.mechanical_pallet_qty !== ''" class="pop_tip">完成托盘数：{{form.mechanical_pallet_qty}}车</div>
-                  <div v-if="form.mechanical_arm_qty !== ''" class="pop_tip">完成数量：{{form.mechanical_arm_qty}}块</div>
-                  <div v-if="form.finish_pallet_qty !== ''" class="pop_tip">完成托盘数：{{form.finish_pallet_qty}}个</div>
-                  <div v-if="form.finish_pile_qty !== ''" class="pop_tip">完成跺数：{{form.finish_pile_qty}}垛</div>
-                  <div v-if="form.faulty_info !== '' || allrows1.length > 0 || allrows2.length > 0 || allrows3.length > 0" class="pop_tip">故障信息：{{form.faulty_info}}</div>
-                  <table v-if="allrows1.length > 0" class="pop_table">
-                    <tr>
-                      <th width="48%">本日生产</th>
-                      <th width="26%">已生产数量</th>
-                      <th>单位</th>
-                    </tr>
-                    <tr v-for="(e,i) in allrows1" :key="i">
-                      <td>{{e.productionDetails}}</td>
-                      <td>{{e.productionQty}}</td>
-                      <td>{{e.weightUnitName}}</td>
-                    </tr>
-                  </table>
-                  <table v-if="allrows2.length > 0" class="pop_table">
-                    <tr>
-                      <th width="48%">本日生产</th>
-                      <th width="26%">生产厂家</th>
-                      <th>已生产(块)</th>
-                    </tr>
-                    <tr v-for="(e,i) in allrows1" :key="i">
-                      <td>{{e.productionDetails}}</td>
-                      <td>{{e.manufacturer}}</td>
-                      <td>{{e.productionQty}}</td>
-                    </tr>
-                  </table>
-                  <table v-if="allrows3.length > 0" class="pop_table">
-                    <tr>
-                      <th width="48%">本日生产</th>
-                      <th width="26%">生产厂家</th>
-                      <th>已生产(块)</th>
-                    </tr>
-                    <tr v-for="(e,i) in allrows3" :key="i">
-                      <td>{{e.productionDetails}}</td>
-                      <td>{{e.manufacturer}}</td>
-                      <td>{{e.productionQty}}</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-              <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
-            </div>
-          </div>
-          <!-- 混碾机LB0001 -->
-          <div v-if="e.device_code === uid && e.deviceclass_code === 'LB0001'" class="popover_block">
-            <div class="foldline" :class="e.postion1"></div>
-            <div class="popver_bg" :class="e.postion2">
-              <div class="popver_block">
-                <div class="pop_info_name">{{form.device_name}}</div>
-                <div class="pop_info_tip">
-                  <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.device_status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.device_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}</div>
-                  </div>
-                  <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
-                  <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
-                  <div class="pop_tip">故障信息：{{form.error_info}}</div>
-                  <table class="pop_table">
-                    <tr>
-                      <th width="48%">本日生产</th>
-                      <th width="26%">已生产数量</th>
-                      <th>单位</th>
-                    </tr>
-                    <tr v-for="(e,i) in allrows1" :key="i">
-                      <td>{{e.material_name}}</td>
-                      <td>{{e.produce_num}}</td>
-                      <td>{{e.unit_name}}</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-              <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
-            </div>
-          </div>
-          <!-- 压力机LB0004、机械手LB0006 -->
-          <div v-if="e.device_code === uid && (e.deviceclass_code === 'LB0004' || (e.deviceclass_code === 'LB0006' && e.device_code !== 'CDJQR01' && e.device_code !== 'MDJXS01'))" class="popover_block">
-            <div class="foldline" :class="e.postion1"></div>
-            <div class="popver_bg" :class="e.postion2">
-              <div class="popver_block">
-                <div class="pop_info_name">{{form.device_name}}</div>
-                <div class="pop_info_tip">
-                  <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.device_status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.device_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}</div>
-                  </div>
-                  <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
-                  <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
-                  <div class="pop_tip">故障信息：{{form.error_info}}</div>
-                  <table class="pop_table">
-                    <tr>
-                      <th width="48%">本日生产</th>
-                      <th width="26%">生产厂家</th>
-                      <th>已生产（块）</th>
-                    </tr>
-                    <tr v-for="(e,i) in allrows2" :key="i">
-                      <td>{{e.material_name}}</td>
-                      <td>{{e.factory_name}}</td>
-                      <td>{{e.produce_num}}</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-              <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
-            </div>
-          </div>
-          <!-- 衍架LB0010 -->
-          <div v-if="e.device_code === uid && e.deviceclass_code === 'LB0010'" class="popover_block">
-            <div class="foldline" :class="e.postion1"></div>
-            <div class="popver_bg" :class="e.postion2">
-              <div class="popver_block">
-                <div class="pop_info_name">{{form.device_name}}</div>
-                <div class="pop_info_tip">
-                  <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.device_status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.device_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}</div>
-                  </div>
-                  <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
-                  <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
-                  <div class="pop_tip">故障信息：{{form.error_info}}</div>
-                  <div class="pop_tip">搬运托盘数：{{form.in_produce_num}}托</div>
-                  <div class="pop_tip">搬入准备车道：{{form.in_prepare}}托</div>
-                  <div class="pop_tip">搬入1号窑：{{form.in_first}}托</div>
-                  <div class="pop_tip">搬入2号窑：{{form.in_second}}托</div>
-                </div>
-              </div>
-              <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
-            </div>
-          </div>
-          <!-- 空车道LB0011、准备车道LB0012、窑-暂存LB0014 -->
-          <div v-if="e.device_code === uid && (e.deviceclass_code === 'LB0011' || e.deviceclass_code === 'LB0012' || e.deviceclass_code === 'LB0014')" class="popover_block">
-            <div class="foldline" :class="e.postion1"></div>
-            <div class="popver_bg" :class="e.postion2">
-              <div class="popver_block">
-                <div class="pop_info_name">{{form.device_name}}</div>
-                <div class="pop_info_tip">
-                  <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.device_status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.device_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}</div>
-                  </div>
-                  <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
-                  <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
-                  <div class="pop_tip">故障信息：{{form.error_info}}</div>
-                </div>
-              </div>
-              <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
-            </div>
-          </div>
-          <!-- 窑LB0013 -->
-          <div v-if="e.device_code === uid && e.deviceclass_code === 'LB0013'" class="popover_block">
-            <div class="foldline" :class="e.postion1"></div>
-            <div class="popver_bg" :class="e.postion2">
-              <div class="popver_block">
-                <div class="pop_info_name">{{form.device_name}}</div>
-                <div class="pop_info_tip">
-                  <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.device_status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.device_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}</div>
-                  </div>
-                  <div class="pop_tip">本周用电/气：{{form.week_electricity}}kw.h / {{form.week_gas}} Nm</div>
-                  <div class="pop_tip">本月用电/气：{{form.mouth_electricity}}kw.h / {{form.month_gas}} Nm</div>
-                  <div class="pop_tip">故障信息：{{form.error_info}}</div>
-                  <table class="pop_table">
-                    <tr>
-                      <th width="48%">本日生产</th>
-                      <th width="26%">生产厂家</th>
-                      <th>已生产（块）</th>
-                    </tr>
-                    <tr v-for="(e,i) in allrows2" :key="i">
-                      <td>{{e.material_name}}</td>
-                      <td>{{e.factory_name}}</td>
-                      <td>{{e.produce_num}}</td>
-                    </tr>
-                  </table>
-                </div>
-              </div>
-              <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
-            </div>
-          </div>
-          <!-- RGVLB0015 -->
-          <div v-if="e.device_code === uid && e.deviceclass_code === 'LB0015'" class="popover_block">
-            <div class="foldline" :class="e.postion1"></div>
-            <div class="popver_bg" :class="e.postion2">
-              <div class="popver_block">
-                <div class="pop_info_name">{{form.device_name}}</div>
-                <div class="pop_info_tip">
-                  <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.device_status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.device_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}</div>
-                  </div>
-                  <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
-                  <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
-                  <div class="pop_tip">故障信息：{{form.error_info}}</div>
-                  <div class="pop_tip">完成托盘数：{{form.carrier_num}}托</div>
-                </div>
-              </div>
-              <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
-            </div>
-          </div>
-          <!-- 拆垛机械手、码垛机械手LB0006 -->
-          <div v-if="e.device_code === uid && (e.deviceclass_code === 'LB0006' && e.device_code === 'CDJQR01'|| e.device_code === 'MDJXS01')" class="popover_block">
-            <div class="foldline" :class="e.postion1"></div>
-            <div class="popver_bg" :class="e.postion2">
-              <div class="popver_block">
-                <div class="pop_info_name">{{form.device_name}}</div>
-                <div class="pop_info_tip">
-                  <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.device_status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.device_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}</div>
-                  </div>
-                  <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
-                  <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
-                  <div class="pop_tip">故障信息：{{form.error_info}}</div>
-                  <div class="pop_tip">完成托盘数：{{form.carrier_num}}托</div>
-                  <div class="pop_tip">完成数量：{{form.produce_total_num}}块</div>
-                </div>
-              </div>
-              <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
-            </div>
-          </div>
-          <!-- 叠盘机LB0016 -->
-          <div v-if="e.device_code === uid && e.deviceclass_code === 'LB0016'" class="popover_block">
-            <div class="foldline" :class="e.postion1"></div>
-            <div class="popver_bg" :class="e.postion2">
-              <div class="popver_block">
-                <div class="pop_info_name">{{form.device_name}}</div>
-                <div class="pop_info_tip">
-                  <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.device_status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.device_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}</div>
-                  </div>
-                  <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
-                  <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
-                  <div class="pop_tip">故障信息：{{form.error_info}}</div>
-                  <div class="pop_tip">完成托盘数：{{form.carrier_num}}托</div>
-                  <div class="pop_tip">完成垛数：{{form.stack_num}}垛</div>
-                </div>
-              </div>
-              <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
-            </div>
-          </div>
-          <!-- AGVLB0019 -->
-          <div v-if="e.device_code === uid && e.deviceclass_code === 'LB0019'" class="popover_block">
-            <div class="foldline" :class="e.postion1"></div>
-            <div class="popver_bg" :class="e.postion2">
-              <div class="popver_block">
-                <div class="pop_info_name">{{form.device_name}}</div>
-                <div class="pop_info_tip">
-                  <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.device_status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.device_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.device_status) - 1]}}</div>
-                  </div>
-                  <div class="pop_tip">已完成搬运：0个</div>
-                  <div class="pop_tip">故障信息：{{form.error_info}}</div>
+                  <div v-if="pkObj.material_name !== null && pkObj.material_name !== undefined" class="pop_tip">当前生产：{{pkObj.material_name}}</div>
+                  <div v-if="pkObj.real_qty !== null && pkObj.real_qty !== undefined" class="pop_tip">已生产：{{pkObj.real_qty}}KG</div>
+                  <div v-if="pkObj.vehicle_qty !== null && pkObj.vehicle_qty !== undefined" class="pop_tip">当前窑车数：{{pkObj.vehicle_qty}}车</div>
+                  <div v-if="pkObj.vehicle_max_qty !== null && pkObj.vehicle_max_qty !== undefined" class="pop_tip">容量：{{pkObj.vehicle_max_qty}}车</div>
+                  <div v-if="pkObj.vehicle_type !== null && pkObj.vehicle_type !== undefined" class="pop_tip">载具类型：{{pkObj.vehicle_type}}车</div>
+                  <div v-if="pkObj.error_name !== null && pkObj.error_name !== undefined" class="pop_tip">故障信息：{{pkObj.error_name}}</div>
                 </div>
               </div>
               <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
@@ -352,7 +90,7 @@
 
 <script>
 import THeader from '@components/header.vue'
-import { deviceMonitor, findDeviceById } from '@js/getData2'
+import { deviceMonitor } from '@js/getData2'
 export default {
   name: 'DeviceMonitor',
   components: {
@@ -363,11 +101,7 @@ export default {
       interTime: this.$store.getters.setTime,
       timer: null,
       deviceDatas: [],
-      form: {},
-      allrows1: [],
-      allrows2: [],
-      allrows3: [],
-      uid: ''
+      pkObj: {}
     }
   },
   created () {
@@ -392,14 +126,6 @@ export default {
         this.toast(res.desc)
       }
     },
-    async _findDeviceById (id) {
-      let res = await findDeviceById(id)
-      this.form = res.result
-      this.allrows1 = res.result.mixingList
-      this.allrows2 = res.result.crushingList
-      this.allrows3 = res.result.mKilnList
-      this.uid = id
-    },
     addPosition () {
       for (let i = 0; i < this.deviceDatas.length; i++) {
         if (i <= 5) {
@@ -430,18 +156,10 @@ export default {
       }
     },
     getInfo (e) {
-      // if (this.uid === e.device_code) {
-      //   this.uid = ''
-      // } else {
-      //   this.form = {}
-      //   this.allrows1 = []
-      //   this.allrows2 = []
-      //   this.allrowsw3 = []
-      //   this._findDeviceById(e.device_code)
-      // }
+      this.pkObj = e
     },
     closebtn () {
-      this.uid = ''
+      this.pkObj = {}
     }
   }
 }
@@ -569,8 +287,7 @@ export default {
   margin-bottom 8px
 .pop_info_tip
   position relative
-  height 196px
-  overflow-y scroll
+  height auto
 .pop_status
   position absolute
   right 0