diff --git a/src/api/mes/plan/index.ts b/src/api/mes/plan/index.ts
index 37d6a0dc..aa005db7 100644
--- a/src/api/mes/plan/index.ts
+++ b/src/api/mes/plan/index.ts
@@ -177,5 +177,9 @@ export const PlanApi = {
getPlanPageByTask: async (params: any) => {
return await request.get({ url: `/mes/plan/page-by-task`, params })
+ },
+
+ getProductCapacityPage: async (params: any) => {
+ return await request.get({ url: `/mes/plan/product-capacity-page`, params })
}
}
diff --git a/src/locales/en.ts b/src/locales/en.ts
index 1a6c8d66..e990e60e 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1353,14 +1353,27 @@ export default {
deviceType: 'Device Type',
deviceStatus: 'Device Status',
workshop: 'Workshop',
- ratedCapacity: 'Rated Capacity',
+ ratedCapacity: 'Rated Capacity (Planned Capacity)',
reportCapacity: 'Report Capacity',
+ reportCapacityTooltip: 'Average of data from the last half year',
+ reportCapacityViewDetail: 'View Detail',
actualCapacity: 'Actual Capacity',
placeholderDeviceCode: 'Please input device code',
placeholderDeviceName: 'Please input device name',
placeholderDeviceType: 'Please input device type',
placeholderDeviceStatus: 'Please select device status',
placeholderWorkshop: 'Please input workshop',
+ dialogTitlePrefix: 'Report Capacity Detail - ',
+ dialogProductCode: 'Product Code',
+ dialogProductCodePlaceholder: 'Please input product code',
+ dialogProductName: 'Product Name',
+ dialogProductNamePlaceholder: 'Please input product name',
+ dialogTaskCode: 'Task Code',
+ dialogTaskCodePlaceholder: 'Please input task code',
+ dialogBaogongTotal: 'Report Total',
+ dialogAvgCapacity: 'Avg Report Capacity',
+ dialogSearchButtonText: 'Search',
+ dialogResetButtonText: 'Reset',
exportFilename: 'Capacity Report.xls'
},
// Critical Component
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 8d045c09..c94f4ad6 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1343,14 +1343,27 @@ export default {
deviceType: '设备类型',
deviceStatus: '设备状态',
workshop: '所属车间',
- ratedCapacity: '额定产能',
+ ratedCapacity: '额定产能(计划产能)',
reportCapacity: '报工产能',
+ reportCapacityTooltip: '近半年的数据均值',
+ reportCapacityViewDetail: '查看明细',
actualCapacity: '实际产能',
placeholderDeviceCode: '请输入设备编码',
placeholderDeviceName: '请输入设备名称',
placeholderDeviceType: '请输入设备类型',
placeholderDeviceStatus: '请选择设备状态',
placeholderWorkshop: '请输入所属车间',
+ dialogTitlePrefix: '报工产能明细 - ',
+ dialogProductCode: '产品编码',
+ dialogProductCodePlaceholder: '请输入产品编码',
+ dialogProductName: '产品名称',
+ dialogProductNamePlaceholder: '请输入产品名称',
+ dialogTaskCode: '任务编码',
+ dialogTaskCodePlaceholder: '请输入任务编码',
+ dialogBaogongTotal: '报工总数',
+ dialogAvgCapacity: '报工均值产能',
+ dialogSearchButtonText: '搜索',
+ dialogResetButtonText: '重置',
exportFilename: '产能报表.xls'
},
// 设备关键件
diff --git a/src/views/mes/capacityReport/ProductCapacityDialog.vue b/src/views/mes/capacityReport/ProductCapacityDialog.vue
new file mode 100644
index 00000000..716aa4f8
--- /dev/null
+++ b/src/views/mes/capacityReport/ProductCapacityDialog.vue
@@ -0,0 +1,140 @@
+
+
+
+
+
diff --git a/src/views/mes/capacityReport/index.vue b/src/views/mes/capacityReport/index.vue
index 4f42f55b..b58cce17 100644
--- a/src/views/mes/capacityReport/index.vue
+++ b/src/views/mes/capacityReport/index.vue
@@ -1,50 +1,28 @@
-
+
-
+
-
+
-
+
-
+
-
+
@@ -52,7 +30,7 @@
t('FactoryModeling.FactoryStructure.expandText') }}
-
+
{{ t('common.query') }}
@@ -69,37 +47,49 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{ t('EquipmentManagement.CapacityReport.reportCapacity') }}
+
+
+
+
+
+
+ {{ t('EquipmentManagement.CapacityReport.reportCapacityViewDetail') }}
+
+
+
+
+
-
+
+
+