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
b2745c60
Commit
b2745c60
authored
Jun 04, 2019
by
fengshuonan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更新查询条件重置后未重置分页参数的问题
parent
aa286ac1
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
27 additions
and
9 deletions
+27
-9
guns-sys/src/main/webapp/assets/modular/system/dept/dept.js
+3
-1
guns-sys/src/main/webapp/assets/modular/system/dictType/dictType.js
+3
-1
guns-sys/src/main/webapp/assets/modular/system/log/log.js
+3
-1
guns-sys/src/main/webapp/assets/modular/system/log/login_log.js
+3
-1
guns-sys/src/main/webapp/assets/modular/system/notice/notice.js
+3
-1
guns-sys/src/main/webapp/assets/modular/system/role/role.js
+3
-1
guns-sys/src/main/webapp/assets/modular/system/user/user.js
+3
-1
guns-vip-gen/src/main/resources/gunsTemplates/page.js.btl
+3
-1
guns-vip-main/src/main/webapp/assets/form/egForm.js
+3
-1
No files found.
guns-sys/src/main/webapp/assets/modular/system/dept/dept.js
View file @
b2745c60
...
@@ -37,7 +37,9 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
...
@@ -37,7 +37,9 @@ layui.use(['table', 'admin', 'ax', 'ztree'], function () {
var
queryData
=
{};
var
queryData
=
{};
queryData
[
'condition'
]
=
$
(
"#name"
).
val
();
queryData
[
'condition'
]
=
$
(
"#name"
).
val
();
queryData
[
'deptId'
]
=
Dept
.
condition
.
deptId
;
queryData
[
'deptId'
]
=
Dept
.
condition
.
deptId
;
table
.
reload
(
Dept
.
tableId
,
{
where
:
queryData
});
table
.
reload
(
Dept
.
tableId
,
{
where
:
queryData
,
page
:
{
curr
:
1
}
});
};
};
/**
/**
...
...
guns-sys/src/main/webapp/assets/modular/system/dictType/dictType.js
View file @
b2745c60
...
@@ -62,7 +62,9 @@ layui.use(['table', 'ax'], function () {
...
@@ -62,7 +62,9 @@ layui.use(['table', 'ax'], function () {
queryData
[
'condition'
]
=
$
(
"#condition"
).
val
();
queryData
[
'condition'
]
=
$
(
"#condition"
).
val
();
queryData
[
'systemFlag'
]
=
$
(
"#systemFlag"
).
val
();
queryData
[
'systemFlag'
]
=
$
(
"#systemFlag"
).
val
();
queryData
[
'status'
]
=
$
(
"#status"
).
val
();
queryData
[
'status'
]
=
$
(
"#status"
).
val
();
table
.
reload
(
DictType
.
tableId
,
{
where
:
queryData
});
table
.
reload
(
DictType
.
tableId
,
{
where
:
queryData
,
page
:
{
curr
:
1
}
});
};
};
/**
/**
...
...
guns-sys/src/main/webapp/assets/modular/system/log/log.js
View file @
b2745c60
...
@@ -39,7 +39,9 @@ layui.use(['layer', 'table', 'ax', 'laydate'], function () {
...
@@ -39,7 +39,9 @@ layui.use(['layer', 'table', 'ax', 'laydate'], function () {
queryData
[
'endTime'
]
=
$
(
"#endTime"
).
val
();
queryData
[
'endTime'
]
=
$
(
"#endTime"
).
val
();
queryData
[
'logName'
]
=
$
(
"#logName"
).
val
();
queryData
[
'logName'
]
=
$
(
"#logName"
).
val
();
queryData
[
'logType'
]
=
$
(
"#logType"
).
val
();
queryData
[
'logType'
]
=
$
(
"#logType"
).
val
();
table
.
reload
(
LoginLog
.
tableId
,
{
where
:
queryData
});
table
.
reload
(
LoginLog
.
tableId
,
{
where
:
queryData
,
page
:
{
curr
:
1
}
});
};
};
/**
/**
...
...
guns-sys/src/main/webapp/assets/modular/system/log/login_log.js
View file @
b2745c60
...
@@ -35,7 +35,9 @@ layui.use(['layer', 'table', 'ax', 'laydate'], function () {
...
@@ -35,7 +35,9 @@ layui.use(['layer', 'table', 'ax', 'laydate'], function () {
queryData
[
'beginTime'
]
=
$
(
"#beginTime"
).
val
();
queryData
[
'beginTime'
]
=
$
(
"#beginTime"
).
val
();
queryData
[
'endTime'
]
=
$
(
"#endTime"
).
val
();
queryData
[
'endTime'
]
=
$
(
"#endTime"
).
val
();
queryData
[
'logName'
]
=
$
(
"#logName"
).
val
();
queryData
[
'logName'
]
=
$
(
"#logName"
).
val
();
table
.
reload
(
LoginLog
.
tableId
,
{
where
:
queryData
});
table
.
reload
(
LoginLog
.
tableId
,
{
where
:
queryData
,
page
:
{
curr
:
1
}
});
};
};
/**
/**
...
...
guns-sys/src/main/webapp/assets/modular/system/notice/notice.js
View file @
b2745c60
...
@@ -34,7 +34,9 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
...
@@ -34,7 +34,9 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
Notice
.
search
=
function
()
{
Notice
.
search
=
function
()
{
var
queryData
=
{};
var
queryData
=
{};
queryData
[
'condition'
]
=
$
(
"#condition"
).
val
();
queryData
[
'condition'
]
=
$
(
"#condition"
).
val
();
table
.
reload
(
Notice
.
tableId
,
{
where
:
queryData
});
table
.
reload
(
Notice
.
tableId
,
{
where
:
queryData
,
page
:
{
curr
:
1
}
});
};
};
/**
/**
...
...
guns-sys/src/main/webapp/assets/modular/system/role/role.js
View file @
b2745c60
...
@@ -36,7 +36,9 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
...
@@ -36,7 +36,9 @@ layui.use(['layer', 'form', 'table', 'admin', 'ax'], function () {
Role
.
search
=
function
()
{
Role
.
search
=
function
()
{
var
queryData
=
{};
var
queryData
=
{};
queryData
[
'roleName'
]
=
$
(
"#roleName"
).
val
();
queryData
[
'roleName'
]
=
$
(
"#roleName"
).
val
();
table
.
reload
(
Role
.
tableId
,
{
where
:
queryData
});
table
.
reload
(
Role
.
tableId
,
{
where
:
queryData
,
page
:
{
curr
:
1
}
});
};
};
/**
/**
...
...
guns-sys/src/main/webapp/assets/modular/system/user/user.js
View file @
b2745c60
...
@@ -55,7 +55,9 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
...
@@ -55,7 +55,9 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'ax'], functio
queryData
[
'deptId'
]
=
MgrUser
.
condition
.
deptId
;
queryData
[
'deptId'
]
=
MgrUser
.
condition
.
deptId
;
queryData
[
'name'
]
=
$
(
"#name"
).
val
();
queryData
[
'name'
]
=
$
(
"#name"
).
val
();
queryData
[
'timeLimit'
]
=
$
(
"#timeLimit"
).
val
();
queryData
[
'timeLimit'
]
=
$
(
"#timeLimit"
).
val
();
table
.
reload
(
MgrUser
.
tableId
,
{
where
:
queryData
});
table
.
reload
(
MgrUser
.
tableId
,
{
where
:
queryData
,
page
:
{
curr
:
1
}
});
};
};
/**
/**
...
...
guns-vip-gen/src/main/resources/gunsTemplates/page.js.btl
View file @
b2745c60
...
@@ -34,7 +34,9 @@ layui.use(['table', 'admin', 'ax'], function () {
...
@@ -34,7 +34,9 @@ layui.use(['table', 'admin', 'ax'], function () {
${entity}.search = function () {
${entity}.search = function () {
var queryData = {};
var queryData = {};
queryData['condition'] = $("#condition").val();
queryData['condition'] = $("#condition").val();
table.reload(${entity}.tableId, {where: queryData});
table.reload(${entity}.tableId, {
where: queryData, page: {curr: 1}
});
};
};
/**
/**
...
...
guns-vip-main/src/main/webapp/assets/form/egForm.js
View file @
b2745c60
...
@@ -48,7 +48,9 @@ layui.use(['table', 'admin', 'ax'], function () {
...
@@ -48,7 +48,9 @@ layui.use(['table', 'admin', 'ax'], function () {
EgForm
.
search
=
function
()
{
EgForm
.
search
=
function
()
{
var
queryData
=
{};
var
queryData
=
{};
queryData
[
'condition'
]
=
$
(
"#condition"
).
val
();
queryData
[
'condition'
]
=
$
(
"#condition"
).
val
();
table
.
reload
(
EgForm
.
tableId
,
{
where
:
queryData
});
table
.
reload
(
EgForm
.
tableId
,
{
where
:
queryData
,
page
:
{
curr
:
1
}
});
};
};
/**
/**
...
...
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