Commit 1eb5512a authored by shanqiyun's avatar shanqiyun

bug

parent fb17f4b1
...@@ -151,7 +151,7 @@ selectedOrgInfoUrl: completePrefix(baseURI, 'api/region/current'),//获取选择 ...@@ -151,7 +151,7 @@ selectedOrgInfoUrl: completePrefix(baseURI, 'api/region/current'),//获取选择
riskFactorDetUrl: completePrefix(baseURI, 'api/riskFactor/deleteRiskFactorById'), riskFactorDetUrl: completePrefix(baseURI, 'api/riskFactor/deleteRiskFactorById'),
fireSourceListUrl: completePrefix(baseURI, 'api/impEquip/list?pageNumber={page}&pageSize={size}'), //获取重点设备列表 fireSourceListUrl: completePrefix(baseURI, 'api/impEquip/list?pageNumber={page}&pageSize={size}'), //获取重点设备列表
fireEquipmentClassifyAllListUrl: completePrefix(baseURI, 'api/firequment/point/listByType?equipClassify={equipClassify}'), //获取消防装备列表 fireEquipmentClassifyAllListUrl: completePrefix(baseURI, 'api/firequment/point/listByType?equipClassify={equipClassify}'), //获取消防装备列表
fireEquipmentListUrl: completePrefix(baseURI, 'api/fireSource/info/page?name={name}&code={code}&equipClassify={equipClassify}&pageNumber={page}&pageSize={size}'), //获取消防装备列表 fireEquipmentListUrl: completePrefix(baseURI, 'api/fireSource/info/page?name={name}&code={code}&equipClassify={equipClassify}&pageNumber={page}&pageSize={size}&bindStation={bindStation}'), //获取消防装备列表
monitorPointListUrl: completePrefix(baseURI, 'api/firequment/point/page?pageNumber={page}&pageSize={size}&type={type}&searchValue={searchValue}'), //获取消防装备已配置监测点位列表 monitorPointListUrl: completePrefix(baseURI, 'api/firequment/point/page?pageNumber={page}&pageSize={size}&type={type}&searchValue={searchValue}'), //获取消防装备已配置监测点位列表
monitorPointEditUrl: completePrefix(baseURI, 'api/firequment/point'), //新增/更新消防装备监测点位 monitorPointEditUrl: completePrefix(baseURI, 'api/firequment/point'), //新增/更新消防装备监测点位
monitorPointDeleteUrl: completePrefix(baseURI, 'api/firequment/point/batch/delete?pointIds={ids}'), //删除消防装备监测点位 monitorPointDeleteUrl: completePrefix(baseURI, 'api/firequment/point/batch/delete?pointIds={ids}'), //删除消防装备监测点位
......
...@@ -24,11 +24,12 @@ export const getFireTruckDetailAction = (id) => { ...@@ -24,11 +24,12 @@ export const getFireTruckDetailAction = (id) => {
* @param {*} size * @param {*} size
*/ */
export const getFireEquipmentListAction = (filter, page, size) => { export const getFireEquipmentListAction = (filter, page, size) => {
let { name, code, equipClassify } = filter; let { name, code, equipClassify, bindStation } = filter;
name = name === undefined ? '' : name; name = name === undefined ? '' : name;
code = code === undefined ? '' : code; code = code === undefined ? '' : code;
bindStation = bindStation === undefined ? '' : bindStation;
equipClassify = equipClassify === undefined ? '0,1,3' : equipClassify; equipClassify = equipClassify === undefined ? '0,1,3' : equipClassify;
let url = formatUrl(FasSerUrl.fireEquipmentListUrl, { name, code, equipClassify, page, size }); let url = formatUrl(FasSerUrl.fireEquipmentListUrl, { name, code, equipClassify, page, size, bindStation });
return commonGet(url); return commonGet(url);
}; };
......
...@@ -108,7 +108,10 @@ class FireStationMatchesAddView extends Component { ...@@ -108,7 +108,10 @@ class FireStationMatchesAddView extends Component {
selectedRowKeys: [], selectedRowKeys: [],
dataList: [], //表格数据集合 dataList: [], //表格数据集合
size: 'small', //表格大小 size: 'small', //表格大小
searchParam: { equipClassify: '0,1,2,3' }, searchParam: {
equipClassify: '0,1,2,3',
bindStation: 'false'
},
totals: 0, //所有数据总和 totals: 0, //所有数据总和
requestParam: [], requestParam: [],
showDetail: true, //是否显示详情 showDetail: true, //是否显示详情
......
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