From 17550a5f4bd152bb67a0de2c1284e2eef243777c Mon Sep 17 00:00:00 2001
From: Remenber_Ray <343509740@qq.com>
Date: Sun, 24 Oct 2021 10:34:25 +0800
Subject: [PATCH] update ruoyi-common/src/main/java/com/ruoyi/common/utils/Threads.java. 修复描述错误
---
ruoyi-ui/src/main.js | 21 +++++++--------------
1 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 292cbb4..489600a 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -11,12 +11,14 @@
import store from './store'
import router from './router'
import directive from './directive' //directive
+import plugins from './plugins' // plugins
import './assets/icons' // icon
import './permission' // permission control
import { getDicts } from "@/api/system/dict/data";
import { getConfigKey } from "@/api/system/config";
-import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
+import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
+// 分页组件
import Pagination from "@/components/Pagination";
// 自定义表格工具组件
import RightToolbar from "@/components/RightToolbar"
@@ -30,6 +32,8 @@
import DictTag from '@/components/DictTag'
// 头部标签组件
import VueMeta from 'vue-meta'
+// 字典数据组件
+import DictData from '@/components/DictData'
// 全局方法挂载
Vue.prototype.getDicts = getDicts
@@ -39,20 +43,7 @@
Vue.prototype.addDateRange = addDateRange
Vue.prototype.selectDictLabel = selectDictLabel
Vue.prototype.selectDictLabels = selectDictLabels
-Vue.prototype.download = download
Vue.prototype.handleTree = handleTree
-
-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)
@@ -63,7 +54,9 @@
Vue.component('ImageUpload', ImageUpload)
Vue.use(directive)
+Vue.use(plugins)
Vue.use(VueMeta)
+DictData.install()
/**
* If you don't want to use mock-server
--
Gitblit v1.9.2