RuoYi лет назад: 4
Родитель
Сommit
82779f3c70

+ 1 - 0
ruoyi-ui/src/api/system/role.js

@@ -64,6 +64,7 @@ export function delRole(roleId) {
64
     method: 'delete'
64
     method: 'delete'
65
   })
65
   })
66
 }
66
 }
67
+
67
 // 查询角色已授权用户列表
68
 // 查询角色已授权用户列表
68
 export function allocatedUserList(query) {
69
 export function allocatedUserList(query) {
69
   return request({
70
   return request({

+ 0 - 15
ruoyi-ui/src/directive/permission/index.js

@@ -1,15 +0,0 @@
1
-import hasRole from './hasRole'
2
-import hasPermi from './hasPermi'
3
-
4
-const install = function(Vue) {
5
-  Vue.directive('hasRole', hasRole)
6
-  Vue.directive('hasPermi', hasPermi)
7
-}
8
-
9
-if (window.Vue) {
10
-  window['hasRole'] = hasRole
11
-  window['hasPermi'] = hasPermi
12
-  Vue.use(install); // eslint-disable-line
13
-}
14
-
15
-export default install

+ 1 - 1
ruoyi-ui/src/layout/components/AppMain.vue

@@ -51,7 +51,7 @@ export default {
51
 // fix css style bug in open el-dialog
51
 // fix css style bug in open el-dialog
52
 .el-popup-parent--hidden {
52
 .el-popup-parent--hidden {
53
   .fixed-header {
53
   .fixed-header {
54
-    padding-right: 15px;
54
+    padding-right: 17px;
55
   }
55
   }
56
 }
56
 }
57
 </style>
57
 </style>

+ 8 - 0
ruoyi-ui/src/plugins/modal.js

@@ -59,6 +59,14 @@ export default {
59
       type: "warning",
59
       type: "warning",
60
     })
60
     })
61
   },
61
   },
62
+  // 提交内容
63
+  prompt(content) {
64
+    return MessageBox.prompt(content, "系统提示", {
65
+      confirmButtonText: '确定',
66
+      cancelButtonText: '取消',
67
+      type: "warning",
68
+    })
69
+  },
62
   // 打开遮罩层
70
   // 打开遮罩层
63
   loading(content) {
71
   loading(content) {
64
     loadingInstance = Loading.service({
72
     loadingInstance = Loading.service({

+ 1 - 1
ruoyi-ui/src/utils/errorCode.js

@@ -2,5 +2,5 @@ export default {
2
   '401': '认证失败,无法访问系统资源',
2
   '401': '认证失败,无法访问系统资源',
3
   '403': '当前操作没有权限',
3
   '403': '当前操作没有权限',
4
   '404': '访问资源不存在',
4
   '404': '访问资源不存在',
5
-  'default': '系统未知错误,请反馈给管理员'
5
+  'default': '系统未知错误请反馈给管理员'
6
 }
6
 }

+ 0 - 15
ruoyi-ui/src/views/monitor/druid/index.vue

@@ -1,15 +0,0 @@
1
-<template>
2
-  <i-frame :src="url" />
3
-</template>
4
-<script>
5
-import iFrame from "@/components/iFrame/index";
6
-export default {
7
-  name: "Druid",
8
-  components: { iFrame },
9
-  data() {
10
-    return {
11
-      url: process.env.VUE_APP_BASE_API + "/druid/login.html"
12
-    };
13
-  },
14
-};
15
-</script>

+ 1 - 1
ruoyi-ui/src/views/monitor/online/index.vue

@@ -107,7 +107,7 @@ export default {
107
     },
107
     },
108
     /** 强退按钮操作 */
108
     /** 强退按钮操作 */
109
     handleForceLogout(row) {
109
     handleForceLogout(row) {
110
-      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的数据项?').then(function() {
110
+      this.$modal.confirm('是否确认强退名称为"' + row.userName + '"的用户?').then(function() {
111
         return forceLogout(row.tokenId);
111
         return forceLogout(row.tokenId);
112
       }).then(() => {
112
       }).then(() => {
113
         this.getList();
113
         this.getList();

+ 1 - 1
ruoyi-ui/src/views/system/user/index.vue

@@ -596,7 +596,7 @@ export default {
596
         cancelButtonText: "取消",
596
         cancelButtonText: "取消",
597
         closeOnClickModal: false,
597
         closeOnClickModal: false,
598
         inputPattern: /^.{5,20}$/,
598
         inputPattern: /^.{5,20}$/,
599
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间",
599
+        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
600
       }).then(({ value }) => {
600
       }).then(({ value }) => {
601
           resetUserPwd(row.userId, value).then(response => {
601
           resetUserPwd(row.userId, value).then(response => {
602
             this.$modal.msgSuccess("修改成功,新密码是:" + value);
602
             this.$modal.msgSuccess("修改成功,新密码是:" + value);

+ 1 - 2
ruoyi-ui/src/views/tool/gen/basicInfoForm.vue

@@ -11,7 +11,6 @@
11
           <el-input placeholder="请输入" v-model="info.tableComment" />
11
           <el-input placeholder="请输入" v-model="info.tableComment" />
12
         </el-form-item>
12
         </el-form-item>
13
       </el-col>
13
       </el-col>
14
-
15
       <el-col :span="12">
14
       <el-col :span="12">
16
         <el-form-item label="实体类名称" prop="className">
15
         <el-form-item label="实体类名称" prop="className">
17
           <el-input placeholder="请输入" v-model="info.className" />
16
           <el-input placeholder="请输入" v-model="info.className" />
@@ -30,9 +29,9 @@
30
     </el-row>
29
     </el-row>
31
   </el-form>
30
   </el-form>
32
 </template>
31
 </template>
32
+
33
 <script>
33
 <script>
34
 export default {
34
 export default {
35
-  name: "BasicInfoForm",
36
   props: {
35
   props: {
37
     info: {
36
     info: {
38
       type: Object,
37
       type: Object,

+ 1 - 0
ruoyi-ui/src/views/tool/gen/editTable.vue

@@ -124,6 +124,7 @@
124
     </el-form>
124
     </el-form>
125
   </el-card>
125
   </el-card>
126
 </template>
126
 </template>
127
+
127
 <script>
128
 <script>
128
 import { getGenTable, updateGenTable } from "@/api/tool/gen";
129
 import { getGenTable, updateGenTable } from "@/api/tool/gen";
129
 import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
130
 import { optionselect as getDictOptionselect } from "@/api/system/dict/type";

+ 1 - 2
ruoyi-ui/src/views/tool/gen/genInfoForm.vue

@@ -11,7 +11,6 @@
11
           </el-select>
11
           </el-select>
12
         </el-form-item>
12
         </el-form-item>
13
       </el-col>
13
       </el-col>
14
-
15
       <el-col :span="12">
14
       <el-col :span="12">
16
         <el-form-item prop="packageName">
15
         <el-form-item prop="packageName">
17
           <span slot="label">
16
           <span slot="label">
@@ -213,12 +212,12 @@
213
     </el-row>
212
     </el-row>
214
   </el-form>
213
   </el-form>
215
 </template>
214
 </template>
215
+
216
 <script>
216
 <script>
217
 import Treeselect from "@riophae/vue-treeselect";
217
 import Treeselect from "@riophae/vue-treeselect";
218
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
218
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
219
 
219
 
220
 export default {
220
 export default {
221
-  name: "BasicInfoForm",
222
   components: { Treeselect },
221
   components: { Treeselect },
223
   props: {
222
   props: {
224
     info: {
223
     info: {

+ 1 - 1
ruoyi-ui/vue.config.js

@@ -109,7 +109,7 @@ module.exports = {
109
           config.optimization.runtimeChunk('single'),
109
           config.optimization.runtimeChunk('single'),
110
           {
110
           {
111
              from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
111
              from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
112
-             to: './', //到根目录下
112
+             to: './' //到根目录下
113
           }
113
           }
114
         }
114
         }
115
       )
115
       )