Commit eb50faa2 authored by shanqiyun's avatar shanqiyun

bug

parent c9837871
...@@ -53,7 +53,8 @@ class FireResourceView extends Component { ...@@ -53,7 +53,8 @@ class FireResourceView extends Component {
fireFoamDataList: [], fireFoamDataList: [],
fireFoamTotals: 0, //消防泡沫间总数 fireFoamTotals: 0, //消防泡沫间总数
fireWaterDataList: [], fireWaterDataList: [],
fireWaterTotals: 0 //消防水资源总数 fireWaterTotals: 0, //消防水资源总数
equipmentSearchKey: ''//消防装备查询key
}; };
} }
...@@ -68,7 +69,7 @@ class FireResourceView extends Component { ...@@ -68,7 +69,7 @@ class FireResourceView extends Component {
} }
onTabClick = key => { onTabClick = key => {
this.setState({ activeKey: key, recordId: undefined }); this.setState({ activeKey: key, recordId: undefined, equipmentSearchKey: '' });
}; };
getFireTruckListData = (param, _table) => { getFireTruckListData = (param, _table) => {
...@@ -92,11 +93,16 @@ class FireResourceView extends Component { ...@@ -92,11 +93,16 @@ class FireResourceView extends Component {
getFireEquipmentListData = (param, _table) => { getFireEquipmentListData = (param, _table) => {
_table && (_table.state.selectedRowKeys = []); _table && (_table.state.selectedRowKeys = []);
let { fireEquipmentSearchParam } = this.state; let { fireEquipmentSearchParam,equipmentSearchKey } = this.state;
if (param.current != null) { if (param.current != null) {
//前端的current 即后端的pageNumber //前端的current 即后端的pageNumber
param.pageNumber = param.current; param.pageNumber = param.current;
} }
if (param.name){
this.setState({ equipmentSearchKey: param.name })
} else {
param.name = equipmentSearchKey;
}
Object.assign(fireEquipmentSearchParam, { ...param }); Object.assign(fireEquipmentSearchParam, { ...param });
if (param.name === undefined){ if (param.name === undefined){
delete fireEquipmentSearchParam.name; delete fireEquipmentSearchParam.name;
......
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