From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/intellectInspect/inspectBasic/discriminate/index.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/views/intellectInspect/inspectBasic/discriminate/index.vue b/src/views/intellectInspect/inspectBasic/discriminate/index.vue
index 79a7053..d857438 100644
--- a/src/views/intellectInspect/inspectBasic/discriminate/index.vue
+++ b/src/views/intellectInspect/inspectBasic/discriminate/index.vue
@@ -53,7 +53,7 @@
import RFIDDialog from './components/RFIDDialog.vue';
import { RFIDApi } from '/@/api/intellectInspectSystem/RFID';
import { Edit, View, Plus, Delete, Refresh, Search, Download } from '@element-plus/icons-vue';
-
+import type { UploadProps, UploadUserFile } from 'element-plus'
// 定义接口来定义对象的类型
interface TableData {
quota: string;
@@ -96,6 +96,7 @@
}
}
});
+
// 初始化表格数据
const initRFIDTableData = async () => {
let res = await RFIDApi().getRFIDList(state.RFIDData.params);
--
Gitblit v1.9.2