From 1534072b22b6a9967a7410c7485bbea2e4b5fcf5 Mon Sep 17 00:00:00 2001
From: guoapeng <GuoAnPeng@163.com>
Date: Thu, 31 Jul 2025 19:10:27 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                |  3 ++-
 src/pages/Index/History.vue | 15 ++++++++-------
 src/pages/Index/Index.vue   | 23 ++++++++++++-----------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 58ed474..1a2dd6b 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "el-table-infinite-scroll": "^3.0.6",
     "element-plus": "^2.8.5",
     "less": "^4.2.0",
+    "loadsh": "^0.0.4",
     "mitt": "^3.0.1",
     "mockjs": "^1.1.0",
     "nanoid": "^5.0.7",
@@ -60,4 +61,4 @@
     "vite": "^5.4.11",
     "vue-tsc": "^2.1.6"
   }
-}
\ No newline at end of file
+}
diff --git a/src/pages/Index/History.vue b/src/pages/Index/History.vue
index 2e980db..546721d 100644
--- a/src/pages/Index/History.vue
+++ b/src/pages/Index/History.vue
@@ -154,7 +154,7 @@
 
 <script setup lang="ts">
 import { ref, watchEffect } from 'vue'
-
+import { uniqBy } from 'lodash';
 import { HistoryWarn } from './components/index'
 import {
   getHistoryInfo,
@@ -302,14 +302,15 @@ const showActionConfirm = (actionType: string) => {
   }
 }
 
-const onRefresh = () => {
-  currentPage.value = 1
+const onRefresh = async () => {
+  tableData.value = []
+  currentPage.value = 0
   pageSize.value = 25
   total.value = 0
   totalPage.value = 0
-  tableData.value = []
   disabled.value = false
-  load()
+  // console.log(111)
+  await load()
   systemStore.clearReactionRecordList()
 }
 
@@ -323,7 +324,7 @@ const total = ref(0)
 const totalPage = ref(0)
 
 const disabled = ref(false)
-const load  = () => {
+const load  = async () => {
   if (disabled.value) return;
   loading.value = true
 
@@ -334,7 +335,7 @@ const load  = () => {
     currentPage.value++;
     total.value = res.data.total
     totalPage.value = res.data.totalPage
-    tableData.value = tableData.value.concat(res.data.list)
+    tableData.value = uniqBy(tableData.value.concat(res.data.list), 'id')
     if (currentPage.value > totalPage.value) {
       disabled.value = true
     }
diff --git a/src/pages/Index/Index.vue b/src/pages/Index/Index.vue
index c948758..4b70b4e 100644
--- a/src/pages/Index/Index.vue
+++ b/src/pages/Index/Index.vue
@@ -1142,22 +1142,23 @@ async function startInit() {
   await pollingInitState()
   // 获取挂载ID卡信息
   const res = await getIdCardInfo()
+  console.log(res)
   if (!res) {
     return
   }
   consumableStore.setIdCardInserted(true)
   consumableStore.setIdCardInfo(res)
-  //显示部分id卡信息。 项目名称，过期时间，批次号
-  idCardInserted.value = true
-  //接收端是用v-html处理
-  idCardMessage.value = `
-    <div style='line-height:0.5;margin-top: -90px;'>
-      <div style='margin-left:25%'>
-        <div style='display:flex'><div>项目名称：</div><div>${res.projName}</div></div>
-        <div style='display:flex'><div>批次号：</div><div>${res.lotId}</div></div>
-        <div style='display:flex'><div>过期时间：</div><div>${formatDate(res.expiryDate)}</div></div>
-      </div>
-    </div>`
+  // //显示部分id卡信息。 项目名称，过期时间，批次号
+  // idCardInserted.value = true
+  // //接收端是用v-html处理
+  // idCardMessage.value = `
+  //   <div style='line-height:0.5;margin-top: -90px;'>
+  //     <div style='margin-left:25%'>
+  //       <div style='display:flex'><div>项目名称：</div><div>${res.projName}</div></div>
+  //       <div style='display:flex'><div>批次号：</div><div>${res.lotId}</div></div>
+  //       <div style='display:flex'><div>过期时间：</div><div>${formatDate(res.expiryDate)}</div></div>
+  //     </div>
+  //   </div>`
 }
 
 const pollingInitState = async () => {