diff --git a/src/assets/js/getData2.js b/src/assets/js/getData2.js
index 9b297fe..9528a55 100644
--- a/src/assets/js/getData2.js
+++ b/src/assets/js/getData2.js
@@ -7,36 +7,38 @@ export const findDeviceById = (id) => post('api/cockpit/findDeviceById', {
id: id
})
export const deviceMonitor = () => {
- let res = [
- {
- 'point_id': '1',
- 'point_code': 'HLJDJW01',
- 'point_name': '混料机1对接位',
- 'point_status': '3',
- 'material_id': 1556534702800769024,
- 'material_name': '木质花纹2cm',
- 'ivt_weight': 29.500000,
- 'work_time': '50',
- 'ivt_qty': 600.000000,
- 'vehicle_qty': 15,
- 'vehicle_max_qty': 20,
- 'device_url': 'hlj'
- },
- {
- 'point_id': '1518105008862793728',
- 'point_code': 'YZJ02XL01',
- 'point_name': '压制机2下料位1',
- 'point_status': '3',
- 'material_id': 1556534702800769024,
- 'material_name': '木质花纹2cm',
- 'ivt_weight': 29.500000,
- 'work_time': '50',
- 'ivt_qty': 600.000000,
- 'vehicle_qty': 15,
- 'vehicle_max_qty': 20,
- 'device_url': 'yzj'
- }
- ]
+ let res = {
+ result: [
+ {
+ 'point_id': '1',
+ 'point_code': 'HLJDJW01',
+ 'point_name': '混料机1对接位',
+ 'point_status': '3',
+ 'material_id': 1556534702800769024,
+ 'material_name': '木质花纹2cm',
+ 'ivt_weight': 29.500000,
+ 'work_time': '50',
+ 'ivt_qty': 600.000000,
+ 'vehicle_qty': 15,
+ 'vehicle_max_qty': '',
+ 'device_url': 'hlj'
+ },
+ {
+ 'point_id': '1518105008862793728',
+ 'point_code': 'YZJ02XL01',
+ 'point_name': '压制机2下料位1',
+ 'point_status': '3',
+ 'material_id': 1556534702800769024,
+ 'material_name': '木质花纹2cm',
+ 'ivt_weight': 29.500000,
+ 'work_time': '50',
+ 'ivt_qty': 600.000000,
+ 'vehicle_qty': 15,
+ 'vehicle_max_qty': 20,
+ 'device_url': 'yzj'
+ }
+ ]
+ }
return res
}
diff --git a/src/pages/DeviceMonitor.vue b/src/pages/DeviceMonitor.vue
index 6273d75..fa04ad5 100644
--- a/src/pages/DeviceMonitor.vue
+++ b/src/pages/DeviceMonitor.vue
@@ -3,7 +3,7 @@
-
+
![]()
@@ -14,123 +14,22 @@
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
-
+
+
+
{{e.ivt_qty | numFixed(2)}}KG
+
+
-
-
+
@@ -140,123 +39,57 @@
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
-
本周用电:{{form.week_electricity}}kw.h
-
本月用电:{{form.mouth_electricity}}kw.h
-
故障信息:{{form.error_info}}
-
+ 当前生产:{{form.material_name}}
+ 已生产:{{form.real_qty}}KG
+ 载具:{{form.vehicle_code}}
+ 入库时间:{{form.instorage_time}}
+ 载具数量:{{form.vehicle_qty}}托
+ 重量:{{form.ivt_weight}}
+ 搬运托盘数:{{form.pallet_qty}}托
+ 搬入准备车道:{{form.ready_lane}}托
+ 搬入1号窑:{{form.move_first_kiln}}托
+ 搬入2号窑:{{form.move_second_kiln}}托
+ 窑1窑车数:{{form.first_kiln_qty}}托
+ 窑2窑车数:{{form.second_kiln_qty}}托
+ 完成托盘数:{{form.mechanical_pallet_qty}}车
+ 完成数量:{{form.mechanical_arm_qty}}块
+ 完成托盘数:{{form.finish_pallet_qty}}个
+ 完成跺数:{{form.finish_pile_qty}}垛
+ 故障信息:{{form.faulty_info}}
+
| 本日生产 |
已生产数量 |
单位 |
- | {{e.material_name}} |
- {{e.produce_num}} |
- {{e.unit_name}} |
+ {{e.productionDetails}} |
+ {{e.productionQty}} |
+ {{e.weightUnitName}} |
-
-
-
-
-
-
-
-
-
-
-
{{form.point_name}}
-
-
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
-
-
本周用电:{{form.week_electricity}}kw.h
-
本月用电:{{form.mouth_electricity}}kw.h
-
故障信息:{{form.error_info}}
-
+
| 本日生产 |
生产厂家 |
- 已生产(块) |
+ 已生产(块) |
-
- | {{e.material_name}} |
- {{e.factory_name}} |
- {{e.produce_num}} |
+
+ | {{e.productionDetails}} |
+ {{e.manufacturer}} |
+ {{e.productionQty}} |
-
-
-
-
-
-
-
-
-
-
-
{{form.point_name}}
-
-
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
-
-
本周用电:{{form.week_electricity}}kw.h
-
本月用电:{{form.mouth_electricity}}kw.h
-
故障信息:{{form.error_info}}
-
搬运托盘数:{{form.in_produce_num}}托
-
搬入准备车道:{{form.in_prepare}}托
-
搬入1号窑:{{form.in_first}}托
-
搬入2号窑:{{form.in_second}}托
-
-
-
-
-
-
-
-
-
-
-
{{form.point_name}}
-
-
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
-
-
本周用电:{{form.week_electricity}}kw.h
-
本月用电:{{form.mouth_electricity}}kw.h
-
故障信息:{{form.error_info}}
-
-
-
-
-
-
-
-
-
-
-
{{form.point_name}}
-
-
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
-
-
本周用电/气:{{form.week_electricity}}kw.h / {{form.week_gas}} Nm
-
本月用电/气:{{form.mouth_electricity}}kw.h / {{form.month_gas}} Nm
-
故障信息:{{form.error_info}}
-
+
| 本日生产 |
生产厂家 |
- 已生产(块) |
+ 已生产(块) |
-
- | {{e.material_name}} |
- {{e.factory_name}} |
- {{e.produce_num}} |
+
+ | {{e.productionDetails}} |
+ {{e.manufacturer}} |
+ {{e.productionQty}} |
@@ -264,203 +97,6 @@
-
-
-
-
-
-
{{form.point_name}}
-
-
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
-
-
本周用电:{{form.week_electricity}}kw.h
-
本月用电:{{form.mouth_electricity}}kw.h
-
故障信息:{{form.error_info}}
-
完成托盘数:{{form.carrier_num}}托
-
-
-
-
-
-
-
-
-
-
-
{{form.point_name}}
-
-
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
-
-
本周用电:{{form.week_electricity}}kw.h
-
本月用电:{{form.mouth_electricity}}kw.h
-
故障信息:{{form.error_info}}
-
完成托盘数:{{form.carrier_num}}托
-
完成数量:{{form.produce_total_num}}块
-
-
-
-
-
-
-
-
-
-
-
{{form.point_name}}
-
-
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
-
-
本周用电:{{form.week_electricity}}kw.h
-
本月用电:{{form.mouth_electricity}}kw.h
-
故障信息:{{form.error_info}}
-
完成托盘数:{{form.carrier_num}}托
-
完成垛数:{{form.stack_num}}垛
-
-
-
-
-
-
-
-
-
-
-
{{form.point_name}}
-
-
-
-
{{['待机', '生产中', '故障', '关机'][Number(form.point_status) - 1]}}
-
-
已完成搬运:0个
-
故障信息:{{form.error_info}}
-
-
-
-
-
-
-
-
-
-
-
-
![]()
-
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
-
-
{{e.work_hours | numFixed(2)}}小时
-
{{e.work_electricity}}KW.h
-
-
-
-
-
@@ -716,6 +352,7 @@ export default {
form: {},
allrows1: [],
allrows2: [],
+ allrows3: [],
uid: ''
}
},
@@ -739,11 +376,10 @@ export default {
},
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.allrows3 = res.result.mKilnList
this.uid = id
},
addPosition () {
@@ -782,6 +418,7 @@ export default {
this.form = {}
this.allrows1 = []
this.allrows2 = []
+ this.allrowsw3 = []
this._findDeviceById(e.point_id)
}
},
diff --git a/src/pages/HomePage.vue b/src/pages/HomePage.vue
index b0deabf..6837f68 100644
--- a/src/pages/HomePage.vue
+++ b/src/pages/HomePage.vue
@@ -32,10 +32,10 @@
-
-
-
-
-
{{['暂停', '运行', '故障', '关机'][Number(e.status) - 1]}}
+
+
+
+ {{['暂停', '运行', '故障', '关机'][Number(e.pointStatus) - 1]}}
@@ -481,6 +481,7 @@