From 63d7ab3c8da0ea2b0ae5391c0c452fbd1d1009a9 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Mon, 11 May 2026 15:07:52 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E4=BA=A7=E8=83=BD=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8-=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/en.ts                             |  3 ++-
 src/locales/zh-CN.ts                          |  3 ++-
 .../capacityReport/ProductCapacityDialog.vue  | 13 +---------
 src/views/mes/capacityReport/index.vue        | 25 ++++++++-----------
 4 files changed, 16 insertions(+), 28 deletions(-)

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"
         />
       </el-form-item>
-      <el-form-item :label="t('EquipmentManagement.CapacityReport.dialogTaskCode')" prop="taskCode">
-        <el-input
-          v-model="queryParams.taskCode"
-          :placeholder="t('EquipmentManagement.CapacityReport.dialogTaskCodePlaceholder')"
-          clearable
-          @keyup.enter="handleQuery"
-          class="!w-200px"
-        />
-      </el-form-item>
       <el-form-item>
         <el-button @click="handleQuery">
           <Icon icon="ep:search" class="mr-5px" />
@@ -43,7 +34,6 @@
     <el-table v-loading="loading" :data="list" :stripe="true" :show-overflow-tooltip="true" style="margin-top: 16px">
       <el-table-column :label="t('EquipmentManagement.CapacityReport.dialogProductCode')" align="center" prop="productCode" />
       <el-table-column :label="t('EquipmentManagement.CapacityReport.dialogProductName')" align="center" prop="productName" />
-      <el-table-column :label="t('EquipmentManagement.CapacityReport.dialogTaskCode')" align="center" prop="taskCode" />
       <el-table-column :label="t('EquipmentManagement.CapacityReport.dialogBaogongTotal')" align="center" prop="baogongTotal" />
       <el-table-column :label="t('EquipmentManagement.CapacityReport.dialogAvgCapacity')" align="center" prop="avgCapacity" />
     </el-table>
@@ -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" />
       </el-form-item>
-      <el-form-item :label="t('EquipmentManagement.CapacityReport.deviceType')" prop="deviceType">
-        <el-input v-model="queryParams.deviceType"
-          :placeholder="t('EquipmentManagement.CapacityReport.placeholderDeviceType')" clearable
-          @keyup.enter="handleQuery" class="!w-240px" />
-      </el-form-item>
-      <el-form-item :label="t('EquipmentManagement.CapacityReport.workshop')" prop="workshop" v-show="showAllFilters">
-        <el-input v-model="queryParams.workshop"
-          :placeholder="t('EquipmentManagement.CapacityReport.placeholderWorkshop')" clearable
-          @keyup.enter="handleQuery" class="!w-240px" />
-      </el-form-item>
 
       <el-form-item v-if="filterCount > 3">
         <el-button type="text" class="text-primary" @click="toggleFilters">
@@ -72,8 +62,15 @@
           </el-button>
         </template>
       </el-table-column>
-      <el-table-column :label="t('EquipmentManagement.CapacityReport.actualCapacity')" align="center"
-        prop="actualCapacity" sortable />
+      <el-table-column align="center" prop="actualCapacity" sortable>
+        <template #header>
+          <span>{{ t('EquipmentManagement.CapacityReport.actualCapacity') }}</span>
+          <el-tooltip :content="t('EquipmentManagement.CapacityReport.actualCapacityTooltip')" placement="top">
+            <Icon icon="ep:question-filled" class="ml-4px"
+              style="vertical-align: middle; color: var(--el-text-color-secondary)" />
+          </el-tooltip>
+        </template>
+      </el-table-column>
       <el-table-column :label="t('EquipmentManagement.CapacityReport.workshop')" align="center" prop="workshopName"
         sortable />
     </el-table>
@@ -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<number[]>([])
 const productCapacityVisible = ref(false)
 const productCapacityDeviceId = ref<number>()