From d1b1f06fc4843b17d669742645c396c16edab66a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期六, 11 三月 2023 23:40:58 +0800
Subject: [PATCH] fix 修复 超管切换租户后 点击个人中心报错
---
ruoyi-ui/src/main.js | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index b1862cf..caf30d7 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -10,14 +10,16 @@
import App from './App'
import store from './store'
import router from './router'
-import directive from './directive' //directive
+import directive from './directive' // directive
+import plugins from './plugins' // plugins
+import { download } from '@/utils/request'
import './assets/icons' // icon
import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
-import { getConfigKey } from "@/api/system/config";
-import { downLoadExcel } from "@/utils/download";
+import { getConfigKey, updateConfigByKey } from "@/api/system/config";
import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+// 鍒嗛〉缁勪欢
import Pagination from "@/components/Pagination";
// 鑷畾涔夎〃鏍煎伐鍏风粍浠�
import RightToolbar from "@/components/RightToolbar"
@@ -27,6 +29,8 @@
import FileUpload from "@/components/FileUpload"
// 鍥剧墖涓婁紶缁勪欢
import ImageUpload from "@/components/ImageUpload"
+// 鍥剧墖棰勮缁勪欢
+import ImagePreview from "@/components/ImagePreview"
// 瀛楀吀鏍囩缁勪欢
import DictTag from '@/components/DictTag'
// 澶撮儴鏍囩缁勪欢
@@ -37,25 +41,14 @@
// 鍏ㄥ眬鏂规硶鎸傝浇
Vue.prototype.getDicts = getDicts
Vue.prototype.getConfigKey = getConfigKey
+Vue.prototype.updateConfigByKey = updateConfigByKey
Vue.prototype.parseTime = parseTime
Vue.prototype.resetForm = resetForm
Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
+Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
-Vue.prototype.downLoadExcel = downLoadExcel
-
-Vue.prototype.msgSuccess = function (msg) {
- this.$message({ showClose: true, message: msg, type: "success" });
-}
-
-Vue.prototype.msgError = function (msg) {
- this.$message({ showClose: true, message: msg, type: "error" });
-}
-
-Vue.prototype.msgInfo = function (msg) {
- this.$message.info(msg);
-}
// 鍏ㄥ眬缁勪欢鎸傝浇
Vue.component('DictTag', DictTag)
@@ -64,8 +57,10 @@
Vue.component('Editor', Editor)
Vue.component('FileUpload', FileUpload)
Vue.component('ImageUpload', ImageUpload)
+Vue.component('ImagePreview', ImagePreview)
Vue.use(directive)
+Vue.use(plugins)
Vue.use(VueMeta)
DictData.install()
@@ -78,6 +73,9 @@
* please remove it before going online! ! !
*/
+// 淇敼 el-dialog 榛樿鐐瑰嚮閬収涓轰笉鍏抽棴
+Element.Dialog.props.closeOnClickModal.default = false
+
Vue.use(Element, {
size: Cookies.get('size') || 'medium' // set element-ui default size
})
--
Gitblit v1.9.3