From 87e3d52c62233ad44bd7bac3f43e5348a2de4e94 Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期一, 25 十一月 2024 10:36:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main.js |   19 ++++++++++++++++++-
 1 files changed, 18 insertions(+), 1 deletions(-)

diff --git a/src/main.js b/src/main.js
index 13c6cf2..ac9ce83 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,9 +1,21 @@
 import Vue from 'vue'
 
 import Cookies from 'js-cookie'
-
+// global css
+// import 'virtual:uno.css';
+import '@/assets/styles/index.scss';
 import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
+
+// 楂樹寒缁勪欢
+// import 'highlight.js/styles/a11y-light.css';
+// import 'highlight.js/styles/atom-one-dark.css';
+// import 'highlight.js/lib/common';
+// import HighLight from '@highlightjs/vue-plugin';
+
+// // svg鍥炬爣
+// import 'virtual:svg-icons-register';
+// import ElementIcons from '@/plugins/svgicon';
 
 import '@/assets/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
@@ -37,6 +49,8 @@
 import VueMeta from 'vue-meta'
 // 瀛楀吀鏁版嵁缁勪欢
 import DictData from '@/components/DictData'
+// 鑷畾涔夋悳绱€�佹帶鍒惰〃澶存樉闅愭寜閽�
+import VisibilityToolbar from '@/components/VisibilityToolbar'
 
 // 鍏ㄥ眬鏂规硶鎸傝浇
 Vue.prototype.getDicts = getDicts
@@ -57,10 +71,13 @@
 Vue.component('FileUpload', FileUpload)
 Vue.component('ImageUpload', ImageUpload)
 Vue.component('ImagePreview', ImagePreview)
+Vue.component('VisibilityToolbar', VisibilityToolbar)
 
 Vue.use(directive)
 Vue.use(plugins)
 Vue.use(VueMeta)
+// Vue.use(HighLight);
+// Vue.use(ElementIcons);
 DictData.install()
 
 /**

--
Gitblit v1.8.0