From 824b55f854cbc5856adb43fbfe784bf6eca923ed Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 11 May 2023 13:51:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=9B=91=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/DeviceMonitor.vue | 338 ++++++++++++++++++------------------
 1 file changed, 172 insertions(+), 166 deletions(-)

diff --git a/src/pages/DeviceMonitor.vue b/src/pages/DeviceMonitor.vue
index 20b0ec1..9ec986f 100644
--- a/src/pages/DeviceMonitor.vue
+++ b/src/pages/DeviceMonitor.vue
@@ -10,7 +10,7 @@
                 <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
               </div>
               <div class="device_name clearfix">
-                <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
+                <div class="fl device_name_tag" :class="['gray', 'yellow', 'green', 'orange'][Number(e.device_status)]"></div>
                 <div class="fl device_name_text">{{e.device_name}}</div>
               </div>
               <div class="info_block">
@@ -51,8 +51,8 @@
                   <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(pkObj.device_status)]"></div>
-                      <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
+                      <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>
@@ -67,14 +67,14 @@
             </div>
           </div>
         </div>
-        <div class="item_wrapper_h1">
+        <div class="item_wrapper_h2">
           <div class="item_block fl" v-for="(e, i) in YZJ" :key="i">
             <div class="item_inner" @click.stop="getInfo(e)">
               <div class="item_img">
                 <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
               </div>
               <div class="device_name clearfix">
-                <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
+                <div class="fl device_name_tag" :class="['gray', 'yellow', 'green', 'orange'][Number(e.device_status)]"></div>
                 <div class="fl device_name_text">{{e.device_name}}</div>
               </div>
               <div class="info_block">
@@ -115,8 +115,8 @@
                   <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(pkObj.device_status)]"></div>
-                      <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
+                      <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>
@@ -131,145 +131,78 @@
             </div>
           </div>
         </div>
-        <div class="item_wrapper_f">
-          <div class="item_wrapper_l">
-            <div class="item_block item_block_f fl" v-for="(e, i) in MDJXS" :key="i">
-              <div class="item_inner" @click.stop="getInfo(e)">
-                <div class="item_img">
-                  <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
-                </div>
-                <div class="device_name clearfix">
-                  <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
-                  <div class="fl device_name_text">{{e.device_name}}</div>
-                </div>
-                <div class="info_block">
-                  <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
-                    <div class="info_table">当前生产</div>
-                    <div class="info_data">{{e.material_name}}</div>
-                  </div>
-                  <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
-                    <div class="info_table">已工作</div>
-                    <div class="info_data">{{e.work_time}}小时</div>
-                  </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>
-                  <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
-                    <div class="info_table">当前窑车数</div>
-                    <div class="info_data">{{e.vehicle_qty}}车</div>
-                  </div>
-                  <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
-                    <div class="info_table">容量</div>
-                    <div class="info_data">{{e.vehicle_max_qty}}车</div>
-                  </div>
-                  <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
-                    <div class="info_table">载具类型</div>
-                    <div class="info_data">{{e.vehicle_type}}</div>
-                  </div>
-                  <div class="info_table_block">
-                    <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
-                    <div class="info_data">{{e.device_status_name}}</div>
-                  </div>
-                </div>
+        <div class="item_wrapper_h2">
+          <div class="item_block fl" v-for="(e, i) in MDJXS" :key="i">
+            <div class="item_inner" @click.stop="getInfo(e)">
+              <div class="item_img">
+                <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
               </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 class="popver_block">
-                    <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(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="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>
+              <div class="device_name clearfix">
+                <div class="fl device_name_tag" :class="['gray', 'yellow', 'green', 'orange'][Number(e.device_status)]"></div>
+                <div class="fl device_name_text">{{e.device_name}}</div>
+              </div>
+              <div class="info_block">
+                <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
+                  <div class="info_table">当前生产</div>
+                  <div class="info_data">{{e.material_name}}</div>
+                </div>
+                <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
+                  <div class="info_table">已工作</div>
+                  <div class="info_data">{{e.work_time}}小时</div>
+                </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>
+                <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
+                  <div class="info_table">当前窑车数</div>
+                  <div class="info_data">{{e.vehicle_qty}}车</div>
+                </div>
+                <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
+                  <div class="info_table">容量</div>
+                  <div class="info_data">{{e.vehicle_max_qty}}车</div>
+                </div>
+                <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
+                  <div class="info_table">载具类型</div>
+                  <div class="info_data">{{e.vehicle_type}}</div>
+                </div>
+                <div class="info_table_block">
+                  <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
+                  <div class="info_data">{{e.device_status_name}}</div>
                 </div>
               </div>
             </div>
-          </div>
-          <div class="item_wrapper_l">
-            <div class="item_block item_block_f fl" v-for="(e, i) in YAO" :key="i">
-              <div class="item_inner" @click.stop="getInfo(e)">
-                <div class="item_img">
-                  <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
-                </div>
-                <div class="device_name clearfix">
-                  <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
-                  <div class="fl device_name_text">{{e.device_name}}</div>
-                </div>
-                <div class="info_block">
-                  <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
-                    <div class="info_table">当前生产</div>
-                    <div class="info_data">{{e.material_name}}</div>
-                  </div>
-                  <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
-                    <div class="info_table">已工作</div>
-                    <div class="info_data">{{e.work_time}}小时</div>
-                  </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>
-                  <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
-                    <div class="info_table">当前窑车数</div>
-                    <div class="info_data">{{e.vehicle_qty}}车</div>
-                  </div>
-                  <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
-                    <div class="info_table">容量</div>
-                    <div class="info_data">{{e.vehicle_max_qty}}车</div>
-                  </div>
-                  <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
-                    <div class="info_table">载具类型</div>
-                    <div class="info_data">{{e.vehicle_type}}</div>
-                  </div>
-                  <div class="info_table_block">
-                    <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
-                    <div class="info_data">{{e.device_status_name}}</div>
-                  </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 class="popver_block">
-                    <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(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="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 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">{{pkObj.device_name}}</div>
+                  <div class="pop_info_tip">
+                    <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 class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
                 </div>
+                <div class="iconfont icon-guanbi close_btn" @click="closebtn"></div>
               </div>
             </div>
           </div>
         </div>
-        <div class="item_wrapper_f">
-          <div class="item_wrapper_l">
-            <div class="item_block item_block_f fl" v-for="(e, i) in FJJXS" :key="i">
+        <div class="item_wrapper_h2">
+          <div class="item_block fl" v-for="(e, i) in YAO" :key="i">
               <div class="item_inner" @click.stop="getInfo(e)">
                 <div class="item_img">
                   <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
                 </div>
                 <div class="device_name clearfix">
-                  <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
+                  <div class="fl device_name_tag" :class="['gray', 'yellow', 'green', 'orange'][Number(e.device_status)]"></div>
                   <div class="fl device_name_text">{{e.device_name}}</div>
                 </div>
                 <div class="info_block">
@@ -310,8 +243,8 @@
                     <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(pkObj.device_status)]"></div>
-                        <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
+                        <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>
@@ -325,15 +258,15 @@
                 </div>
               </div>
             </div>
-          </div>
-          <div class="item_wrapper_l">
-            <div class="item_block item_block_f fl" v-for="(e, i) in BZX" :key="i">
+        </div>
+        <div class="item_wrapper_h2">
+          <div class="item_block fl" v-for="(e, i) in FJJXS" :key="i">
               <div class="item_inner" @click.stop="getInfo(e)">
                 <div class="item_img">
                   <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
                 </div>
                 <div class="device_name clearfix">
-                  <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.device_status)]"></div>
+                  <div class="fl device_name_tag" :class="['gray', 'yellow', 'green', 'orange'][Number(e.device_status)]"></div>
                   <div class="fl device_name_text">{{e.device_name}}</div>
                 </div>
                 <div class="info_block">
@@ -374,8 +307,72 @@
                     <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(pkObj.device_status)]"></div>
-                        <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(pkObj.device_status)]">{{pkObj.device_status_name}}</div>
+                        <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>
+                </div>
+              </div>
+            </div>
+        </div>
+        <div class="item_wrapper_h2">
+          <div class="item_block fl" v-for="(e, i) in BZX" :key="i">
+              <div class="item_inner" @click.stop="getInfo(e)">
+                <div class="item_img">
+                  <img v-if="e.device_url !== ''" :src="require('../assets/images/devmon/' + e.device_url + '.jpg')" :alt="e.device_name">
+                </div>
+                <div class="device_name clearfix">
+                  <div class="fl device_name_tag" :class="['gray', 'yellow', 'green', 'orange'][Number(e.device_status)]"></div>
+                  <div class="fl device_name_text">{{e.device_name}}</div>
+                </div>
+                <div class="info_block">
+                  <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_table_block">
+                    <div class="info_table">当前生产</div>
+                    <div class="info_data">{{e.material_name}}</div>
+                  </div>
+                  <div v-if="e.work_time !== null && e.work_time !== undefined" class="info_table_block">
+                    <div class="info_table">已工作</div>
+                    <div class="info_data">{{e.work_time}}小时</div>
+                  </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>
+                  <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table_block">
+                    <div class="info_table">当前窑车数</div>
+                    <div class="info_data">{{e.vehicle_qty}}车</div>
+                  </div>
+                  <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table_block">
+                    <div class="info_table">容量</div>
+                    <div class="info_data">{{e.vehicle_max_qty}}车</div>
+                  </div>
+                  <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table_block">
+                    <div class="info_table">载具类型</div>
+                    <div class="info_data">{{e.vehicle_type}}</div>
+                  </div>
+                  <div class="info_table_block">
+                    <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table">当前状态</div>
+                    <div class="info_data">{{e.device_status_name}}</div>
+                  </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 class="popver_block">
+                    <div class="pop_info_name">{{pkObj.device_name}}</div>
+                    <div class="pop_info_tip">
+                      <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>
@@ -389,22 +386,21 @@
                 </div>
               </div>
             </div>
-          </div>
         </div>
       </div>
     </div>
     <div class="tag_block">
       <div class="tag_type">
-        <div class="type_color green"></div>
-        <div class="tag_text">运行</div>
+        <div class="type_color gray"></div>
+        <div class="tag_text">关机</div>
       </div>
       <div class="tag_type">
         <div class="type_color yellow"></div>
-        <div class="tag_text">暂停</div>
+        <div class="tag_text">待机</div>
       </div>
       <div class="tag_type">
-        <div class="type_color gray"></div>
-        <div class="tag_text">停机</div>
+        <div class="type_color green"></div>
+        <div class="tag_text">生产中</div>
       </div>
       <div class="tag_type">
         <div class="type_color orange"></div>
@@ -462,9 +458,9 @@ export default {
         this.addPosition1(this.HLJ)
         this.addPosition1(this.YZJ)
         this.addPosition1(this.MDJXS)
-        this.addPosition2(this.YAO)
+        this.addPosition1(this.YAO)
         this.addPosition1(this.FJJXS)
-        this.addPosition2(this.BZX)
+        this.addPosition1(this.BZX)
       } else {
         this.toast(res.desc)
       }
@@ -523,7 +519,7 @@ export default {
 .item_tr
   width 100%
   height auto
-  padding 3% .5%
+  padding 34px .5% 15px .5%
   _fj(,center)
 .item_wrapper_h1
   width 100%
@@ -537,12 +533,21 @@ export default {
   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 9.55%
+  width 6.0625%
   padding 8px 4px
-  margin-bottom 0.5%
-  margin-right 0.5%
+  margin-bottom 0.4%
+  margin-right 0.2%
   background center center / 100% 100% url(../assets/images/bg_item.png) no-repeat
   &:nth-child(10n)
     margin-right 0
@@ -556,7 +561,7 @@ export default {
   width 100%
   overflow hidden
 .item_img
-  _wh(98%,91px)
+  _wh(98%,70px)
   margin 0 auto 5px auto
   border 1px solid #393F51
   background-color $gray
@@ -573,20 +578,20 @@ export default {
   width 100%
   padding 4px 0
 .info_block
-  _wh(100%, 80px)
+  _wh(100%, 98px)
   padding 4px 0
   overflow hidden
 .info_table_block
   width 100%
   _fj(row,,flex-start)
 .info_table
-  width 80px
-  max-height 36px
+  width 60px
+  max-height 54px
   overflow hidden
   _font(12px,18px,,100,left)
 .info_data
-  width calc(100% - 80px)
-  max-height 36px
+  width calc(100% - 64px)
+  max-height 54px
   overflow hidden
   _font(12px,18px,,200,right)
   word-break break-all
@@ -701,21 +706,22 @@ export default {
         border-bottom none
 .tag_block
   position fixed
-  bottom 10px
+  bottom 20px
   right 54px
+  _fj(row, flex-end)
 .tag_type
-  display inline-block
-  padding-left 30px
+  height 16px
+  _fj(row)
+  margin-left 30px
 .type_color
-  display inline-block
-  width 10px
-  height 10px
+  width 14px
+  height 14px
   border-radius 50%
+  margin-right 10px
 .tag_text
-  display inline-block
-  _font(14px,20px,,,left)
+  _font(16px,16px,,,left)
 .green
-  background-color $green
+  background-color $green2
 .yellow
   background-color $yellow
 .gray
@@ -723,7 +729,7 @@ export default {
 .orange
   background-color $orange
 .fgreen
-  color $green
+  color $green2
 .fyellow
   color $yellow
 .fgray