Merge branch 'fixbug/idCard-0121' into release/version1.0

components.d.ts

@@ -9,12 +9,14 @@ declare module 'vue' {
   export interface GlobalComponents {
     Confirm: typeof import('./src/components/Confirm.vue')['default']
     ElButton: typeof import('element-plus/es')['ElButton']
+    ElCol: typeof import('element-plus/es')['ElCol']
     ElDropdown: typeof import('element-plus/es')['ElDropdown']
     ElDropdownItem: typeof import('element-plus/es')['ElDropdownItem']
     ElDropdownMenu: typeof import('element-plus/es')['ElDropdownMenu']
     ElFooter: typeof import('element-plus/es')['ElFooter']
     ElHeader: typeof import('element-plus/es')['ElHeader']
     ElIcon: typeof import('element-plus/es')['ElIcon']
+    ElRow: typeof import('element-plus/es')['ElRow']
     ElTable: typeof import('element-plus/es')['ElTable']
     ElTableColumn: typeof import('element-plus/es')['ElTableColumn']
     ErrorModal: typeof import('./src/components/dialogs/ErrorModal.vue')['default']

src/pages/Index/components/Consumables/IdCardInfo.vue

@@ -290,11 +290,6 @@ watch(currentPage, ()=>{
   getCardList()
 })
 
-// 处理页大小变化
-const handlePageSizeChange = () => {
-  currentPage.value = 1 // 重置当前页
-  getCardList() // 重新获取数据
-}
 </script>
 
 <style scoped lang="less">

src/services/Index/index.ts

@@ -11,6 +11,7 @@ export * from './settings/index'
 export * from './running/index'
 
 // mock
+//@ts-ignore
 export const reportText: EventReport = {
   typeName: 'AppPromptEvent',
   timestamp: 1736146671,
@@ -23,6 +24,7 @@ export const reportText: EventReport = {
     detailInfo: '一二三四五一二三四五一二三四五一二三四五一二三四五',
   },
 }
+//@ts-ignore
 export const reportForm: EventReport = {
   typeName: 'AppPromptEvent',
   timestamp: 1736146671,
@@ -49,6 +51,7 @@ export const reportForm: EventReport = {
   },
 }
 
+//@ts-ignore
 export const reportTable: EventReport = {
   typeName: 'AppPromptEvent',
   timestamp: 1736146671,

src/websocket/socket.ts

@@ -34,7 +34,16 @@ export type EventName =
   | 'AppIDCardUnmountEvent'
   | 'AppPromptEvent'
 
-  //IDCARD
+
+
+export interface EventReport {
+  typeName: EventName
+  timestamp: number
+  eventId: string
+  prompt: TextPrompt | FormsPrompt | TablePrompt
+  projectInfo: IdCardPrompt
+}
+
 export type IdCardPrompt = {
   color: string,
   expiryDate: number,
@@ -44,14 +53,6 @@ export type IdCardPrompt = {
   projId: number,
   projName: string,
   updateChipVersion: string,
-  
-}
-export interface EventReport {
-  typeName: EventName
-  timestamp: number
-  eventId: string
-  prompt: TextPrompt | FormsPrompt | TablePrompt
-  projectInfo: IdCardPrompt
 }
 
 export type TextPrompt = {