diff --git a/src/views/productionManagement/productionMonitoring.vue b/src/views/productionManagement/productionMonitoring.vue index a53d342..38ba8b1 100644 --- a/src/views/productionManagement/productionMonitoring.vue +++ b/src/views/productionManagement/productionMonitoring.vue @@ -122,6 +122,9 @@ :itemData="itemData" @closeDialog="closeDialog" > + + + @@ -132,7 +135,7 @@ import batchesDialog from './components/batchesDialog.vue'; import closedDialog from './components/closedDialog.vue'; import abnormalDialog from './components/abnormalDialog.vue'; import productionMonitoringDialog from './components/productionMonitoringDialog.vue'; - +import workRate from "@/views/workRate/index.vue"; import { getList,turnType } from '@/api/productionManagement/productionMonitoring'; export default { @@ -143,9 +146,11 @@ export default { closedDialog, abnormalDialog, productionMonitoringDialog, + workRate, }, data() { return { + isWorkRateOpen: true, isPriorityOpen: false, showAbnormal: false, showOemDialog: false, @@ -645,7 +650,7 @@ export default { // 生产监控 clickProduction(row) { this.rowItem = row; - this.monitorDialog = true; + this.isWorkRateOpen = true; }, // 打印标签 handlePrintTags() { @@ -689,7 +694,7 @@ export default { // 关闭弹窗 closeDialog(type) { this.showOemDialog = false; - this.monitorDialog = false; + this.isWorkRateOpen = false; this.showBatches = false; this.showClose = false; this.showAbnormal = false; diff --git a/src/views/workRate/index.vue b/src/views/workRate/index.vue index 332cea4..6cc219e 100644 --- a/src/views/workRate/index.vue +++ b/src/views/workRate/index.vue @@ -1,11 +1,90 @@