diff --git a/src/locales/en.ts b/src/locales/en.ts
index e990e60e..c11f19cf 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1355,9 +1355,10 @@ export default {
workshop: 'Workshop',
ratedCapacity: 'Rated Capacity (Planned Capacity)',
reportCapacity: 'Report Capacity',
- reportCapacityTooltip: 'Average of data from the last half year',
+ reportCapacityTooltip: 'Average of data from the last half year (excluding today)',
reportCapacityViewDetail: 'View Detail',
actualCapacity: 'Actual Capacity',
+ actualCapacityTooltip: 'Average of data from the last half year (excluding today)',
placeholderDeviceCode: 'Please input device code',
placeholderDeviceName: 'Please input device name',
placeholderDeviceType: 'Please input device type',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index c94f4ad6..8f2d48ef 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -1345,9 +1345,10 @@ export default {
workshop: '所属车间',
ratedCapacity: '额定产能(计划产能)',
reportCapacity: '报工产能',
- reportCapacityTooltip: '近半年的数据均值',
+ reportCapacityTooltip: '近半年的数据均值(不包含今日)',
reportCapacityViewDetail: '查看明细',
actualCapacity: '实际产能',
+ actualCapacityTooltip: '近半年的数据均值(不包含今日)',
placeholderDeviceCode: '请输入设备编码',
placeholderDeviceName: '请输入设备名称',
placeholderDeviceType: '请输入设备类型',
diff --git a/src/views/mes/capacityReport/ProductCapacityDialog.vue b/src/views/mes/capacityReport/ProductCapacityDialog.vue
index 716aa4f8..7c020697 100644
--- a/src/views/mes/capacityReport/ProductCapacityDialog.vue
+++ b/src/views/mes/capacityReport/ProductCapacityDialog.vue
@@ -19,15 +19,6 @@
class="!w-200px"
/>
-
-
-
@@ -43,7 +34,6 @@
-
@@ -93,8 +83,7 @@ const queryParams = reactive({
pageSize: 10,
deviceId: undefined as number | undefined,
productCode: undefined as string | undefined,
- productName: undefined as string | undefined,
- taskCode: undefined as string | undefined
+ productName: undefined as string | undefined
})
const queryFormRef = ref()
diff --git a/src/views/mes/capacityReport/index.vue b/src/views/mes/capacityReport/index.vue
index b58cce17..479a73fa 100644
--- a/src/views/mes/capacityReport/index.vue
+++ b/src/views/mes/capacityReport/index.vue
@@ -12,16 +12,6 @@
:placeholder="t('EquipmentManagement.CapacityReport.placeholderDeviceName')" clearable
@keyup.enter="handleQuery" class="!w-240px" />
-
-
-
-
-
-
@@ -72,8 +62,15 @@
-
+
+
+ {{ t('EquipmentManagement.CapacityReport.actualCapacity') }}
+
+
+
+
+
@@ -109,8 +106,8 @@ const queryParams = reactive({
})
const queryFormRef = ref()
const exportLoading = ref(false)
-const showAllFilters = ref(false) // 是否显示所有筛选框
-const filterCount = 4 // 筛选框数量
+const showAllFilters = ref(false)
+const filterCount = 2
const selectedIds = ref([])
const productCapacityVisible = ref(false)
const productCapacityDeviceId = ref()