Skip to content
项目
群组
代码片段
帮助
当前项目
正在载入...
登录 / 注册
切换导航面板
C
cocktail-party-server
项目
项目
详情
活动
周期分析
仓库
仓库
文件
提交
分支
标签
贡献者
图表
比较
统计图
议题
0
议题
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
CI / CD
CI / CD
流水线
作业
日程
统计图
Wiki
Wiki
代码片段
代码片段
成员
成员
折叠边栏
关闭边栏
活动
图像
聊天
创建新问题
作业
提交
问题看板
Open sidebar
cocktail-party
cocktail-party-server
Commits
ef4bfde4
提交
ef4bfde4
authored
11月 22, 2021
作者:
RuoYi
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
优化提示信息
上级
421593c0
隐藏空白字符变更
内嵌
并排
正在显示
15 个修改的文件
包含
46 行增加
和
46 行删除
+46
-46
ScheduleConfig.java
...src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
+1
-1
server.js
ruoyi-ui/src/api/monitor/server.js
+1
-1
index.vue
ruoyi-ui/src/components/RightToolbar/index.vue
+1
-1
tab.js
ruoyi-ui/src/plugins/tab.js
+1
-3
login.vue
ruoyi-ui/src/views/login.vue
+6
-2
index.vue
ruoyi-ui/src/views/monitor/logininfor/index.vue
+2
-2
index.vue
ruoyi-ui/src/views/monitor/operlog/index.vue
+2
-2
index.vue
ruoyi-ui/src/views/system/dept/index.vue
+2
-4
data.vue
ruoyi-ui/src/views/system/dict/data.vue
+1
-1
index.vue
ruoyi-ui/src/views/system/menu/index.vue
+18
-17
index.vue
ruoyi-ui/src/views/system/role/index.vue
+1
-2
selectUser.vue
ruoyi-ui/src/views/system/role/selectUser.vue
+4
-0
index.vue
ruoyi-ui/src/views/system/user/index.vue
+1
-2
resetPwd.vue
ruoyi-ui/src/views/system/user/profile/resetPwd.vue
+3
-6
userAvatar.vue
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
+2
-2
没有找到文件。
ruoyi-quartz/src/main/java/com/ruoyi/quartz/config/ScheduleConfig.java
浏览文件 @
ef4bfde4
...
...
@@ -7,7 +7,7 @@ import javax.sql.DataSource;
import
java.util.Properties
;
/**
* 定时任务配置
* 定时任务配置
(单机部署建议删除此类和qrtz数据库表,默认走内存会最高效)
*
* @author ruoyi
*/
...
...
ruoyi-ui/src/api/monitor/server.js
浏览文件 @
ef4bfde4
import
request
from
'@/utils/request'
//
查询服务器详细
//
获取服务信息
export
function
getServer
()
{
return
request
({
url
:
'/monitor/server'
,
...
...
ruoyi-ui/src/components/RightToolbar/index.vue
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
ef4bfde4
...
...
@@ -6,8 +6,8 @@
v-model=
"queryParams.ipaddr"
placeholder=
"请输入登录地址"
clearable
size=
"small"
style=
"width: 240px;"
size=
"small"
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
...
...
@@ -16,8 +16,8 @@
v-model=
"queryParams.userName"
placeholder=
"请输入用户名称"
clearable
size=
"small"
style=
"width: 240px;"
size=
"small"
@
keyup
.
enter
.
native=
"handleQuery"
/>
</el-form-item>
...
...
ruoyi-ui/src/views/monitor/operlog/index.vue
浏览文件 @
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
浏览文件 @
ef4bfde4
...
...
@@ -179,8 +179,6 @@ export default {
isExpandAll
:
true
,
// 重新渲染表格状态
refreshTable
:
true
,
// 是否展开
expand
:
false
,
// 查询参数
queryParams
:
{
deptName
:
undefined
,
...
...
@@ -276,7 +274,7 @@ export default {
this
.
open
=
true
;
this
.
title
=
"添加部门"
;
listDept
().
then
(
response
=>
{
this
.
deptOptions
=
this
.
handleTree
(
response
.
data
,
"deptId"
);
this
.
deptOptions
=
this
.
handleTree
(
response
.
data
,
"deptId"
);
});
},
/** 展开/折叠操作 */
...
...
@@ -296,7 +294,7 @@ export default {
this
.
title
=
"修改部门"
;
});
listDeptExcludeChild
(
row
.
deptId
).
then
(
response
=>
{
this
.
deptOptions
=
this
.
handleTree
(
response
.
data
,
"deptId"
);
this
.
deptOptions
=
this
.
handleTree
(
response
.
data
,
"deptId"
);
});
},
/** 提交按钮 */
...
...
ruoyi-ui/src/views/system/dict/data.vue
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
浏览文件 @
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
=>
{
this
.
$modal
.
msgSuccess
(
"修改成功"
);
}
);
updateUserPwd
(
this
.
user
.
oldPassword
,
this
.
user
.
newPassword
).
then
(
response
=>
{
this
.
$modal
.
msgSuccess
(
"修改成功"
);
});
}
});
},
...
...
ruoyi-ui/src/views/system/user/profile/userAvatar.vue
浏览文件 @
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
...
...
@@ -140,7 +140,7 @@ export default {
// 关闭窗口
closeDialog
()
{
this
.
options
.
img
=
store
.
getters
.
avatar
this
.
visible
=
false
;
this
.
visible
=
false
;
}
}
};
...
...
编写
预览
Markdown
格式
0%
重试
或
添加新文件
添加附件
取消
您添加了
0
人
到此讨论。请谨慎行事。
请先完成此评论的编辑!
取消
请
注册
或者
登录
后发表评论