From 89fd2cf7202c321512c2ea699a3a220a7138ed44 Mon Sep 17 00:00:00 2001
From: wujianwei <wjw@11.com>
Date: 星期四, 09 四月 2026 10:40:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cwxt_master' into cwxt_master
---
ui/admin-ui3/src/main.ts | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ui/admin-ui3/src/main.ts b/ui/admin-ui3/src/main.ts
index b3349ee..56d1b7b 100644
--- a/ui/admin-ui3/src/main.ts
+++ b/ui/admin-ui3/src/main.ts
@@ -15,7 +15,6 @@
import 'default-passive-events'
import elementIcons from '@/components/SvgIcon/svgicon'
-
import directive from "@/directive";
// pinia store
@@ -23,17 +22,21 @@
const app = createApp(App);
app.use(pinia)
+import Pagination from '@/components/Pagination/index.vue'
import DictTag from "/src/components/DictTag/index.vue";
import FileUpload from "/src/components/FileUpload/index.vue";
import basicContainer from '/src/components/basic-container/main.vue';
import flowLog from './components/flowLog/index.vue';
-
+// 閫氱敤瀵煎叆缁勪欢
+import XlsFileImport from "@/components/XlsFileImport/index.vue"
import SvgIcon from "/src/components/SvgIcon/index.vue";
app.component("DictTag", DictTag);
+app.component('Pagination', Pagination);
app.component('FileUpload', FileUpload);
app.component('basicContainer', basicContainer)
+app.component('XlsFileImport', XlsFileImport);
app.component('flowLog', flowLog)
@@ -61,6 +64,7 @@
viewBtn: true,
selection: true,
searchSpan: 5,
+ height: 600,
props: {
label: 'dictLabel',
value: 'dictValue'
--
Gitblit v1.8.0