From 82779f3c705481c26cce3f056db276c82c076892 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 02 Dec 2021 10:44:15 +0800
Subject: [PATCH] 优化提示信息
---
ruoyi-ui/src/plugins/modal.js | 8 ++++++++
ruoyi-ui/src/views/tool/gen/genInfoForm.vue | 3 +--
/dev/null | 15 ---------------
ruoyi-ui/src/views/tool/gen/basicInfoForm.vue | 3 +--
ruoyi-ui/src/views/monitor/online/index.vue | 2 +-
ruoyi-ui/src/api/system/role.js | 1 +
ruoyi-ui/src/utils/errorCode.js | 2 +-
ruoyi-ui/src/views/tool/gen/editTable.vue | 1 +
ruoyi-ui/vue.config.js | 2 +-
ruoyi-ui/src/views/system/user/index.vue | 2 +-
ruoyi-ui/src/layout/components/AppMain.vue | 2 +-
11 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/ruoyi-ui/src/api/system/role.js b/ruoyi-ui/src/api/system/role.js
index fa2d613..b5ebdf6 100644
--- a/ruoyi-ui/src/api/system/role.js
+++ b/ruoyi-ui/src/api/system/role.js
@@ -64,6 +64,7 @@
method: 'delete'
})
}
+
// 查询角色已授权用户列表
export function allocatedUserList(query) {
return request({
diff --git a/ruoyi-ui/src/directive/permission/index.js b/ruoyi-ui/src/directive/permission/index.js
deleted file mode 100644
index d6f530d..0000000
--- a/ruoyi-ui/src/directive/permission/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import hasRole from './hasRole'
-import hasPermi from './hasPermi'
-
-const install = function(Vue) {
- Vue.directive('hasRole', hasRole)
- Vue.directive('hasPermi', hasPermi)
-}
-
-if (window.Vue) {
- window['hasRole'] = hasRole
- window['hasPermi'] = hasPermi
- Vue.use(install); // eslint-disable-line
-}
-
-export default install
diff --git a/ruoyi-ui/src/layout/components/AppMain.vue b/ruoyi-ui/src/layout/components/AppMain.vue
index 423437b..7cc6674 100644
--- a/ruoyi-ui/src/layout/components/AppMain.vue
+++ b/ruoyi-ui/src/layout/components/AppMain.vue
@@ -51,7 +51,7 @@
// fix css style bug in open el-dialog
.el-popup-parent--hidden {
.fixed-header {
- padding-right: 15px;
+ padding-right: 17px;
}
}
</style>
diff --git a/ruoyi-ui/src/plugins/modal.js b/ruoyi-ui/src/plugins/modal.js
index 7df61a8..503a16f 100644
--- a/ruoyi-ui/src/plugins/modal.js
+++ b/ruoyi-ui/src/plugins/modal.js
@@ -59,6 +59,14 @@
type: "warning",
})
},
+ // 提交内容
+ prompt(content) {
+ return MessageBox.prompt(content, "系统提示", {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: "warning",
+ })
+ },
// 打开遮罩层
loading(content) {
loadingInstance = Loading.service({
diff --git a/ruoyi-ui/src/utils/errorCode.js b/ruoyi-ui/src/utils/errorCode.js
index 8f27f7a..b72d026 100644
--- a/ruoyi-ui/src/utils/errorCode.js
+++ b/ruoyi-ui/src/utils/errorCode.js
@@ -2,5 +2,5 @@
'401': '认证失败，无法访问系统资源',
'403': '当前操作没有权限',
'404': '访问资源不存在',
- 'default': '系统未知错误,请反馈给管理员'
+ 'default': '系统未知错误，请反馈给管理员'
}
diff --git a/ruoyi-ui/src/views/monitor/druid/index.vue b/ruoyi-ui/src/views/monitor/druid/index.vue
deleted file mode 100644
index ef915d9..0000000
--- a/ruoyi-ui/src/views/monitor/druid/index.vue
+++ /dev/null
@@ -1,15 +0,0 @@
-<template>
- <i-frame :src="url" />
-</template>
-<script>
-import iFrame from "@/components/iFrame/index";
-export default {
- name: "Druid",
- components: { iFrame },
- data() {
- return {
- url: process.env.VUE_APP_BASE_API + "/druid/login.html"
- };
- },
-};
-</script>
diff --git a/ruoyi-ui/src/views/monitor/online/index.vue b/ruoyi-ui/src/views/monitor/online/index.vue
index a20c880..b02b36e 100644
--- a/ruoyi-ui/src/views/monitor/online/index.vue
+++ b/ruoyi-ui/src/views/monitor/online/index.vue
@@ -107,7 +107,7 @@
},
/** 强退按钮操作 */
handleForceLogout(row) {
- this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的数据项？').then(function() {
+ this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户？').then(function() {
return forceLogout(row.tokenId);
}).then(() => {
this.getList();
diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 3525c9b..c538a69 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -596,7 +596,7 @@
cancelButtonText: "取消",
closeOnClickModal: false,
inputPattern: /^.{5,20}$/,
- inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
+ inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
}).then(({ value }) => {
resetUserPwd(row.userId, value).then(response => {
this.$modal.msgSuccess("修改成功，新密码是：" + value);
diff --git a/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue b/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
index f3e8717..75dc3bf 100644
--- a/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
+++ b/ruoyi-ui/src/views/tool/gen/basicInfoForm.vue
@@ -11,7 +11,6 @@
<el-input placeholder="请输入" v-model="info.tableComment" />
</el-form-item>
</el-col>
-
<el-col :span="12">
<el-form-item label="实体类名称" prop="className">
<el-input placeholder="请输入" v-model="info.className" />
@@ -30,9 +29,9 @@
</el-row>
</el-form>
</template>
+
<script>
export default {
- name: "BasicInfoForm",
props: {
info: {
type: Object,
diff --git a/ruoyi-ui/src/views/tool/gen/editTable.vue b/ruoyi-ui/src/views/tool/gen/editTable.vue
index 4da627f..6d28e6a 100644
--- a/ruoyi-ui/src/views/tool/gen/editTable.vue
+++ b/ruoyi-ui/src/views/tool/gen/editTable.vue
@@ -124,6 +124,7 @@
</el-form>
</el-card>
</template>
+
<script>
import { getGenTable, updateGenTable } from "@/api/tool/gen";
import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
diff --git a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
index 926376c..bf6382d 100644
--- a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
+++ b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
@@ -11,7 +11,6 @@
</el-select>
</el-form-item>
</el-col>
-
<el-col :span="12">
<el-form-item prop="packageName">
<span slot="label">
@@ -213,12 +212,12 @@
</el-row>
</el-form>
</template>
+
<script>
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
export default {
- name: "BasicInfoForm",
components: { Treeselect },
props: {
info: {
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index f119c43..7670746 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -109,7 +109,7 @@
config.optimization.runtimeChunk('single'),
{
from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
- to: './', //到根目录下
+ to: './' //到根目录下
}
}
)
--
Gitblit v1.9.3