Merge branch 'feature/PCBA' into develop

admin.ui.plus-master/src/views/admin/PCBA/boardFunctionSummary/index.vue

@@ -213,6 +213,8 @@ const init = async () => {
   const { createTimeRange, ...filterWithoutTimeRange } = state.filter;
   const beginCreateTime = createTimeRange.length > 0? createTimeRange[0] : "";
   const endCreateTime = createTimeRange.length > 1? createTimeRange[1] : "";
+
+
   const res: any = await new BoardFunctionSummaryApi().getList({
    ...state.pageInput,
     Filter: {
@@ -223,6 +225,8 @@ const init = async () => {
   });
   state.total = res?.data?.total?? 0;
   state.tableModel = res?.data?.list?? [];
+
+
   state.loading = false;
 };
 
@@ -253,13 +257,13 @@ const tableData = ctx.$refs.myTable.data;
 
     for (let i = 0; i < tableData.length; i++)
     {
-      let data = tableData[i];
+      let data = {...tableData[i]};
       data.boardType = getPCBABoardType(data.boardType).name
       data.successRate +="%";
       data.oneTestSuccessRate +="%";
       data.testSuccessRate +="%";
 
-      worksheet.addRow(tableData[i]);
+      worksheet.addRow(data);
     }
 
 

admin.ui.plus-master/src/views/admin/PCBA/boardSummary/index.vue

@@ -103,6 +103,7 @@ import { useGlobalCacheStore } from "/@/stores/globalCacheStore";
 import { getCurrentInstance } from 'vue';
 import { saveAs } from 'file-saver';
 import * as ExcelJS from 'exceljs';
+import List from "/@/components/iconSelector/list.vue";
 
 const { proxy: ctx } = getCurrentInstance();
 
@@ -213,12 +214,17 @@ async function exportDataToExcel() {
     { header: '测试成功率', key: 'boardTestSuccessRate', width: 15 }
   ];
 
+
+
+
   for (let i = 0; i < tableData.length; i++) {
-    let data = tableData[i];
+    
+    let data = {...tableData[i]}
     data.boardSuccessRate += "%";
     data.boardOneTestSuccessRate += "%";
     data.boardTestSuccessRate += "%";
-    worksheet.addRow(tableData[i]);
+
+    worksheet.addRow(data);
   }
 
   // 生成 Excel 文件