Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-convertor-view
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
station
amos-convertor-view
Commits
e7b47b78
Commit
e7b47b78
authored
May 26, 2020
by
xinglei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
f6933625
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
2 deletions
+8
-2
AmosGridTable.js
...view/bizview/common/tableComponent/table/AmosGridTable.js
+1
-1
MonitorPointConfig.js
...tLedger/FireResources/FireEquipment/MonitorPointConfig.js
+3
-0
index.js
src/view/bizview/equipmentLedger/Monitor/index.js
+4
-1
No files found.
src/view/bizview/common/tableComponent/table/AmosGridTable.js
View file @
e7b47b78
...
...
@@ -52,7 +52,7 @@ class AmosGridTable extends Component {
if
(
nextProps
.
totals
>
0
&&
Math
.
ceil
(
nextProps
.
totals
/
pageSize
)
<
current
)
{
this
.
setState
({
current
:
Math
.
ceil
(
nextProps
.
totals
/
pageSize
)})
}
if
(
nextProps
.
current
===
0
&&
(
nextProps
.
current
!==
this
.
state
.
current
)){
if
(
nextProps
.
current
===
0
&&
this
.
state
.
current
!==
1
&&
(
nextProps
.
current
!==
this
.
state
.
current
)){
this
.
onPaginationChange
(
nextProps
.
current
);
}
}
...
...
src/view/bizview/equipmentLedger/FireResources/FireEquipment/MonitorPointConfig.js
View file @
e7b47b78
...
...
@@ -173,6 +173,9 @@ class MonitorPointConfig extends Component {
//前端的current 即后端的pageNumber
param
.
pageNumber
=
param
.
current
;
}
if
(
param
.
current
<
0
){
return
;
}
Object
.
assign
(
searchParam
,
{
...
param
});
getMonitorPointListAction
(
searchParam
,
param
.
pageNumber
,
param
.
pageSize
).
then
(
data
=>
{
this
.
setState
({
...
...
src/view/bizview/equipmentLedger/Monitor/index.js
View file @
e7b47b78
...
...
@@ -130,6 +130,9 @@ class Monitor extends Component {
}
Object
.
assign
(
searchParam
,
{
...
param
});
searchParam
.
equipClassify
=
2
;
if
(
param
.
current
<
0
){
return
;
}
getFireEquipmentListAction
(
searchParam
,
searchParam
.
pageNumber
,
searchParam
.
pageSize
).
then
(
data
=>
{
this
.
setState
({
dataList
:
data
.
content
,
...
...
@@ -149,8 +152,8 @@ class Monitor extends Component {
this
.
pageConfig
.
pageSize
=
pageSize
;
}
if
(
current
!==
undefined
)
{
//this.pageConfig.current = current -1 ;
this
.
pageConfig
.
current
=
current
;
//this.pageConfig.current = current - 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