From 7e1d38f401555ac635c9ce10f63902d9a4c402e0 Mon Sep 17 00:00:00 2001 From: riku <risaku@163.com> Date: 星期一, 14 十月 2024 17:15:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-procheck-1014' --- src/main.js | 22 ++++++++++++++++------ 1 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main.js b/src/main.js index 96be02a..511d8bd 100644 --- a/src/main.js +++ b/src/main.js @@ -4,18 +4,28 @@ import * as ElementPlusIconsVue from '@element-plus/icons-vue'; import { router } from './router'; import App from './App.vue'; - +import timeUtil from './utils/time-util'; // 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'; + +// dayjs plugin +import dayjs from 'dayjs'; +import isSameOrAfter from 'dayjs/plugin/isSameOrAfter'; +import isSameOrBefore from 'dayjs/plugin/isSameOrBefore'; + +dayjs.extend(isSameOrAfter); +dayjs.extend(isSameOrBefore); const app = createApp(App); +app.config.globalProperties.$fm = timeUtil; + for (const [key, component] of Object.entries(ElementPlusIconsVue)) { app.component(key, component); } -- Gitblit v1.9.3