From c8038484cf01ea68d157d1e60de74211586432f1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E6=AD=A3=E6=98=93?= <zhaozhengyi1b@126.com>
Date: Fri, 17 Oct 2025 17:13:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E8=B4=A8=E9=87=8F=E6=8A=A5=E8=A1=A8):=20?=
 =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E5=90=88=E6=A0=BC=E7=8E=87=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98=E5=8C=96=E8=A1=A8=E6=A0=BC?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 新增合格率报表API文件及接口调用
- 替换原有模拟数据为真实接口调用
- 调整表格列展示，增加一次合格率统计
- 优化数据获取逻辑和错误处理
---
 .../defectReport/defectReport.js              |  20 +++
 .../qualificationRateReport.js                |  20 +++
 .../components/qualificationRateOverview.vue  |  37 +++---
 .../components/qualificationRateTable.vue     | 119 +++++++-----------
 4 files changed, 104 insertions(+), 92 deletions(-)
 create mode 100644 src/api/qualityManagement/defectReport/defectReport.js
 create mode 100644 src/api/qualityManagement/qualificationRateReport/qualificationRateReport.js

diff --git a/src/api/qualityManagement/defectReport/defectReport.js b/src/api/qualityManagement/defectReport/defectReport.js
new file mode 100644
index 0000000..92854d7
--- /dev/null
+++ b/src/api/qualityManagement/defectReport/defectReport.js
@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+import { downFile } from '@/utils/request'
+
+// 分页获取合格率报表数据
+export function GetQualificationRateReport(data) {
+  return request({
+    url: '/mes/qc/FQC/QualificationRateReport/GetQualificationRateReport',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 获取合格率Echarts数据
+export function GetQualificationRateEcharts(data) {
+  return request({
+    url: '/mes/qc/FQC/QualificationRateEcharts/GetQualificationRateEcharts',
+    method: 'post',
+    data: data,
+  })
+}
diff --git a/src/api/qualityManagement/qualificationRateReport/qualificationRateReport.js b/src/api/qualityManagement/qualificationRateReport/qualificationRateReport.js
new file mode 100644
index 0000000..92854d7
--- /dev/null
+++ b/src/api/qualityManagement/qualificationRateReport/qualificationRateReport.js
@@ -0,0 +1,20 @@
+import request from '@/utils/request'
+import { downFile } from '@/utils/request'
+
+// 分页获取合格率报表数据
+export function GetQualificationRateReport(data) {
+  return request({
+    url: '/mes/qc/FQC/QualificationRateReport/GetQualificationRateReport',
+    method: 'post',
+    data: data,
+  })
+}
+
+// 获取合格率Echarts数据
+export function GetQualificationRateEcharts(data) {
+  return request({
+    url: '/mes/qc/FQC/QualificationRateEcharts/GetQualificationRateEcharts',
+    method: 'post',
+    data: data,
+  })
+}
diff --git a/src/views/qualityManagement/FQC/qualificationRateReport/components/qualificationRateOverview.vue b/src/views/qualityManagement/FQC/qualificationRateReport/components/qualificationRateOverview.vue
index 598a05f..fa48bc1 100644
--- a/src/views/qualityManagement/FQC/qualificationRateReport/components/qualificationRateOverview.vue
+++ b/src/views/qualityManagement/FQC/qualificationRateReport/components/qualificationRateOverview.vue
@@ -86,7 +86,7 @@
 
 <script>
 import * as echarts from 'echarts'
-import { GetProductAndPolishAndOneTimeFqcBoardData } from '@/api/qualityManagement/commonFQC.js'
+import { GetQualificationRateEcharts } from '@/api/qualityManagement/qualificationRateReport/qualificationRateReport.js'
 import { debounce } from '@/utils'
 
 export default {
@@ -168,27 +168,26 @@ export default {
     async getOverviewData() {
       this.loading = true
       try {
-        // 注释接口调用，直接使用测试数据
-        // const params = {
-        //   startTime: this.timeRange.startTime,
-        //   endTime: this.timeRange.endTime,
-        //   ...this.queryParams
-        // }
+        const params = {
+          startTime: this.timeRange.startTime,
+          endTime: this.timeRange.endTime,
+          ...this.queryParams
+        }
         
-        // // 调用API获取数据
-        // const res = await GetProductAndPolishAndOneTimeFqcBoardData(params)
+        // 调用API获取数据
+        const res = await GetQualificationRateEcharts(params)
         
-        // if (res.code === 200 && res.data) {
-        //   this.updateStatData(res.data)
-        //   this.updateTrendChart(res.data.trendData)
-        //   this.updateDefectChart(res.data.defectData)
-        // } else {
-        //   this.$message.error('获取数据失败')
-        //   this.useMockData()
-        // }
+        // 打印返回值
+        console.log('接口返回数据:', res)
         
-        // 直接使用模拟数据
-        this.useMockData()
+        if (res.code === 200 && res.data) {
+          this.updateStatData(res.data)
+          this.updateTrendChart(res.data.trendData || { categories: [], series: [] })
+          this.updateDefectChart(res.data.defectData || [])
+        } else {
+          this.$message.error('获取数据失败')
+          this.useMockData()
+        }
       } catch (error) {
         this.$message.error('获取数据异常')
         console.error('获取合格率概览数据异常:', error)
diff --git a/src/views/qualityManagement/FQC/qualificationRateReport/components/qualificationRateTable.vue b/src/views/qualityManagement/FQC/qualificationRateReport/components/qualificationRateTable.vue
index 8d9d324..3de4eed 100644
--- a/src/views/qualityManagement/FQC/qualificationRateReport/components/qualificationRateTable.vue
+++ b/src/views/qualityManagement/FQC/qualificationRateReport/components/qualificationRateTable.vue
@@ -8,70 +8,44 @@
         </el-button>
       </el-col>
     </el-row>
-    
+
     <!-- 表格 -->
-    <el-table
-      v-loading="loading"
-      :data="dataList"
-      border
-      fit
-      highlight-current-row
-      style="width: 100%"
-    >
+    <el-table v-loading="loading" :data="dataList" border fit highlight-current-row style="width: 100%">
       <el-table-column type="index" width="50" label="序号" />
       <el-table-column prop="partNumber" label="物料号" width="120" />
       <el-table-column prop="description" label="产品描述" min-width="150" />
       <el-table-column prop="specification" label="规格" width="100" />
       <el-table-column prop="color" label="颜色" width="80" />
-      <el-table-column prop="siteNo" label="站点" width="80" />
-      <el-table-column prop="team" label="班组" width="80" />
-      <el-table-column prop="requireNumber" label="投入数" width="80" align="right" />
-      <el-table-column prop="qualifiedNumber" label="合格数" width="80" align="right" />
-      <el-table-column prop="qualifiedRate" label="合格率" width="90" align="right">
+      <el-table-column prop="allRequireNumber" label="总投入数" width="80" align="right" />
+      <el-table-column prop="allQualifiedNumber" label="总合格数" width="80" align="right" />
+      <el-table-column prop="qualifiedRate" label="总合格率" width="90" align="right">
         <template slot-scope="scope">
           <span :class="getRateClass(scope.row.qualifiedRate)">{{ scope.row.qualifiedRate }}%</span>
         </template>
       </el-table-column>
-      <el-table-column prop="polishNumber" label="抛光数" width="80" align="right" />
-      <el-table-column prop="damoNumber" label="打磨数" width="80" align="right" />
-      <el-table-column prop="baofeiNumber" label="报废数" width="80" align="right" />
-      <el-table-column prop="isOnetime" label="一次合格" width="90" align="center">
+      <el-table-column prop="firstRequireNumber" label="一次投入数" width="80" align="right" />
+      <el-table-column prop="firstQualifiedNumber" label="一次合格数" width="80" align="right" />
+      <el-table-column prop="qualifiedRate" label="一次合格率" width="90" align="right">
         <template slot-scope="scope">
-          <el-tag :type="scope.row.isOnetime === 1 ? 'success' : 'info'">
-            {{ scope.row.isOnetime === 1 ? '是' : '否' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column prop="isBack" label="返工件" width="90" align="center">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.isBack === 1 ? 'warning' : 'info'">
-            {{ scope.row.isBack === 1 ? '是' : '否' }}
-          </el-tag>
+          <span :class="getRateClass(scope.row.qualifiedRate)">{{ scope.row.qualifiedRate }}%</span>
         </template>
       </el-table-column>
       <el-table-column prop="startTime" label="开始时间" width="150" />
       <el-table-column prop="endTime" label="结束时间" width="150" />
       <el-table-column prop="workOrder" label="工单号" width="120" />
     </el-table>
-    
+
     <!-- 分页 -->
     <div class="pagination-container">
-      <el-pagination
-        background
-        :current-page="queryParams.pageNum"
-        :page-size="queryParams.pageSize"
-        :page-sizes="[10, 20, 50, 100]"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="total"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-      />
+      <el-pagination background :current-page="queryParams.pageNum" :page-size="queryParams.pageSize"
+        :page-sizes="[10, 20, 50, 100]" layout="total, sizes, prev, pager, next, jumper" :total="total"
+        @size-change="handleSizeChange" @current-change="handleCurrentChange" />
     </div>
   </div>
 </template>
 
 <script>
-import { GetWorkOrderFqcTableData } from '@/api/qualityManagement/commonFQC.js'
+import { GetQualificationRateReport } from '@/api/qualityManagement/qualificationRateReport/qualificationRateReport.js'
 
 export default {
   name: 'QualificationRateTable',
@@ -111,28 +85,27 @@ export default {
     async getTableData() {
       this.loading = true
       try {
-        // 注释接口调用，直接使用测试数据
-        // const params = {
-        //   startTime: this.timeRange.startTime,
-        //   endTime: this.timeRange.endTime,
-        //   ...this.queryParams,
-        //   ...this.tableQueryParams
-        // }
-        
-        // // 调用API获取数据
-        // const res = await GetWorkOrderFqcTableData(params)
-        
-        // if (res.code === 200 && res.data) {
-        //   this.dataList = res.data.result || []
-        //   this.total = res.data.totalNum || 0
-        // } else {
-        //   this.$message.error('获取数据失败')
-        //   // 使用模拟数据
-        //   this.useMockData()
-        // }
-        
-        // 直接使用模拟数据
-        this.useMockData()
+        const params = {
+          startTime: this.timeRange.startTime,
+          endTime: this.timeRange.endTime,
+          ...this.queryParams,
+          ...this.tableQueryParams
+        }
+
+        // 调用API获取数据
+        const res = await GetQualificationRateReport(params)
+
+        // 打印返回值
+        console.log('接口返回数据:', res)
+
+        if (res.code === 200 && res.data) {
+          this.dataList = res.data.result || []
+          this.total = res.data.totalNum || 0
+        } else {
+          this.$message.error('获取数据失败')
+          // 使用模拟数据
+          this.useMockData()
+        }
       } catch (error) {
         this.$message.error('获取数据异常')
         console.error('获取合格率报表数据异常:', error)
@@ -142,7 +115,7 @@ export default {
         this.loading = false
       }
     },
-    
+
     // 使用模拟数据
     useMockData() {
       const mockData = []
@@ -152,7 +125,7 @@ export default {
       const colors = ['黑色', '白色', '银色', '蓝色', '红色']
       const sites = ['FQC-1', 'FQC-2', 'FQC-3', 'FQC-4', 'FQC-5']
       const teams = ['一班', '二班', '三班']
-      
+
       // 生成20条模拟数据
       for (let i = 1; i <= 20; i++) {
         const index = i % 5
@@ -162,7 +135,7 @@ export default {
         const polishNumber = Math.floor((requireNumber - qualifiedNumber) * 0.7)
         const damoNumber = Math.floor((requireNumber - qualifiedNumber - polishNumber) * 0.8)
         const baofeiNumber = requireNumber - qualifiedNumber - polishNumber - damoNumber
-        
+
         // 生成随机日期
         const date = new Date()
         date.setDate(date.getDate() - Math.floor(Math.random() * 7))
@@ -170,7 +143,7 @@ export default {
         startTime.setHours(Math.floor(Math.random() * 8) + 8, Math.floor(Math.random() * 60))
         const endTime = new Date(startTime)
         endTime.setHours(startTime.getHours() + 4 + Math.floor(Math.random() * 4))
-        
+
         mockData.push({
           id: i,
           partNumber: partNumbers[index],
@@ -194,11 +167,11 @@ export default {
           workOrder: `WO-${date.getFullYear()}${String(date.getMonth() + 1).padStart(2, '0')}${String(date.getDate()).padStart(2, '0')}-${String(i).padStart(3, '0')}`
         })
       }
-      
+
       this.dataList = mockData
       this.total = 100 // 模拟总记录数
     },
-    
+
     // 获取合格率样式类
     getRateClass(rate) {
       const rateValue = parseFloat(rate)
@@ -210,25 +183,25 @@ export default {
         return 'rate-low'
       }
     },
-    
+
     // 处理导出
     handleExport() {
       this.$message.success('导出功能待实现')
       // 实际项目中应调用导出API
     },
-    
+
     // 处理页码变化
     handleSizeChange(pageSize) {
       this.tableQueryParams.pageSize = pageSize
       this.getTableData()
     },
-    
+
     // 处理页数变化
     handleCurrentChange(pageNum) {
       this.tableQueryParams.pageNum = pageNum
       this.getTableData()
     },
-    
+
     // 刷新数据
     refresh() {
       this.tableQueryParams.pageNum = 1
@@ -244,7 +217,7 @@ export default {
       },
       deep: true
     },
-    
+
     // 监听时间范围变化
     timeRange: {
       handler() {