From 2d0843f9baa5b461a71b4c8c609ee23c29ba5d45 Mon Sep 17 00:00:00 2001
From: zhangjiming <zhangjiming@costrip.cn>
Date: Thu, 16 Jan 2025 10:24:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8E=86=E5=8F=B2=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Index/History.vue | 54 +++++----------------------------------------
 src/types/Index/History.ts  | 33 ++++-----------------------
 src/utils/formDate.ts       |  2 +-
 3 files changed, 11 insertions(+), 78 deletions(-)

diff --git a/src/pages/Index/History.vue b/src/pages/Index/History.vue
index 544f5e7..5eb83e1 100644
--- a/src/pages/Index/History.vue
+++ b/src/pages/Index/History.vue
@@ -64,20 +64,8 @@
         </div>
 
         <div class="detail-item">
-          <span class="label">subResult1:</span>
-          <span class="value">{{ rowData && jsonResult(rowData.subProjResult1) }}</span>
-        </div>
-
-        <div class="detail-item">
-          <span class="label">subResult2:</span>
-          <span class="value">{{ rowData && jsonResult(rowData.subProjResult2) }}</span>
-
-        </div>
-
-        <div class="detail-item">
-          <span class="label">subResult3:</span>
-          <span class="value">{{ rowData && jsonResult(rowData.subProjResult3) }}</span>
-
+          <span class="label">Result:</span>
+          <span class="value">{{ rowData && JSON.stringify(rowData.results) }}</span>
         </div>
       </div>
 
@@ -151,7 +139,6 @@ import { ElMessage } from 'element-plus'
 import WarnSvg from '@/assets/Index/History/warn.svg'
 import PrintSvg from '@/assets/Index/History/print.svg'
 import ErrorSvg from '@/assets/Warn.svg'
-import Mock from'mockjs';
 // 添加表格引用
 const historyTableRef = ref()
 
@@ -241,6 +228,7 @@ const formatDate = (date: string | number | Date) => {
   return dayjs(date).format('YYYY-MM-DD')
 }
 const jsonResult = (result: any) => {
+  if (!result) return
   if (result.errorInfo != "") {
     return result.errorInfo
   } else {
@@ -464,41 +452,10 @@ const handleExport = () => {
   warnMessage.value = '导出成功'
   showWarn.value = true
 }
-const mockData = Mock.mock({
-  'list|50': [
-    {
-      id: '@increment',
-      creatDate: '@date("YYYY-MM-DD")',
-      projName: '@ctitle(5, 10)',
-      subProjResult1: {
-        result1: '@ctitle(3, 5)',
-        result2: '@ctitle(3, 5)',
-        result3: '@ctitle(3, 5)',
-        errorInfo: ''
-      },
-      subProjResult2: {
-        result1: '@ctitle(3, 5)',
-        result2: '@ctitle(3, 5)',
-        result3: '@ctitle(3, 5)',
-        errorInfo: ''
-      },
-      subProjResult3: {
-        result1: '@ctitle(3, 5)',
-        result2: '@ctitle(3, 5)',
-        result3: '@ctitle(3, 5)',
-        errorInfo: ''
-      },
-      sampleBloodType: '@pick(["A", "B", "AB", "O"])',
-      lotId: '@increment'
-    }
-  ]
-});
+
 onMounted(() => {
   getTableData()
-  tableData.value = mockData.list;
-  total.value = mockData.list.length;
-  totalPage.value = Math.ceil(mockData.list.length / pageSize.value);
-});
+})
 </script>
 
 <style scoped lang="less">
@@ -716,6 +673,7 @@ onMounted(() => {
     .value {
       color: #303133;
       flex: 1;
+      word-break: break-all;
     }
   }
 
diff --git a/src/types/Index/History.ts b/src/types/Index/History.ts
index cf19b7f..841fc63 100644
--- a/src/types/Index/History.ts
+++ b/src/types/Index/History.ts
@@ -35,36 +35,11 @@ export interface TableItem {
   sampleUserid: string
   projName: string
   sampleBloodType: string
-  result: string
+  results: Array<{
+    status: string
+  }>;
   creatDate: string | number | Date
   lotId: string
-  projId: string
-  subProjResult1: {
-    errorInfo: string
-    status: string
-    subProjName: string
-    subProjShortName: string
-    result1: string
-    result2: string
-    result3: string
-  }
-  subProjResult2: {
-    errorInfo: string
-    status: string
-    subProjName: string
-    subProjShortName: string
-    result1: string
-    result2: string
-    result3: string
-  }
-  subProjResult3: {
-    errorInfo: string
-    status: string
-    subProjName: string
-    subProjShortName: string
-    result1: string
-    result2: string
-    result3: string
-  }
+  projId: string  
   // 其他字段...
 }
diff --git a/src/utils/formDate.ts b/src/utils/formDate.ts
index e0937b1..d8a3c0f 100644
--- a/src/utils/formDate.ts
+++ b/src/utils/formDate.ts
@@ -20,7 +20,7 @@ export function formatDate(
   } else {
     let tsNumber = Number(timestamp);
     if (isNaN(tsNumber)) {
-      console.error('Invalid timestamp:', timestamp);
+      console.log('Invalid timestamp:', timestamp);
       return '';
     }