From 94b50854fe4518fc03a987e4b828d6913b67f260 Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Mon, 6 Mar 2023 08:43:37 +0800
Subject: [PATCH] data

---
 src/assets/js/getData2.js   |   8 +-
 src/pages/DeviceMonitor.vue | 218 ++++++++++++++++++------------------
 2 files changed, 116 insertions(+), 110 deletions(-)

diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index 9dace7e..9b297fe 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -1,8 +1,11 @@
-// import {post} from './http.js'
+import {post} from './http.js'
 
 // 设备监控
 // export const deviceMonitor = () => post('api/cockpit/deviceMonitor', {
 // })
+export const findDeviceById = (id) => post('api/cockpit/findDeviceById', {
+  id: id
+})
 export const deviceMonitor = () => {
   let res = [
     {
@@ -36,3 +39,6 @@ export const deviceMonitor = () => {
   ]
   return res
 }
+
+// 车间情况
+export const workshopCondition = () => post('api/cockpit/workshopCondition', {})
diff --git a/src/pages/DeviceMonitor.vue b/src/pages/DeviceMonitor.vue
index d5081ff..6273d75 100644
--- a/src/pages/DeviceMonitor.vue
+++ b/src/pages/DeviceMonitor.vue
@@ -8,9 +8,21 @@
             <div class="item_img">
               <img v-if="e.device_url !== ''" :src="require('../assets/images/devmoni/' + e.device_url + '.jpg')" :alt="e.point_name">
             </div>
-            <div class="device_name clearfix">
-              <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.point_status) - 1]"></div>
-              <div class="fl device_name_text">{{e.point_name}}</div>
+            <div class="point_name clearfix">
+              <div class="fl point_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.point_status) - 1]"></div>
+              <div class="fl point_name_text">{{e.point_name}}</div>
+            </div>
+            <div class="info_block clearfix">
+              <div class="fl info_table_block">
+                <div class="info_table info_table_1"><p>当前生产：</p></div>
+                <div class="info_table"><p>已工作：</p></div>
+                <div class="info_table"><p>已用电：</p></div>
+              </div>
+              <div class="fr info_data_block">
+                <div class="info_data info_data_1"><p>{{e.material_name}}</p></div>
+                <div class="info_data"><p>{{e.work_hours | numFixed(2)}}小时</p></div>
+                <div class="info_data"><p>{{e.work_electricity}}KW.h</p></div>
+              </div>
             </div>
             <!-- 混碾机LB0001、压力机LB0004、机械手LB0006 -->
             <div v-if="e.deviceclass_code === 'LB0001' || e.deviceclass_code === 'LB0004' || (e.deviceclass_code === 'LB0006' && e.device_code !== 'CDJQR01' && e.device_code !== 'MDJXS01')" class="info_block clearfix">
@@ -118,15 +130,15 @@
             </div>
           </div>
           <!-- 混碾机LB0001 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0001'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -149,15 +161,15 @@
             </div>
           </div>
           <!-- 压力机LB0004、机械手LB0006 -->
-          <div v-if="e.device_uuid === uid && (e.deviceclass_code === 'LB0004' || (e.deviceclass_code === 'LB0006' && e.device_code !== 'CDJQR01' && e.device_code !== 'MDJXS01'))" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -180,15 +192,15 @@
             </div>
           </div>
           <!-- 衍架LB0010 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0010'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -203,15 +215,15 @@
             </div>
           </div>
           <!-- 空车道LB0011、准备车道LB0012、窑-暂存LB0014 -->
-          <div v-if="e.device_uuid === uid && (e.deviceclass_code === 'LB0011' || e.deviceclass_code === 'LB0012' || e.deviceclass_code === 'LB0014')" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -222,15 +234,15 @@
             </div>
           </div>
           <!-- 窑LB0013 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0013'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_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>
@@ -253,15 +265,15 @@
             </div>
           </div>
           <!-- RGVLB0015 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0015'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -273,15 +285,15 @@
             </div>
           </div>
           <!-- 拆垛机械手、码垛机械手LB0006 -->
-          <div v-if="e.device_uuid === uid && (e.deviceclass_code === 'LB0006' && e.device_code === 'CDJQR01'|| e.device_code === 'MDJXS01')" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -294,15 +306,15 @@
             </div>
           </div>
           <!-- 叠盘机LB0016 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0016'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -315,15 +327,15 @@
             </div>
           </div>
           <!-- AGVLB0019 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0019'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">已完成搬运：0个</div>
                   <div class="pop_tip">故障信息：{{form.error_info}}</div>
@@ -335,14 +347,14 @@
         </div>
       </div>
       <div class="item_tr clearfix">
-        <div class="item_block fl" v-for="e in deviceDatas.slice(9)" :key="e.device_uuid">
+        <div class="item_block fl" v-for="e in deviceDatas.slice(9)" :key="e.point_id">
           <div class="item_inner" @click="getInfo(e)">
             <div class="item_img">
-              <img v-if="e.device_url !== ''" :src="require('../assets/images/devmoni/' + e.device_url + '.jpg')" :alt="e.device_name">
+              <img v-if="e.device_url !== ''" :src="require('../assets/images/devmoni/' + e.device_url + '.jpg')" :alt="e.point_name">
             </div>
-            <div class="device_name clearfix">
-              <div class="fl device_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.status) - 1]"></div>
-              <div class="fl device_name_text">{{e.device_name}}</div>
+            <div class="point_name clearfix">
+              <div class="fl point_name_tag" :class="['yellow', 'green', 'orange', 'gray'][Number(e.point_status) - 1]"></div>
+              <div class="fl point_name_text">{{e.point_name}}</div>
             </div>
             <!-- 混碾机LB0001、压力机LB0004、机械手LB0006 -->
             <div v-if="e.deviceclass_code === 'LB0001' || e.deviceclass_code === 'LB0004' || (e.deviceclass_code === 'LB0006' && e.device_code !== 'CDJQR01' && e.device_code !== 'MDJXS01')" class="info_block clearfix">
@@ -450,15 +462,15 @@
             </div>
           </div>
           <!-- 混碾机LB0001 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0001'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -481,15 +493,15 @@
             </div>
           </div>
           <!-- 压力机LB0004、机械手LB0006 -->
-          <div v-if="e.device_uuid === uid && (e.deviceclass_code === 'LB0004' || (e.deviceclass_code === 'LB0006' && e.device_code !== 'CDJQR01' && e.device_code !== 'MDJXS01'))" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -512,15 +524,15 @@
             </div>
           </div>
           <!-- 衍架LB0010 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0010'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -535,15 +547,15 @@
             </div>
           </div>
           <!-- 空车道LB0011、准备车道LB0012、窑-暂存LB0014 -->
-          <div v-if="e.device_uuid === uid && (e.deviceclass_code === 'LB0011' || e.deviceclass_code === 'LB0012' || e.deviceclass_code === 'LB0014')" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -554,15 +566,15 @@
             </div>
           </div>
           <!-- 窑LB0013 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0013'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_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>
@@ -585,15 +597,15 @@
             </div>
           </div>
           <!-- RGVLB0015 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0015'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -605,15 +617,15 @@
             </div>
           </div>
           <!-- 拆垛机械手、码垛机械手LB0006 -->
-          <div v-if="e.device_uuid === uid && (e.deviceclass_code === 'LB0006' && e.device_code === 'CDJQR01'|| e.device_code === 'MDJXS01')" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -626,15 +638,15 @@
             </div>
           </div>
           <!-- 叠盘机LB0016 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0016'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">本周用电：{{form.week_electricity}}kw.h</div>
                   <div class="pop_tip">本月用电：{{form.mouth_electricity}}kw.h</div>
@@ -647,15 +659,15 @@
             </div>
           </div>
           <!-- AGVLB0019 -->
-          <div v-if="e.device_uuid === uid && e.deviceclass_code === 'LB0019'" class="popover_block">
+          <div v-if="e.point_id === 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_name">{{form.point_name}}</div>
                 <div class="pop_info_tip">
                   <div class="pop_status">
-                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.status) - 1]"></div>
-                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.status) - 1]}}</div>
+                    <div class="pop_status_dot" :class="['yellow', 'green', 'orange', 'gray'][Number(form.point_status) - 1]"></div>
+                    <div class="pop_status_text" :class="['fyellow', 'fgreen', 'forange', 'fgray'][Number(form.point_status) - 1]">{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}</div>
                   </div>
                   <div class="pop_tip">已完成搬运：0个</div>
                   <div class="pop_tip">故障信息：{{form.error_info}}</div>
@@ -690,7 +702,7 @@
 
 <script>
 import THeader from '@components/header.vue'
-import { deviceMonitor } from '@js/getData2'
+import { deviceMonitor, findDeviceById } from '@js/getData2'
 export default {
   name: 'DeviceMonitor',
   components: {
@@ -722,7 +734,17 @@ export default {
     },
     async initData () {
       let res = await deviceMonitor()
-      this.deviceDatas = [...res]
+      this.deviceDatas = res.result
+      this.addPosition()
+    },
+    async _findDeviceById (id) {
+      let res = await findDeviceById(id)
+      this.deviceDatas = res.result
+
+      this.form = res.result
+      this.allrows1 = res.result.mixingList
+      this.allrows2 = res.result.crushingList
+      this.uid = id
     },
     addPosition () {
       for (let i = 0; i < this.deviceDatas.length; i++) {
@@ -754,37 +776,15 @@ export default {
       }
     },
     getInfo (e) {
-      if (this.uid === e.device_uuid) {
+      if (this.uid === e.point_id) {
         this.uid = ''
       } else {
         this.form = {}
         this.allrows1 = []
         this.allrows2 = []
-        this.initItem(e.device_uuid)
+        this._findDeviceById(e.point_id)
       }
     },
-    initItem (uid) {
-      let data = {
-        '_SRVNAME': 'service.st.al.realivt',
-        '_SRVMETHOD': 'queryDeviceById',
-        '_DATA': JSON.stringify({
-          accountId: '-1',
-          device_uuid: uid
-        })
-      }
-      this
-        .$post(data)
-        .then(res => {
-          if (res.code === '1') {
-            this.form = res.result.form
-            this.allrows1 = res.result.form.allrows1
-            this.allrows2 = res.result.form.allrows2
-            this.uid = uid
-          } else {
-            this.toast(res.desc)
-          }
-        })
-    },
     closebtn () {
       this.uid = ''
     }
@@ -826,14 +826,14 @@ export default {
   background-color $gray
   img
     _wh(100%,100%)
-.device_name_tag
+.point_name_tag
   _wh(10px,10px)
   border-radius 50%
   margin 2px
   background-color #ffffff
-.device_name_text
+.point_name_text
   _font(14px,14px,,,left)
-.device_name, .info_block
+.point_name, .info_block
   width 100%
   padding 4px 0
 .info_table_block