From 9a11f818f304bc13bbd920313792e9560734922f Mon Sep 17 00:00:00 2001
From: hcong <1050828145@qq.com>
Date: 星期五, 27 九月 2024 15:31:25 +0800
Subject: [PATCH] 合并冲突
---
src/main.js | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/src/main.js b/src/main.js
index 96be02a..8a0d286 100644
--- a/src/main.js
+++ b/src/main.js
@@ -4,18 +4,22 @@
import * as ElementPlusIconsVue from '@element-plus/icons-vue';
import { router } from './router';
import App from './App.vue';
-
+import timeUtil from './utils/time-util';
+import DeepCopy from './utils/DeepCopy';
// import 'element-plus/dist/index.css';
-import './assets/main.css'
+import './assets/main.css';
-import "element-plus/theme-chalk/src/overlay.scss"
-import "element-plus/theme-chalk/src/message.scss"
-import "element-plus/theme-chalk/src/message-box.scss"
-import "element-plus/theme-chalk/src/notification.scss"
+import 'element-plus/theme-chalk/src/overlay.scss';
+import 'element-plus/theme-chalk/src/message.scss';
+import 'element-plus/theme-chalk/src/message-box.scss';
+import 'element-plus/theme-chalk/src/notification.scss';
const app = createApp(App);
+app.config.globalProperties.$fm = timeUtil;
+app.config.globalProperties.$deepCopy = DeepCopy.deepCopy;
+
for (const [key, component] of Object.entries(ElementPlusIconsVue)) {
app.component(key, component);
}
--
Gitblit v1.9.3