Commit 887e1617 authored by xinglei's avatar xinglei

修改消防点位样式

parent e7b47b78
...@@ -53,7 +53,7 @@ class AmosGridTable extends Component { ...@@ -53,7 +53,7 @@ class AmosGridTable extends Component {
this.setState({ current: Math.ceil(nextProps.totals / pageSize)}) this.setState({ current: Math.ceil(nextProps.totals / pageSize)})
} }
if (nextProps.current === 0 && this.state.current !== 1 && (nextProps.current !== this.state.current)){ if (nextProps.current === 0 && this.state.current !== 1 && (nextProps.current !== this.state.current)){
this.onPaginationChange(nextProps.current); this.onPaginationChange(nextProps.current + 1);
} }
} }
......
...@@ -29,13 +29,14 @@ const monitorPointTableColumns = self => { ...@@ -29,13 +29,14 @@ const monitorPointTableColumns = self => {
return [ return [
{ {
title: '序号', title: '序号',
render: (text, record, index) => `${index + 1}` render: (text, record, index) => `${index + 1}`,
width: '5%'
}, },
{ {
title: '编号', title: '编号',
dataIndex: 'code', dataIndex: 'code',
key: 'code', key: 'code',
width: '20%' width: '15%'
}, },
{ {
title: '名称', title: '名称',
...@@ -173,9 +174,6 @@ class MonitorPointConfig extends Component { ...@@ -173,9 +174,6 @@ class MonitorPointConfig extends Component {
//前端的current 即后端的pageNumber //前端的current 即后端的pageNumber
param.pageNumber = param.current; param.pageNumber = param.current;
} }
if (param.current < 0){
return;
}
Object.assign(searchParam, { ...param }); Object.assign(searchParam, { ...param });
getMonitorPointListAction(searchParam, param.pageNumber, param.pageSize).then(data => { getMonitorPointListAction(searchParam, param.pageNumber, param.pageSize).then(data => {
this.setState({ this.setState({
......
...@@ -130,9 +130,6 @@ class Monitor extends Component { ...@@ -130,9 +130,6 @@ class Monitor extends Component {
} }
Object.assign(searchParam, { ...param }); Object.assign(searchParam, { ...param });
searchParam.equipClassify = 2; searchParam.equipClassify = 2;
if (param.current < 0){
return;
}
getFireEquipmentListAction(searchParam, searchParam.pageNumber, searchParam.pageSize).then(data => { getFireEquipmentListAction(searchParam, searchParam.pageNumber, searchParam.pageSize).then(data => {
this.setState({ this.setState({
dataList: data.content, dataList: data.content,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment