Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
finance-manage
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
finance-oa
finance-manage
Commits
ef4bfde4
Commit
ef4bfde4
authored
Nov 22, 2021
by
RuoYi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化提示信息
parent
421593c0
Changes
15
Show whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
46 additions
and
46 deletions
+46
-46
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
...src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
+1
-1
ruoyi-ui/src/api/monitor/server.js
ruoyi-ui/src/api/monitor/server.js
+1
-1
ruoyi-ui/src/components/RightToolbar/index.vue
ruoyi-ui/src/components/RightToolbar/index.vue
+1
-1
ruoyi-ui/src/plugins/tab.js
ruoyi-ui/src/plugins/tab.js
+1
-3
ruoyi-ui/src/views/login.vue
ruoyi-ui/src/views/login.vue
+6
-2
ruoyi-ui/src/views/monitor/logininfor/index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
+2
-2
ruoyi-ui/src/views/monitor/operlog/index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
+2
-2
ruoyi-ui/src/views/system/dept/index.vue
ruoyi-ui/src/views/system/dept/index.vue
+2
-4
ruoyi-ui/src/views/system/dict/data.vue
ruoyi-ui/src/views/system/dict/data.vue
+1
-1
ruoyi-ui/src/views/system/menu/index.vue
ruoyi-ui/src/views/system/menu/index.vue
+18
-17
ruoyi-ui/src/views/system/role/index.vue
ruoyi-ui/src/views/system/role/index.vue
+1
-2
ruoyi-ui/src/views/system/role/selectUser.vue
ruoyi-ui/src/views/system/role/selectUser.vue
+4
-0
ruoyi-ui/src/views/system/user/index.vue
ruoyi-ui/src/views/system/user/index.vue
+1
-2
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
+3
-6
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+2
-2
No files found.
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
View file @
ef4bfde4
...
...
@@ -7,7 +7,7 @@ import javax.sql.DataSource;
import
java.util.Properties
;
/**
* 定时任务配置
* 定时任务配置
(单机部署建议删除此类和qrtz数据库表,默认走内存会最高效)
*
* @author ruoyi
*/
...
...
ruoyi-ui/src/api/monitor/server.js
View file @
ef4bfde4
import
request
from
'
@/utils/request
'
//
查询服务器详细
//
获取服务信息
export
function
getServer
()
{
return
request
({
url
:
'
/monitor/server
'
,
...
...
ruoyi-ui/src/components/RightToolbar/index.vue
View file @
ef4bfde4
...
...
@@ -62,7 +62,7 @@ export default {
},
// 右侧列表元素变化
dataChange
(
data
)
{
for
(
var
item
in
this
.
columns
)
{
for
(
let
item
in
this
.
columns
)
{
const
key
=
this
.
columns
[
item
].
key
;
this
.
columns
[
item
].
visible
=
!
data
.
includes
(
key
);
}
...
...
ruoyi-ui/src/plugins/tab.js
View file @
ef4bfde4
...
...
@@ -20,8 +20,6 @@ export default {
path
:
'
/redirect
'
+
path
})
})
},
// 关闭当前tab页签,打开新页签
closeOpenPage
(
obj
)
{
...
...
@@ -56,7 +54,7 @@ export default {
return
store
.
dispatch
(
'
tagsView/delOthersViews
'
,
obj
||
router
.
currentRoute
);
},
// 添加tab页签
add
Page
(
title
,
url
)
{
open
Page
(
title
,
url
)
{
var
obj
=
{
path
:
url
,
meta
:
{
title
:
title
}
}
store
.
dispatch
(
'
tagsView/addView
'
,
obj
);
return
router
.
push
(
url
);
...
...
ruoyi-ui/src/views/login.vue
View file @
ef4bfde4
...
...
@@ -3,7 +3,12 @@
<el-form
ref=
"loginForm"
:model=
"loginForm"
:rules=
"loginRules"
class=
"login-form"
>
<h3
class=
"title"
>
若依后台管理系统
</h3>
<el-form-item
prop=
"username"
>
<el-input
v-model=
"loginForm.username"
type=
"text"
auto-complete=
"off"
placeholder=
"账号"
>
<el-input
v-model=
"loginForm.username"
type=
"text"
auto-complete=
"off"
placeholder=
"账号"
>
<svg-icon
slot=
"prefix"
icon-class=
"user"
class=
"el-input__icon input-icon"
/>
</el-input>
</el-form-item>
...
...
@@ -66,7 +71,6 @@ export default {
data
()
{
return
{
codeUrl
:
""
,
cookiePassword
:
""
,
loginForm
:
{
username
:
"
admin
"
,
password
:
"
admin123
"
,
...
...
ruoyi-ui/src/views/monitor/logininfor/index.vue
View file @
ef4bfde4
...
...
@@ -6,8 +6,8 @@
v-model=
"queryParams.ipaddr"
placeholder=
"请输入登录地址"
clearable
style=
"width: 240px;"
size=
"small"
style=
"width: 240px;"
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
...
...
@@ -16,8 +16,8 @@
v-model=
"queryParams.userName"
placeholder=
"请输入用户名称"
clearable
style=
"width: 240px;"
size=
"small"
style=
"width: 240px;"
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
...
...
ruoyi-ui/src/views/monitor/operlog/index.vue
View file @
ef4bfde4
...
...
@@ -6,8 +6,8 @@
v-model=
"queryParams.title"
placeholder=
"请输入系统模块"
clearable
style=
"width: 240px;"
size=
"small"
style=
"width: 240px;"
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
...
...
@@ -16,8 +16,8 @@
v-model=
"queryParams.operName"
placeholder=
"请输入操作人员"
clearable
style=
"width: 240px;"
size=
"small"
style=
"width: 240px;"
@
keyup.enter.native=
"handleQuery"
/>
</el-form-item>
...
...
ruoyi-ui/src/views/system/dept/index.vue
View file @
ef4bfde4
...
...
@@ -179,8 +179,6 @@ export default {
isExpandAll
:
true
,
// 重新渲染表格状态
refreshTable
:
true
,
// 是否展开
expand
:
false
,
// 查询参数
queryParams
:
{
deptName
:
undefined
,
...
...
ruoyi-ui/src/views/system/dict/data.vue
View file @
ef4bfde4
...
...
@@ -325,7 +325,7 @@ export default {
this
.
queryParams
.
pageNum
=
1
;
this
.
getList
();
},
/
/ 返回按钮
/
** 返回按钮操作 */
handleClose
()
{
const
obj
=
{
path
:
"
/system/dict
"
};
this
.
$tab
.
closeOpenPage
(
obj
);
...
...
ruoyi-ui/src/views/system/menu/index.vue
View file @
ef4bfde4
...
...
@@ -78,7 +78,8 @@
</el-table-column>
<el-table-column
label=
"操作"
align=
"center"
class-name=
"small-padding fixed-width"
>
<
template
slot-scope=
"scope"
>
<el-button
size=
"mini"
<el-button
size=
"mini"
type=
"text"
icon=
"el-icon-edit"
@
click=
"handleUpdate(scope.row)"
...
...
@@ -126,8 +127,8 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:span=
"24"
>
<el-form-item
v-if=
"form.menuType != 'F'"
label=
"菜单图标"
>
<el-col
:span=
"24"
v-if=
"form.menuType != 'F'"
>
<el-form-item
label=
"菜单图标"
>
<el-popover
placement=
"bottom-start"
width=
"460"
...
...
@@ -158,8 +159,8 @@
<el-input-number
v-model=
"form.orderNum"
controls-position=
"right"
:min=
"0"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
v-if=
"form.menuType != 'F'"
>
<el-col
:span=
"12"
v-if=
"form.menuType != 'F'"
>
<el-form-item>
<span
slot=
"label"
>
<el-tooltip
content=
"选择是外链则路由地址需要以`http(s)://`开头"
placement=
"top"
>
<i
class=
"el-icon-question"
></i>
...
...
@@ -172,8 +173,8 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
v-if=
"form.menuType != 'F'"
prop=
"path"
>
<el-col
:span=
"12"
v-if=
"form.menuType != 'F'"
>
<el-form-item
prop=
"path"
>
<span
slot=
"label"
>
<el-tooltip
content=
"访问的路由地址,如:`user`,如外网地址需内链访问则以`http(s)://`开头"
placement=
"top"
>
<i
class=
"el-icon-question"
></i>
...
...
@@ -194,8 +195,8 @@
<el-input
v-model=
"form.component"
placeholder=
"请输入组件路径"
/>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
v-if=
"form.menuType != 'M'"
>
<el-col
:span=
"12"
v-if=
"form.menuType != 'M'"
>
<el-form-item>
<el-input
v-model=
"form.perms"
placeholder=
"请输入权限标识"
maxlength=
"100"
/>
<span
slot=
"label"
>
<el-tooltip
content=
"控制器中定义的权限字符,如:@PreAuthorize(`@ss.hasPermi('system:user:list')`)"
placement=
"top"
>
...
...
@@ -205,8 +206,8 @@
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
v-if=
"form.menuType == 'C'"
>
<el-col
:span=
"12"
v-if=
"form.menuType == 'C'"
>
<el-form-item>
<el-input
v-model=
"form.query"
placeholder=
"请输入路由参数"
maxlength=
"255"
/>
<span
slot=
"label"
>
<el-tooltip
content=
'访问路由的默认传递参数,如:`{"id": 1, "name": "ry"}`'
placement=
"top"
>
...
...
@@ -216,8 +217,8 @@
</span>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
v-if=
"form.menuType == 'C'"
>
<el-col
:span=
"12"
v-if=
"form.menuType == 'C'"
>
<el-form-item>
<span
slot=
"label"
>
<el-tooltip
content=
"选择是则会被`keep-alive`缓存,需要匹配组件的`name`和地址保持一致"
placement=
"top"
>
<i
class=
"el-icon-question"
></i>
...
...
@@ -230,8 +231,8 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
v-if=
"form.menuType != 'F'"
>
<el-col
:span=
"12"
v-if=
"form.menuType != 'F'"
>
<el-form-item>
<span
slot=
"label"
>
<el-tooltip
content=
"选择隐藏则路由将不会出现在侧边栏,但仍然可以访问"
placement=
"top"
>
<i
class=
"el-icon-question"
></i>
...
...
@@ -247,8 +248,8 @@
</el-radio-group>
</el-form-item>
</el-col>
<el-col
:span=
"12"
>
<el-form-item
v-if=
"form.menuType != 'F'"
>
<el-col
:span=
"12"
v-if=
"form.menuType != 'F'"
>
<el-form-item>
<span
slot=
"label"
>
<el-tooltip
content=
"选择停用则路由将不会出现在侧边栏,也不能被访问"
placement=
"top"
>
<i
class=
"el-icon-question"
></i>
...
...
ruoyi-ui/src/views/system/role/index.vue
View file @
ef4bfde4
...
...
@@ -355,8 +355,7 @@ export default {
/** 查询角色列表 */
getList
()
{
this
.
loading
=
true
;
listRole
(
this
.
addDateRange
(
this
.
queryParams
,
this
.
dateRange
)).
then
(
response
=>
{
listRole
(
this
.
addDateRange
(
this
.
queryParams
,
this
.
dateRange
)).
then
(
response
=>
{
this
.
roleList
=
response
.
rows
;
this
.
total
=
response
.
total
;
this
.
loading
=
false
;
...
...
ruoyi-ui/src/views/system/role/selectUser.vue
View file @
ef4bfde4
...
...
@@ -123,6 +123,10 @@ export default {
handleSelectUser
()
{
const
roleId
=
this
.
queryParams
.
roleId
;
const
userIds
=
this
.
userIds
.
join
(
"
,
"
);
if
(
userIds
==
""
)
{
this
.
$modal
.
msgError
(
"
请选择要分配的用户
"
);
return
;
}
authUserSelectAll
({
roleId
:
roleId
,
userIds
:
userIds
}).
then
(
res
=>
{
this
.
$modal
.
msgSuccess
(
res
.
msg
);
if
(
res
.
code
===
200
)
{
...
...
ruoyi-ui/src/views/system/user/index.vue
View file @
ef4bfde4
...
...
@@ -206,7 +206,7 @@
</el-col>
</el-row>
<!-- 添加或修改
参数
配置对话框 -->
<!-- 添加或修改
用户
配置对话框 -->
<el-dialog
:title=
"title"
:visible.sync=
"open"
width=
"600px"
append-to-body
>
<el-form
ref=
"form"
:model=
"form"
:rules=
"rules"
label-width=
"80px"
>
<el-row>
...
...
@@ -652,7 +652,6 @@ export default {
/** 下载模板操作 */
importTemplate
()
{
this
.
download
(
'
system/user/importTemplate
'
,
{
...
this
.
queryParams
},
`user_template_
${
new
Date
().
getTime
()}
.xlsx`
)
},
// 文件上传中处理
...
...
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
View file @
ef4bfde4
...
...
@@ -29,7 +29,6 @@ export default {
}
};
return
{
test
:
"
1test
"
,
user
:
{
oldPassword
:
undefined
,
newPassword
:
undefined
,
...
...
@@ -55,11 +54,9 @@ export default {
submit
()
{
this
.
$refs
[
"
form
"
].
validate
(
valid
=>
{
if
(
valid
)
{
updateUserPwd
(
this
.
user
.
oldPassword
,
this
.
user
.
newPassword
).
then
(
response
=>
{
updateUserPwd
(
this
.
user
.
oldPassword
,
this
.
user
.
newPassword
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"
修改成功
"
);
}
);
});
}
});
},
...
...
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
View file @
ef4bfde4
<
template
>
<div>
<div
class=
"user-info-head"
@
click=
"editCropper()"
><img
v-bind:src=
"options.img"
title=
"点击上传头像"
class=
"img-circle img-lg"
/></div>
<el-dialog
:title=
"title"
:visible.sync=
"open"
width=
"800px"
append-to-body
@
opened=
"modalOpened"
@
close=
"closeDialog
()
"
>
<el-dialog
:title=
"title"
:visible.sync=
"open"
width=
"800px"
append-to-body
@
opened=
"modalOpened"
@
close=
"closeDialog"
>
<el-row>
<el-col
:xs=
"24"
:md=
"12"
:style=
"
{height: '350px'}">
<vue-cropper
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment