Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
guns-vip
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
chenjunxiong
guns-vip
Commits
e076d6ff
Commit
e076d6ff
authored
Jul 28, 2019
by
fengshuonan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改角色相关的样式
parent
ac7e9916
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
107 additions
and
103 deletions
+107
-103
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/role/role.js
+21
-11
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/role/role_add.js
+6
-9
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/role/role_edit.js
+6
-9
guns-base-support/guns-sys/src/main/webapp/pages/modular/system/role/role_add.html
+37
-37
guns-base-support/guns-sys/src/main/webapp/pages/modular/system/role/role_edit.html
+37
-37
No files found.
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/role/role.js
View file @
e076d6ff
...
@@ -47,6 +47,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
...
@@ -47,6 +47,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
Role
.
openAddRole
=
function
()
{
Role
.
openAddRole
=
function
()
{
admin
.
putTempData
(
'formOk'
,
false
);
admin
.
putTempData
(
'formOk'
,
false
);
top
.
layui
.
admin
.
open
({
top
.
layui
.
admin
.
open
({
area
:
[
'1000px'
,
Feng
.
getClientHeightPx
()],
type
:
2
,
type
:
2
,
title
:
'添加角色'
,
title
:
'添加角色'
,
content
:
Feng
.
ctxPath
+
'/role/role_add'
,
content
:
Feng
.
ctxPath
+
'/role/role_add'
,
...
@@ -57,6 +58,24 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
...
@@ -57,6 +58,24 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
};
};
/**
/**
* 点击编辑角色
*
* @param data 点击按钮时候的行数据
*/
Role
.
onEditRole
=
function
(
data
)
{
admin
.
putTempData
(
'formOk'
,
false
);
top
.
layui
.
admin
.
open
({
area
:
[
'1000px'
,
Feng
.
getClientHeightPx
()],
type
:
2
,
title
:
'添加角色'
,
content
:
Feng
.
ctxPath
+
"/role/role_edit?roleId="
+
data
.
roleId
,
end
:
function
()
{
admin
.
getTempData
(
'formOk'
)
&&
table
.
reload
(
Role
.
tableId
);
}
});
};
/**
* 导出excel按钮
* 导出excel按钮
*/
*/
Role
.
exportExcel
=
function
()
{
Role
.
exportExcel
=
function
()
{
...
@@ -69,15 +88,6 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
...
@@ -69,15 +88,6 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
};
};
/**
/**
* 点击编辑角色
*
* @param data 点击按钮时候的行数据
*/
Role
.
onEditRole
=
function
(
data
)
{
window
.
location
.
href
=
Feng
.
ctxPath
+
"/role/role_edit?roleId="
+
data
.
roleId
;
};
/**
* 点击删除角色
* 点击删除角色
*
*
* @param data 点击按钮时候的行数据
* @param data 点击按钮时候的行数据
...
@@ -102,7 +112,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
...
@@ -102,7 +112,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
* @param data 点击按钮时候的行数据
* @param data 点击按钮时候的行数据
*/
*/
Role
.
roleAssign
=
function
(
data
)
{
Role
.
roleAssign
=
function
(
data
)
{
layer
.
open
({
parent
.
layer
.
open
({
type
:
2
,
type
:
2
,
title
:
'权限配置'
,
title
:
'权限配置'
,
area
:
[
'300px'
,
'450px'
],
//宽高
area
:
[
'300px'
,
'450px'
],
//宽高
...
@@ -132,7 +142,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
...
@@ -132,7 +142,7 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
// 添加按钮点击事件
// 添加按钮点击事件
$
(
'#btnAdd'
).
click
(
function
()
{
$
(
'#btnAdd'
).
click
(
function
()
{
window
.
location
.
href
=
Feng
.
ctxPath
+
"/role/role_add"
;
Role
.
openAddRole
()
;
});
});
// 导出excel
// 导出excel
...
...
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/role/role_add.js
View file @
e076d6ff
...
@@ -24,7 +24,7 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
...
@@ -24,7 +24,7 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
layer
.
open
({
layer
.
open
({
type
:
2
,
type
:
2
,
title
:
'父级角色选择'
,
title
:
'父级角色选择'
,
area
:
[
'300px'
,
'
2
00px'
],
area
:
[
'300px'
,
'
4
00px'
],
content
:
Feng
.
ctxPath
+
'/system/commonTree?formName='
+
formName
+
"&formId="
+
formId
+
"&treeUrl="
+
treeUrl
,
content
:
Feng
.
ctxPath
+
'/system/commonTree?formName='
+
formName
+
"&formId="
+
formId
+
"&treeUrl="
+
treeUrl
,
end
:
function
()
{
end
:
function
()
{
$
(
"#pid"
).
val
(
RoleInfoDlg
.
data
.
pid
);
$
(
"#pid"
).
val
(
RoleInfoDlg
.
data
.
pid
);
...
@@ -38,8 +38,11 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
...
@@ -38,8 +38,11 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
var
ajax
=
new
$ax
(
Feng
.
ctxPath
+
"/role/add"
,
function
(
data
)
{
var
ajax
=
new
$ax
(
Feng
.
ctxPath
+
"/role/add"
,
function
(
data
)
{
Feng
.
success
(
"添加成功!"
);
Feng
.
success
(
"添加成功!"
);
//跳转列表页面并刷新
//传给上个页面,刷新table用
window
.
location
.
href
=
Feng
.
ctxPath
+
"/role"
;
admin
.
putTempData
(
'formOk'
,
true
);
//关掉对话框
admin
.
closeThisDialog
();
},
function
(
data
)
{
},
function
(
data
)
{
Feng
.
error
(
"添加失败!"
+
data
.
responseJSON
.
message
)
Feng
.
error
(
"添加失败!"
+
data
.
responseJSON
.
message
)
...
@@ -50,9 +53,4 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
...
@@ -50,9 +53,4 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
//添加 return false 可成功跳转页面
//添加 return false 可成功跳转页面
return
false
;
return
false
;
});
});
//返回按钮
$
(
"#backupPage"
).
click
(
function
()
{
window
.
location
.
href
=
Feng
.
ctxPath
+
"/role"
;
});
});
});
\ No newline at end of file
guns-base-support/guns-sys/src/main/webapp/assets/modular/system/role/role_edit.js
View file @
e076d6ff
...
@@ -29,7 +29,7 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
...
@@ -29,7 +29,7 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
layer
.
open
({
layer
.
open
({
type
:
2
,
type
:
2
,
title
:
'父级角色选择'
,
title
:
'父级角色选择'
,
area
:
[
'300px'
,
'
2
00px'
],
area
:
[
'300px'
,
'
4
00px'
],
content
:
Feng
.
ctxPath
+
'/system/commonTree?formName='
+
formName
+
"&formId="
+
formId
+
"&treeUrl="
+
treeUrl
,
content
:
Feng
.
ctxPath
+
'/system/commonTree?formName='
+
formName
+
"&formId="
+
formId
+
"&treeUrl="
+
treeUrl
,
end
:
function
()
{
end
:
function
()
{
$
(
"#pid"
).
val
(
RoleInfoDlg
.
data
.
pid
);
$
(
"#pid"
).
val
(
RoleInfoDlg
.
data
.
pid
);
...
@@ -43,8 +43,11 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
...
@@ -43,8 +43,11 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
var
ajax
=
new
$ax
(
Feng
.
ctxPath
+
"/role/edit"
,
function
(
data
)
{
var
ajax
=
new
$ax
(
Feng
.
ctxPath
+
"/role/edit"
,
function
(
data
)
{
Feng
.
success
(
"修改成功!"
);
Feng
.
success
(
"修改成功!"
);
//跳转列表页面并刷新
//传给上个页面,刷新table用
window
.
location
.
href
=
Feng
.
ctxPath
+
"/role"
;
admin
.
putTempData
(
'formOk'
,
true
);
//关掉对话框
admin
.
closeThisDialog
();
},
function
(
data
)
{
},
function
(
data
)
{
Feng
.
error
(
"修改失败!"
+
data
.
responseJSON
.
message
+
"!"
);
Feng
.
error
(
"修改失败!"
+
data
.
responseJSON
.
message
+
"!"
);
...
@@ -55,9 +58,4 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
...
@@ -55,9 +58,4 @@ layui.use(['layer', 'form', 'admin', 'ax'], function () {
//添加 return false 可成功跳转页面
//添加 return false 可成功跳转页面
return
false
;
return
false
;
});
});
//返回按钮
$
(
"#backupPage"
).
click
(
function
()
{
window
.
location
.
href
=
Feng
.
ctxPath
+
"/role"
;
});
});
});
\ No newline at end of file
guns-base-support/guns-sys/src/main/webapp/pages/modular/system/role/role_add.html
View file @
e076d6ff
@layout("/common/_container.html",{js:["/assets/modular/system/role/role_add.js"]}){
@layout("/common/_form.html",{js:["/assets/modular/system/role/role_add.js"]}){
<div
class=
"layui-body-header"
>
<span
class=
"layui-body-header-title"
>
角色管理-添加
</span>
</div>
<div
class=
"layui-fluid "
style=
""
>
<form
class=
"layui-form"
id=
"roleForm"
lay-filter=
"roleForm"
>
<div
class=
"layui-card"
>
<div
class=
"layui-fluid"
style=
"padding-bottom: 75px;"
>
<div
class=
"layui-card-body"
>
<div
class=
"layui-card"
>
<form
id=
"userForm"
lay-filter=
"roleForm"
class=
"layui-form model-form"
style=
"max-width: 700px;margin: 40px auto;"
>
<div
class=
"layui-card-header"
>
基本信息
</div>
<input
name=
"roleId"
type=
"hidden"
/>
<div
class=
"layui-card-body"
>
<div
class=
"layui-form-item"
>
<div
class=
"layui-form-item layui-row"
>
<label
class=
"layui-form-label"
>
角色名称
<span
style=
"color: red;"
>
*
</span></label>
<input
name=
"roleId"
type=
"hidden"
/>
<div
class=
"layui-input-block"
>
<div
class=
"layui-inline layui-col-md12"
>
<input
name=
"name"
placeholder=
"请输入角色名称"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
/>
<label
class=
"layui-form-label"
>
角色名称
<span
style=
"color: red;"
>
*
</span></label>
<div
class=
"layui-input-block"
>
<input
name=
"name"
placeholder=
"请输入角色名称"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
/>
</div>
</div>
</div>
</div>
<div
class=
"layui-inline layui-col-md12"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
上级名称
<span
style=
"color: red;"
>
*
</span></label>
<label
class=
"layui-form-label"
>
上级名称
<span
style=
"color: red;"
>
*
</span></label>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<input
id=
"pid"
name=
"pid"
type=
"hidden"
>
<input
id=
"pid"
name=
"pid"
type=
"hidden"
>
<input
id=
"pName"
name=
"pName"
placeholder=
"请输入上级名称"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
autocomplete=
"off"
/>
<input
id=
"pName"
name=
"pName"
placeholder=
"请输入上级名称"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
autocomplete=
"off"
/>
</div>
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
别名
<span
style=
"color: red;"
>
*
</span></label>
<div
class=
"layui-input-block"
>
<input
id=
"description"
name=
"description"
placeholder=
"请输入别名"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
autocomplete=
"off"
/>
</div>
</div>
</div
>
<div
class=
"layui-inline layui-col-md12"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
别名
<span
style=
"color: red;"
>
*
</span></label
>
<label
class=
"layui-form-label"
>
排序
</label
>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<input
id=
"description"
name=
"description"
placeholder=
"请输入别名"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
autocomplete=
"off"
/
>
<
input
name=
"sort"
placeholder=
"请输入排序"
type=
"text"
class=
"layui-input"
/
>
<
/div
>
</div>
</div>
</div
>
<div
class=
"layui-inline layui-col-md12"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
排序
</label
>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<button
class=
"layui-btn"
lay-filter=
"btnSubmit"
lay-submit
>
 
提交
 
</button
>
<input
name=
"sort"
placeholder=
"请输入排序"
type=
"text"
class=
"layui-input"
/
>
<
button
class=
"layui-btn layui-btn-primary"
type=
"button"
id=
"backupPage"
>
 
返回
 
</button
>
<
/div
>
</div>
</div>
</div>
</div>
</
form
>
</
div
>
</div>
</div>
</div>
</div>
</div>
<div
class=
"form-group-bottom text-center"
>
<button
class=
"layui-btn"
lay-filter=
"btnSubmit"
lay-submit
>
 
提交
 
</button>
<button
type=
"reset"
class=
"layui-btn layui-btn-primary"
ew-event=
"closeDialog"
>
 
取消
 
</button>
</div>
</form>
@}
@}
guns-base-support/guns-sys/src/main/webapp/pages/modular/system/role/role_edit.html
View file @
e076d6ff
@layout("/common/_container.html",{js:["/assets/modular/system/role/role_edit.js"]}){
@layout("/common/_form.html",{js:["/assets/modular/system/role/role_edit.js"]}){
<div
class=
"layui-body-header"
>
<span
class=
"layui-body-header-title"
>
角色管理-修改
</span>
</div>
<div
class=
"layui-fluid "
style=
""
>
<form
class=
"layui-form"
id=
"roleForm"
lay-filter=
"roleForm"
>
<div
class=
"layui-card"
>
<div
class=
"layui-fluid"
style=
"padding-bottom: 75px;"
>
<div
class=
"layui-card-body"
>
<div
class=
"layui-card"
>
<form
id=
"roleForm"
lay-filter=
"roleForm"
class=
"layui-form model-form"
style=
"max-width: 700px;margin: 40px auto;"
>
<div
class=
"layui-card-header"
>
基本信息
</div>
<input
name=
"roleId"
type=
"hidden"
/>
<div
class=
"layui-card-body"
>
<div
class=
"layui-form-item"
>
<div
class=
"layui-form-item layui-row"
>
<label
class=
"layui-form-label"
>
角色名称
<span
style=
"color: red;"
>
*
</span></label>
<input
name=
"roleId"
type=
"hidden"
/>
<div
class=
"layui-input-block"
>
<div
class=
"layui-inline layui-col-md12"
>
<input
name=
"name"
placeholder=
"请输入角色名称"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
/>
<label
class=
"layui-form-label"
>
角色名称
<span
style=
"color: red;"
>
*
</span></label>
<div
class=
"layui-input-block"
>
<input
name=
"name"
placeholder=
"请输入角色名称"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
/>
</div>
</div>
</div>
</div>
<div
class=
"layui-inline layui-col-md12"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
上级名称
<span
style=
"color: red;"
>
*
</span></label>
<label
class=
"layui-form-label"
>
上级名称
<span
style=
"color: red;"
>
*
</span></label>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<input
id=
"pid"
name=
"pid"
type=
"hidden"
>
<input
id=
"pid"
name=
"pid"
type=
"hidden"
>
<input
id=
"pName"
name=
"pName"
placeholder=
"请输入上级名称"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
autocomplete=
"off"
/>
<input
id=
"pName"
name=
"pName"
placeholder=
"请输入上级名称"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
autocomplete=
"off"
/>
</div>
</div>
</div>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
别名
<span
style=
"color: red;"
>
*
</span></label>
<div
class=
"layui-input-block"
>
<input
id=
"description"
name=
"description"
placeholder=
"请输入别名"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
autocomplete=
"off"
/>
</div>
</div>
</div
>
<div
class=
"layui-inline layui-col-md12"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
别名
<span
style=
"color: red;"
>
*
</span></label
>
<label
class=
"layui-form-label"
>
排序
</label
>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<input
id=
"description"
name=
"description"
placeholder=
"请输入别名"
type=
"text"
class=
"layui-input"
lay-verify=
"required"
required
autocomplete=
"off"
/
>
<
input
name=
"sort"
placeholder=
"请输入排序"
type=
"text"
class=
"layui-input"
/
>
<
/div
>
</div>
</div>
</div
>
<div
class=
"layui-inline layui-col-md12"
>
<div
class=
"layui-form-item"
>
<label
class=
"layui-form-label"
>
排序
</label
>
<div
class=
"layui-input-block"
>
<div
class=
"layui-input-block"
>
<button
class=
"layui-btn"
lay-filter=
"btnSubmit"
lay-submit
>
 
提交
 
</button
>
<input
name=
"sort"
placeholder=
"请输入排序"
type=
"text"
class=
"layui-input"
/
>
<
button
class=
"layui-btn layui-btn-primary"
type=
"button"
id=
"backupPage"
>
 
返回
 
</button
>
<
/div
>
</div>
</div>
</div>
</div>
</
form
>
</
div
>
</div>
</div>
</div>
</div>
</div>
<div
class=
"form-group-bottom text-center"
>
<button
class=
"layui-btn"
lay-filter=
"btnSubmit"
lay-submit
>
 
提交
 
</button>
<button
type=
"reset"
class=
"layui-btn layui-btn-primary"
ew-event=
"closeDialog"
>
 
取消
 
</button>
</div>
</form>
@}
@}
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