diff --git a/src/assets/css/mixin.styl b/src/assets/css/mixin.styl
index 7a6ff25..63f3d0d 100644
--- a/src/assets/css/mixin.styl
+++ b/src/assets/css/mixin.styl
@@ -1,6 +1,7 @@
 $green = #30EBC9
 $yellow = #E2BB0E
 $gray = #516282
+$gray1 = #8B90A6
 $orange = #F96700
 $green2 = #65d837
 
diff --git a/src/pages/DeviceMonitor.vue b/src/pages/DeviceMonitor.vue
index 52e676b..293b86a 100644
--- a/src/pages/DeviceMonitor.vue
+++ b/src/pages/DeviceMonitor.vue
@@ -3,7 +3,7 @@
     <t-header index='3'></t-header>
     <div class="content">
       <div class="item_tr clearfix">
-        <div class="item_wrapper_h2">
+        <div class="item_wrapper_h1">
           <div class="item_block" v-for="(e, i) in HLJ" :key="i">
             <div class="item_inner" @click.stop="getInfo(e)">
               <div class="item_img">
@@ -24,7 +24,7 @@
                 </div>
                 <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
                   <div class="info_table">已生产</div>
-                  <div class="info_data">{{e.real_qty}}KG</div>
+                  <div class="info_data">{{e.real_qty}}千克</div>
                 </div>
                 <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
                   <div class="info_table">当前窑车数</div>
@@ -44,22 +44,28 @@
                 </div>
               </div>
             </div>
-            <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 v-if="e.device_code === pkObj.device_code" class="popover_block" :class="e.position">
+              <div class="foldline"></div>
+              <div class="popver_bg">
                 <div class="popver_block">
                   <div class="pop_info_name">{{pkObj.device_name}}</div>
                   <div class="pop_info_tip">
+                    <div class="top_tips">
+                      <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}}千克</div>
+                      <div v-if="pkObj.open_time !== null && pkObj.open_time !== undefined" class="pop_tip">开机时间：{{pkObj.open_time}}</div>
+                      <div v-if="pkObj.stand_time !== null && pkObj.stand_time !== undefined" class="pop_tip">待机时间：{{pkObj.stand_time}}</div>
+                      <div v-if="pkObj.work_time !== null && pkObj.work_time !== undefined" class="pop_tip">生产时间：{{pkObj.work_time}}</div>
+                      <div v-if="pkObj.error_time !== null && pkObj.error_time !== undefined" class="pop_tip">故障时间：{{pkObj.error_time}}</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 class="pop_status">
                       <div class="pop_status_dot" :class="['gray', 'yellow', 'green', 'orange'][Number(pkObj.device_status)]"></div>
                       <div class="pop_status_text" :class="['fgray', 'fyellow', 'fgreen', 'forange'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
                     </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>
@@ -67,7 +73,7 @@
             </div>
           </div>
         </div>
-        <div class="item_wrapper_h2">
+        <div class="item_wrapper_h1">
           <div class="item_block" v-for="(e, i) in YZJ" :key="i">
             <div class="item_inner" @click.stop="getInfo(e)">
               <div class="item_img">
@@ -88,7 +94,7 @@
                 </div>
                 <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
                   <div class="info_table">已生产</div>
-                  <div class="info_data">{{e.real_qty}}KG</div>
+                  <div class="info_data">{{e.real_qty}}块</div>
                 </div>
                 <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
                   <div class="info_table">当前窑车数</div>
@@ -108,22 +114,28 @@
                 </div>
               </div>
             </div>
-            <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 v-if="e.device_code === pkObj.device_code" class="popover_block" :class="e.position">
+              <div class="foldline"></div>
+              <div class="popver_bg">
                 <div class="popver_block">
                   <div class="pop_info_name">{{pkObj.device_name}}</div>
                   <div class="pop_info_tip">
+                    <div class="top_tips">
+                      <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}}块</div>
+                      <div v-if="pkObj.open_time !== null && pkObj.open_time !== undefined" class="pop_tip">开机时间：{{pkObj.open_time}}</div>
+                      <div v-if="pkObj.stand_time !== null && pkObj.stand_time !== undefined" class="pop_tip">待机时间：{{pkObj.stand_time}}</div>
+                      <div v-if="pkObj.work_time !== null && pkObj.work_time !== undefined" class="pop_tip">生产时间：{{pkObj.work_time}}</div>
+                      <div v-if="pkObj.error_time !== null && pkObj.error_time !== undefined" class="pop_tip">故障时间：{{pkObj.error_time}}</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 class="pop_status">
                       <div class="pop_status_dot" :class="['gray', 'yellow', 'green', 'orange'][Number(pkObj.device_status)]"></div>
                       <div class="pop_status_text" :class="['fgray', 'fyellow', 'fgreen', 'forange'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
                     </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>
@@ -131,7 +143,7 @@
             </div>
           </div>
         </div>
-        <div class="item_wrapper_h2">
+        <div class="item_wrapper_h1">
           <div class="item_block" v-for="(e, i) in MDJXS" :key="i">
             <div class="item_inner" @click.stop="getInfo(e)">
               <div class="item_img">
@@ -152,7 +164,7 @@
                 </div>
                 <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
                   <div class="info_table">已生产</div>
-                  <div class="info_data">{{e.real_qty}}KG</div>
+                  <div class="info_data">{{e.real_qty}}块</div>
                 </div>
                 <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
                   <div class="info_table">当前窑车数</div>
@@ -172,22 +184,28 @@
                 </div>
               </div>
             </div>
-            <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 v-if="e.device_code === pkObj.device_code" class="popover_block" :class="e.position">
+              <div class="foldline"></div>
+              <div class="popver_bg">
                 <div class="popver_block">
                   <div class="pop_info_name">{{pkObj.device_name}}</div>
                   <div class="pop_info_tip">
+                    <div class="top_tips">
+                      <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}}块</div>
+                      <div v-if="pkObj.open_time !== null && pkObj.open_time !== undefined" class="pop_tip">开机时间：{{pkObj.open_time}}</div>
+                      <div v-if="pkObj.stand_time !== null && pkObj.stand_time !== undefined" class="pop_tip">待机时间：{{pkObj.stand_time}}</div>
+                      <div v-if="pkObj.work_time !== null && pkObj.work_time !== undefined" class="pop_tip">生产时间：{{pkObj.work_time}}</div>
+                      <div v-if="pkObj.error_time !== null && pkObj.error_time !== undefined" class="pop_tip">故障时间：{{pkObj.error_time}}</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 class="pop_status">
                       <div class="pop_status_dot" :class="['gray', 'yellow', 'green', 'orange'][Number(pkObj.device_status)]"></div>
                       <div class="pop_status_text" :class="['fgray', 'fyellow', 'fgreen', 'forange'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
                     </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>
@@ -195,7 +213,7 @@
             </div>
           </div>
         </div>
-        <div class="item_wrapper_h2">
+        <div class="item_wrapper_h1">
           <div class="item_block" v-for="(e, i) in YAO" :key="i">
               <div class="item_inner" @click.stop="getInfo(e)">
                 <div class="item_img">
@@ -216,7 +234,7 @@
                   </div>
                   <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
                     <div class="info_table">已生产</div>
-                    <div class="info_data">{{e.real_qty}}KG</div>
+                    <div class="info_data">{{e.real_qty}}块</div>
                   </div>
                   <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
                     <div class="info_table">当前窑车数</div>
@@ -236,22 +254,28 @@
                   </div>
                 </div>
               </div>
-              <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 v-if="e.device_code === pkObj.device_code" class="popover_block" :class="e.position">
+                <div class="foldline"></div>
+                <div class="popver_bg">
                   <div class="popver_block">
                     <div class="pop_info_name">{{pkObj.device_name}}</div>
                     <div class="pop_info_tip">
+                      <div class="top_tips">
+                        <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}}块</div>
+                        <div v-if="pkObj.open_time !== null && pkObj.open_time !== undefined" class="pop_tip">开机时间：{{pkObj.open_time}}</div>
+                        <div v-if="pkObj.stand_time !== null && pkObj.stand_time !== undefined" class="pop_tip">待机时间：{{pkObj.stand_time}}</div>
+                        <div v-if="pkObj.work_time !== null && pkObj.work_time !== undefined" class="pop_tip">生产时间：{{pkObj.work_time}}</div>
+                        <div v-if="pkObj.error_time !== null && pkObj.error_time !== undefined" class="pop_tip">故障时间：{{pkObj.error_time}}</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 class="pop_status">
                         <div class="pop_status_dot" :class="['gray', 'yellow', 'green', 'orange'][Number(pkObj.device_status)]"></div>
                         <div class="pop_status_text" :class="['fgray', 'fyellow', 'fgreen', 'forange'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
                       </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>
@@ -259,7 +283,7 @@
               </div>
             </div>
         </div>
-        <div class="item_wrapper_h2">
+        <div class="item_wrapper_h1">
           <div class="item_block" v-for="(e, i) in FJJXS" :key="i">
               <div class="item_inner" @click.stop="getInfo(e)">
                 <div class="item_img">
@@ -280,7 +304,7 @@
                   </div>
                   <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
                     <div class="info_table">已生产</div>
-                    <div class="info_data">{{e.real_qty}}KG</div>
+                    <div class="info_data">{{e.real_qty}}块</div>
                   </div>
                   <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
                     <div class="info_table">当前窑车数</div>
@@ -300,22 +324,28 @@
                   </div>
                 </div>
               </div>
-              <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 v-if="e.device_code === pkObj.device_code" class="popover_block" :class="e.position">
+                <div class="foldline"></div>
+                <div class="popver_bg">
                   <div class="popver_block">
                     <div class="pop_info_name">{{pkObj.device_name}}</div>
                     <div class="pop_info_tip">
+                      <div class="top_tips">
+                        <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}}块</div>
+                        <div v-if="pkObj.open_time !== null && pkObj.open_time !== undefined" class="pop_tip">开机时间：{{pkObj.open_time}}</div>
+                        <div v-if="pkObj.stand_time !== null && pkObj.stand_time !== undefined" class="pop_tip">待机时间：{{pkObj.stand_time}}</div>
+                        <div v-if="pkObj.work_time !== null && pkObj.work_time !== undefined" class="pop_tip">生产时间：{{pkObj.work_time}}</div>
+                        <div v-if="pkObj.error_time !== null && pkObj.error_time !== undefined" class="pop_tip">故障时间：{{pkObj.error_time}}</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 class="pop_status">
                         <div class="pop_status_dot" :class="['gray', 'yellow', 'green', 'orange'][Number(pkObj.device_status)]"></div>
                         <div class="pop_status_text" :class="['fgray', 'fyellow', 'fgreen', 'forange'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
                       </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>
@@ -323,7 +353,7 @@
               </div>
             </div>
         </div>
-        <div class="item_wrapper_h2">
+        <div class="item_wrapper_h1">
           <div class="item_block" v-for="(e, i) in BZX" :key="i">
               <div class="item_inner" @click.stop="getInfo(e)">
                 <div class="item_img">
@@ -344,7 +374,7 @@
                   </div>
                   <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table_block">
                     <div class="info_table">已生产</div>
-                    <div class="info_data">{{e.real_qty}}KG</div>
+                    <div class="info_data">{{e.real_qty}}块</div>
                   </div>
                   <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
                     <div class="info_table">当前窑车数</div>
@@ -364,22 +394,28 @@
                   </div>
                 </div>
               </div>
-              <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 v-if="e.device_code === pkObj.device_code" class="popover_block" :class="e.position">
+                <div class="foldline"></div>
+                <div class="popver_bg">
                   <div class="popver_block">
                     <div class="pop_info_name">{{pkObj.device_name}}</div>
                     <div class="pop_info_tip">
+                      <div class="top_tips">
+                        <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}}块</div>
+                        <div v-if="pkObj.open_time !== null && pkObj.open_time !== undefined" class="pop_tip">开机时间：{{pkObj.open_time}}</div>
+                        <div v-if="pkObj.stand_time !== null && pkObj.stand_time !== undefined" class="pop_tip">待机时间：{{pkObj.stand_time}}</div>
+                        <div v-if="pkObj.work_time !== null && pkObj.work_time !== undefined" class="pop_tip">生产时间：{{pkObj.work_time}}</div>
+                        <div v-if="pkObj.error_time !== null && pkObj.error_time !== undefined" class="pop_tip">故障时间：{{pkObj.error_time}}</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 class="pop_status">
                         <div class="pop_status_dot" :class="['gray', 'yellow', 'green', 'orange'][Number(pkObj.device_status)]"></div>
                         <div class="pop_status_text" :class="['fgray', 'fyellow', 'fgreen', 'forange'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
                       </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>
@@ -455,38 +491,44 @@ export default {
         this.YAO = [...res.result.YAO]
         this.FJJXS = [...res.result.FJJXS]
         this.BZX = [...res.result.BZX]
-        this.addPosition1(this.HLJ)
-        this.addPosition1(this.YZJ)
-        this.addPosition1(this.MDJXS)
-        this.addPosition1(this.YAO)
-        this.addPosition1(this.FJJXS)
-        this.addPosition1(this.BZX)
+        this.addPosition(this.HLJ)
+        this.addPosition(this.YZJ)
+        this.addPosition(this.MDJXS)
+        this.addPosition(this.YAO)
+        this.addPosition(this.FJJXS)
+        this.addPosition(this.BZX)
       } else {
         this.toast(res.desc)
       }
     },
-    addPosition1 (arr) {
+    addPosition (arr) {
       for (let i = 0; i < arr.length; i++) {
-        if (i <= 4) {
-          arr[i].postion1 = 'position_1a_l'
-          arr[i].postion2 = 'position_1b_l'
-        } else if (i > 4 && i <= 9) {
-          arr[i].postion1 = 'position_1a_r'
-          arr[i].postion2 = 'position_1b_r'
-        } else if (i > 9 && i <= 14) {
-          arr[i].postion1 = 'position_1a_l'
-          arr[i].postion2 = 'position_1b_l'
-        } else if (i > 14 && i <= 19) {
-          arr[i].postion1 = 'position_1a_r'
-          arr[i].postion2 = 'position_1b_r'
-        }
-      }
-    },
-    addPosition2 (arr) {
-      for (let i = 0; i < arr.length; i++) {
-        if (i <= 4) {
-          arr[i].postion1 = 'position_1a_r'
-          arr[i].postion2 = 'position_1b_r'
+        if (arr.length <= 12) {
+          arr[i].position = 'position_r_1'
+        } else if (arr.length === 13) {
+          if (i < 1) {
+            arr[i].position = 'position_l_1'
+          } else {
+            arr[i].position = 'position_r_1'
+          }
+        } else if (arr.length === 14) {
+          if (i < 2) {
+            arr[i].position = 'position_l_1'
+          } else {
+            arr[i].position = 'position_r_1'
+          }
+        } else if (arr.length === 15) {
+          if (i < 3) {
+            arr[i].position = 'position_l_1'
+          } else {
+            arr[i].position = 'position_r_1'
+          }
+        } else if (arr.length === 16) {
+          if (i < 4) {
+            arr[i].position = 'position_l_1'
+          } else {
+            arr[i].position = 'position_r_1'
+          }
         }
       }
     },
@@ -523,26 +565,7 @@ export default {
   _fj(,center)
 .item_wrapper_h1
   width 100%
-  overflow hidden
-.item_wrapper_h2
-  width 100%
-  overflow hidden
   _fj(row,flex-end)
-.item_wrapper_f
-  width 100%
-  _fj(row)
-  overflow hidden
-.item_wrapper_l
-  width 49.85%
-// .item_block
-//   position relative
-//   width 9.55%
-//   padding 8px 4px
-//   margin-bottom 0.5%
-//   margin-right 0.5%
-//   background center center / 100% 100% url(../assets/images/bg_item.png) no-repeat
-//   &:nth-child(10n)
-//     margin-right 0
 .item_block
   position relative
   width 6.0625%
@@ -552,12 +575,6 @@ export default {
   background center center / 100% 100% url(../assets/images/bg_item.png) no-repeat
   &:nth-child(10n)
     margin-right 0
-.item_block_f
-  width 19.2%
-  margin-right 1%
-  margin-bottom 1%
-  &:nth-child(5n)
-    margin-right 0
 .item_inner
   width 100%
   overflow hidden
@@ -598,9 +615,9 @@ export default {
   word-break break-all
 .popover_block
   position absolute
-  left 0
   top 0
   z-index 100
+  _wh(610px, 288px)
 .foldline
   position absolute
   z-index 102
@@ -614,6 +631,24 @@ export default {
   overflow hidden
   _bis('../assets/images/popover_1.png')
 // 弹窗在第一行左侧1-6列情况
+.position_l_1
+  left 54%
+  .foldline
+    left 0
+    top 35px
+    transform rotateY(180deg)
+  .popver_bg
+    right 0
+    top -20px
+.position_r_1
+  right 54%
+  .foldline
+    right 0
+    top 35px
+    transform rotateY(0deg)
+  .popver_bg
+    left 0
+    top -20px
 .position_1a_l
   top 35px
   left 80px
@@ -654,25 +689,27 @@ export default {
   text-shadow 2px 2px 4px #A6E6FF
   margin-bottom 8px
 .pop_info_tip
-  position relative
-  height auto
+  _wh(100%, calc(100% - 28px))
+  overflow-y auto
+  _fj(row,,flex-start)
 .pop_status
-  position absolute
-  right 0
-  top 0
+  _wh(100px, 28px)
+  _fj(row,flex-end)
+.top_tips
+  width calc(100% - 100px)
 .pop_tip
   font-size 14px
   line-height 28px
 .pop_status_dot
-  display inline-block
   width 10px
   height 10px
   border-radius 50%
   background-color #fff
 .pop_status_text
-  display inline-block
   font-size 14px
+  line-height 28px
   color #fff
+  margin-left 5px
 .pop_table
   width 100%
   margin-top 10px
@@ -726,7 +763,7 @@ export default {
 .yellow
   background-color $yellow
 .gray
-  background-color $gray
+  background-color $gray1
 .orange
   background-color $orange
 .fgreen
@@ -734,7 +771,7 @@ export default {
 .fyellow
   color $yellow
 .fgray
-  color $gray
+  color $gray1
 .forange
   color $orange
 </style>