From e389249a3f08467fd5c436d496f8272d88447bfb Mon Sep 17 00:00:00 2001
From: caill <815519168@qq.com>
Date: Thu, 9 Mar 2023 16:54:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/js/getData2.js   | 4 +++-
 src/pages/DeviceMonitor.vue | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index 732230f..7cff5d7 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -337,7 +337,9 @@ export const findDeviceById = (id) => post('api/cockpit/findDeviceById', {
 //         'work_time': '3.5',
 //         'vehicle_qty': 15,
 //         'vehicle_max_qty': 20,
-//         'device_url': 'YAO'
+//         'device_url': 'YAO',
+//         'device_status_name': 'aa',
+//         'vehicle_type': 'dd'
 //       },
 //       {
 //         'device_code': 'DPJ',
diff --git a/src/pages/DeviceMonitor.vue b/src/pages/DeviceMonitor.vue
index d49d172..dd9afe6 100644
--- a/src/pages/DeviceMonitor.vue
+++ b/src/pages/DeviceMonitor.vue
@@ -19,6 +19,8 @@
                 <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_table"><p>已生产：</p></div>
                 <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_table"><p>当前窑车数：</p></div>
                 <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_table"><p>容  量：</p></div>
+                <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_table"><p>载具类型：</p></div>
+                <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_table"><p>当前状态：</p></div>
               </div>
               <div class="fr info_data_block">
                 <div v-if="e.material_name !== null && e.material_name !== undefined" class="info_data"><p>{{e.material_name}}</p></div>
@@ -26,6 +28,8 @@
                 <div v-if="e.real_qty !== null && e.real_qty !== undefined" class="info_data"><p>{{e.real_qty}}KG</p></div>
                 <div v-if="e.vehicle_qty !== null && e.vehicle_qty !== undefined" class="info_data"><p>{{e.vehicle_qty}}车</p></div>
                 <div v-if="e.vehicle_max_qty !== null && e.vehicle_max_qty !== undefined" class="info_data"><p>{{e.vehicle_max_qty}}车</p></div>
+                <div v-if="e.vehicle_type !== null && e.vehicle_type !== undefined" class="info_data"><p>{{e.vehicle_type}}</p></div>
+                <div v-if="e.device_status_name !== null && e.device_status_name !== undefined" class="info_data"><p>{{e.device_status_name}}</p></div>
               </div>
             </div>
           </div>