From 1249c7ca26491a51c1cf87aea1d277b6fedf30ab Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 15 十二月 2020 10:25:00 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/main.js | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 8a9a60c..678431f 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -2,8 +2,6 @@
import Cookies from 'js-cookie'
-import 'normalize.css/normalize.css' // a modern alternative to CSS resets
-
import Element from 'element-ui'
import './assets/styles/element-variables.scss'
@@ -20,6 +18,11 @@
import { getConfigKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
import Pagination from "@/components/Pagination";
+// 鑷畾涔夎〃鏍煎伐鍏锋墿灞�
+import RightToolbar from "@/components/RightToolbar"
+// 浠ｇ爜楂樹寒鎻掍欢
+import hljs from 'highlight.js'
+import 'highlight.js/styles/github-gist.css'
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts
@@ -46,8 +49,10 @@
// 鍏ㄥ眬缁勪欢鎸傝浇
Vue.component('Pagination', Pagination)
+Vue.component('RightToolbar', RightToolbar)
Vue.use(permission)
+Vue.use(hljs.vuePlugin);
/**
* If you don't want to use mock-server
--
Gitblit v1.9.3