diff --git a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
index ae8aa405..8ffe0043 100644
--- a/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
+++ b/src/views/ManufacturingCenter/ActualWorkQuery/index.vue
@@ -48,7 +48,7 @@
- {{ scope.row.实际加工时间段 || '—' }}
+ {{ scope.row.设备工时 || '—' }}
diff --git a/src/views/ManufacturingCenter/ManHourStatistics/index.vue b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
index b7384daa..debedd5e 100644
--- a/src/views/ManufacturingCenter/ManHourStatistics/index.vue
+++ b/src/views/ManufacturingCenter/ManHourStatistics/index.vue
@@ -33,9 +33,9 @@
{{ scope.row.理论加工时间段 }}
-
+
- {{ scope.row.实际加工时间段 }}
+ {{ scope.row.设备工时 }}
@@ -175,7 +175,7 @@ export default {
}
searchtable(this.workerName_ckeck, this.workerName, this.timeCheck, this.startTime, this.endTime).then(response => {
response.data.map(v => {
- this.$set(v, '比例', v.理论加工时间段 === 0 ? 0 : Math.round(v.实际加工时间段 / v.理论加工时间段 * 100) / 100.00)
+ this.$set(v, '比例', v.理论加工时间段 === 0 ? 0 : Math.round(v.设备工时 / v.理论加工时间段 * 100) / 100.00)
})
this.tableData = response.data
this.loading = false
diff --git a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
index f2a4a0ce..aa2f6807 100644
--- a/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
+++ b/src/views/ManufacturingCenter/ScheduleCompletionDetails/index.vue
@@ -45,9 +45,9 @@
{{ scope.row.理论加工时间段 }}
-
+
- {{ scope.row.实际加工时间段 }}
+ {{ scope.row.设备工时 }}
@@ -106,7 +106,7 @@
- {{ scope.row.实际加工时间段 }}
+ {{ scope.row.设备工时 ? scope.row.设备工时 : 0 }}
@@ -197,6 +197,7 @@ export default {
工艺名称: response.data.rows[i].工艺名称,
完成数量: response.data.rows[i].完成数量,
质检结果: response.data.rows[i].质检结果,
+ 设备工时: response.data.rows[i].设备工时,
不合格数量: response.data.rows[i].不合格数量,
理论加工时间段: response.data.rows[i].理论加工时间段,
实际加工时间段: response.data.rows[i].实际加工时间段,