Skip to content

A
amos-convertor-view
Commit 75ecfb9e authored by taabe's avatar taabe
Browse files
Options

调试接口及调整样式

parent b597e794
Show whitespace changes
Inline Side-by-side
Showing with 131 additions and 74 deletions
src/consts/urlConsts.js
View file @ 75ecfb9e
......@@ -148,7 +148,7 @@ export const FasSerUrl = {
bindPointUrl: completePrefix(baseURI, 'api/risksource/bindFmea/pointInputitem'),//巡检点关联
riskSourceRpnCountUrl: completePrefix(baseURI,'api/risksource/rpn/list'), // 查询风险点RPN统计
bindEquipListUrl: completePrefix(baseURI, 'api/risksource/fireequiment/relation/all?equimentId={equimentId}&fname={fname}&pageNumber={page}&pageSize={size}'),//配套设施查询（已绑定及未绑定）
getBindEquipIndexUrl: completePrefix(baseURI, 'api/risksource/listEquipmentPointById?fmeaId={fmeaId}&equimentId={equimentId}&fname={fname}&pageNumber={page}&pageSize={size}'),//获取配套设备指标项
getBindEquipIndexUrl: completePrefix(baseURI, 'api/risksource/listEquipmentPointById?fmeaId={fmeaId}&equimentId={equimentId}&equipmentPointName={equipmentPointName}'),//获取配套设备指标项
bindEquipIndexUrl: completePrefix(baseURI, 'api/risksource/bingFmea/equimentPoint'),
deleteBindEquipUrl: completePrefix(baseURI, 'api/risksource/fireequiment/relation/{ids}'),
removeByRSIdAndPIdUrl: completePrefix(baseURI, 'api/risksource/removeByRSIdAndPId'),//删除绑定的设备
......
src/services/preControlService.js
View file @ 75ecfb9e
......@@ -111,8 +111,8 @@ export const bindEquipListAction = (riskSourceId , equimentId, page, size,fname)
return commonGet(formatUrl(FasSerUrl.bindEquipListUrl, { riskSourceId,equimentId,fname,page,size }));
};
export const getBindEquipIndexAction = (fmeaId, equimentId, page, size, fname) => {
let url = formatUrl(FasSerUrl.getBindEquipIndexUrl, { fmeaId, equimentId, fname, page, size });
export const getBindEquipIndexAction = (fmeaId, equimentId, equipmentPointName) => {
let url = formatUrl(FasSerUrl.getBindEquipIndexUrl, { fmeaId, equimentId, equipmentPointName });
return commonGet(url);
};
......
src/styles/view/biz/riskModel/riskModel.scss
View file @ 75ecfb9e
......@@ -149,11 +149,14 @@
.risk-model-table {
width: 100%;
&.fmea-table {
overflow-x: scroll;
.grid-content {
width: 1500px;
}
}
.ant-table-title {
display: none;
......@@ -355,3 +358,8 @@
min-width: 25rem;
}
}
.amos-select-dropdown-popover {
height: 205px;
overflow-y: auto;
}
\ No newline at end of file
src/view/bizview/preControl/riskModel/FmeaTable.js
View file @ 75ecfb9e
......@@ -218,7 +218,7 @@ class FmeaTable extends Component {
let { dataList, totalCount, fetchData } = this.props;
let defaultPageConfig = this.pageConfig;
return (
<div className="risk-model-table">
<div className="risk-model-table fmea-table">
<AmosGridTable
columns={getColumns(this)}
callBack={this.reload}
......
src/view/bizview/preControl/riskModel/index.js
View file @ 75ecfb9e
......@@ -47,8 +47,11 @@ class RiskModel extends Component {
pageNumber: 0,
pageSize: 10
};
const panes = [
{ title: 'FMEA', content: 'FMEA', key: '1', hideClose: true }
];
this.state = {
activeKey: activeKey,
activeKey,
subActiveKey: '2-1',
riskSourceId: '',
autoExpandParent: true,
......@@ -66,7 +69,8 @@ class RiskModel extends Component {
expandedKeys: [],
selectedKeys: [],
rightClickNodeTreeItem: null,
treeNodeType: 3 //3:无孩子节点，2:子节点有风险节点，1:子节点有风险区域
treeNodeType: 3, //3:无孩子节点，2:子节点有风险节点，1:子节点有风险区域
panes
};
}
......@@ -295,7 +299,7 @@ class RiskModel extends Component {
} else if (activeKey === '2' && subActiveKey === '2-1'){
this.deleteAssoPoint(selectedRows);
} else if (activeKey === '2' && subActiveKey === '2-2'){
this.deleteBindEquip(selectedRowKeys.join(','));
this.deleteBindEquip(selectedRows);
}
}
......@@ -352,16 +356,16 @@ class RiskModel extends Component {
}
}
bindPointsCallback = () => {
bindPointsCallback = (pointId) => {
const { fmeaId } = this.state;
const { selectData } = this.model.state;
fmeaId && this.bindPoints(fmeaId, selectData);
fmeaId && this.bindPoints(fmeaId, pointId, selectData);
}
bindEquipIndexCallback = () => {
bindEquipIndexCallback = (equipmentId) => {
const { fmeaId } = this.state;
const { selectData } = this.model.state;
fmeaId && this.bindEquipIndexs(fmeaId , selectData);
fmeaId && this.bindEquipIndexs(fmeaId , equipmentId, selectData);
}
riskSourceEdit = (body) =>{
......@@ -376,13 +380,13 @@ class RiskModel extends Component {
);
};
bindPoints = (fmeaId, pointInputItems) => {
bindPoints = (fmeaId, pointId, pointInputItems) => {
let pointInputitemIds = [];
let param = {};
pointInputItems.map(item => {
pointInputitemIds.push(item.pointInputitemId);
param.pointId = item.pointId;
});
param.pointId = pointId;
param.fmeaId = fmeaId;
param.pointInputitemIds = pointInputitemIds;
bindPointsAction(param).then(
......@@ -396,13 +400,13 @@ class RiskModel extends Component {
);
};
bindEquipIndexs = (fmeaId, equipIndexs) => {
bindEquipIndexs = (fmeaId, equipmentId, equipIndexs) => {
let equipmentPointIds = [];
let param = {};
equipIndexs.map(item => {
equipmentPointIds.push(item.equipIndexId);
param.equipmentId = item.equipmentId;
});
param.equipmentId = equipmentId;
param.fmeaId = fmeaId;
param.equipmentPointIds = equipmentPointIds;
bindEquipIndexAction(param).then(
......@@ -416,12 +420,16 @@ class RiskModel extends Component {
);
};
deleteBindEquip =(ids)=>{
deleteBindEquip =(body)=>{
AmosAlert.confirm('提示', '确定要删除么?', {
callback: flag => {
if (flag) {
// 确定
deleteBindEquipAction(ids).then(
let param = {};
param.fmeaId = body[0].fmeaId;
param.equipmentId = body[0].equipmentId;
param.equipmentPointIds = [];
bindEquipIndexAction(param).then(
data => {
AmosAlert.success('提示', '删除成功');
this.reload();
......@@ -440,7 +448,11 @@ class RiskModel extends Component {
callback: flag => {
if (flag) {
// 确定
deleteAssoPointAction(body).then(
let param = {};
param.fmeaId = body[0].fmeaId;
param.pointId = body[0].pointId;
param.pointInputitemIds = [];
bindPointsAction(param).then(
data => {
AmosAlert.success('提示', '删除成功');
this.reload();
......@@ -716,11 +728,50 @@ class RiskModel extends Component {
fmeaItemDetailCallback = (fmeaId) => {
console.log('fmeaId =========== ', fmeaId);
this.setState({ fmeaId, showRelationObj: true, activeKey: '2' }, () => this.questStatistiscData(this.pageConfig));
this.add();
this.setState({ fmeaId }, () => this.questStatistiscData(this.pageConfig));
}
editTab = (targetKey, action) => {
console.log('~~~~~~~~close tab button is clicked ~~~~~~activeKey:', targetKey, action);
this[action](targetKey);
}
remove = (targetKey) => {
const panes = this.state.panes.filter(pane => pane.key !== targetKey);
this.setState({ panes, activeKey: '1' });
}
add = () => {
const panes = this.state.panes;
const activeKey = '2';
let pane = panes.filter(pane => pane.key === activeKey);
pane.length === 0 && panes.push({ title: '关联对象', content: '关联对象', key: activeKey });
this.setState({ panes, activeKey });
}
closeTab = (activeKey) => {
console.log('~~~~~~~~close tab button is clicked');
getTabPaneContent = (key) => {
let { riskSourceId, fmeaData, fmeaDataTotalNum, subActiveKey, fmeaId, pointData, equipData, pointDataTotalNum, equipDataTotalNum } = this.state;
if (key === '1') {
return (
<FmeaTable riskSourceId={riskSourceId} dataList={fmeaData} totalCount={fmeaDataTotalNum} fetchData={this.questStatistiscData} ref={component =>this.fmeaRef = component} fmeaItemDetailCallback={this.fmeaItemDetailCallback} />
);
} else {
return (
<Tabs
activeKey={subActiveKey}
type="card"
onTabClick={this.onSubTabClick}
>
<TabPane tab={<div>巡检点</div>} key="2-1">
<AssociatedPointTable fmeaId={fmeaId} dataList={pointData} totalCount={pointDataTotalNum} fetchData={this.questStatistiscData} ref={component =>this.pointRef = component} />
</TabPane>
<TabPane tab={<div>设备</div>} key="2-2">
<AssociatedEquipTable fmeaId={fmeaId} dataList={equipData} totalCount={equipDataTotalNum} fetchData={this.questStatistiscData} ref={component => this.equipRef = component} />
</TabPane>
</Tabs>
);
}
}
render() {
......@@ -746,7 +797,7 @@ class RiskModel extends Component {
autoExpandParent,
isRegion,
fmeaId,
showRelationObj
panes
} = this.state;
return (
<div className='risk-model'>
......@@ -808,26 +859,9 @@ class RiskModel extends Component {
tabBarExtraContent={this.getToolBar(activeKey, this)}
hideAdd
type="editable-card"
onEdit={this.closeTab}
>
<TabPane tab={'FMEA'} key="1" hideClose >
<FmeaTable riskSourceId={riskSourceId} dataList={fmeaData} totalCount={fmeaDataTotalNum} fetchData={this.questStatistiscData} ref={component =>this.fmeaRef = component} fmeaItemDetailCallback={this.fmeaItemDetailCallback} />
</TabPane>
{ true &&
<TabPane tab={'关联对象'} key="2" >
<Tabs
activeKey={subActiveKey}
type="card"
onTabClick={this.onSubTabClick}
onEdit={this.editTab}
>
<TabPane tab={<div>巡检点</div>} key="2-1">
<AssociatedPointTable fmeaId={fmeaId} dataList={pointData} totalCount={pointDataTotalNum} fetchData={this.questStatistiscData} ref={component =>this.pointRef = component} />
</TabPane>
<TabPane tab={<div>设备</div>} key="2-2">
<AssociatedEquipTable fmeaId={fmeaId} dataList={equipData} totalCount={equipDataTotalNum} fetchData={this.questStatistiscData} ref={component => this.equipRef = component} />
</TabPane>
</Tabs>
</TabPane>}
{panes.map(pane => <TabPane tab={pane.title} key={pane.key} hideClose={pane.hideClose}>{this.getTabPaneContent(pane.key)}</TabPane>)}
</Tabs>
}
</div>
......
src/view/bizview/preControl/riskModel/model/EquipModel.js
View file @ 75ecfb9e
......@@ -33,7 +33,7 @@ class EquipModel extends Component {
};
setParamAndSearch =(param)=>{
this.setState({ searchParam: param },() => this.questStatistiscData());
this.setState({ searchParam: param, indexDataList: [] },() => this.questStatistiscData());
}
setSelectData =(selectedRowKeys, fmeaId, equipmentId) => {
......@@ -50,11 +50,17 @@ class EquipModel extends Component {
}
questStatistiscData = param => {
let { riskSourceId, equipmentId, fname } = this.state.searchParam;
this.queryBindEquip(riskSourceId, equipmentId, fname);
let { riskSourceId, importEquipId, equipmentId, fname, fmeaId, equipmentPointName, key } = this.state.searchParam;
if (key === 'fireEquip') {
this.queryBindEquip(riskSourceId, importEquipId, fname);
}
if (key === 'equipIndex') {
this.queryBindEquipIndex(fmeaId, equipmentId, equipmentPointName);
}
}
queryBindEquip = (riskSourceId, equipmentId, fname) => {
this.setState({ importEquipId: equipmentId });
equipmentId && bindEquipListAction(riskSourceId, equipmentId,0,-1,fname).then(data=>{//查询巡检点项
let { selectData } = this.state;
let content = data.content;//内容
......@@ -79,13 +85,12 @@ class EquipModel extends Component {
});
}
queryBindEquipIndex = (fmeaId, equipmentId, fname) => {
fmeaId && equipmentId && getBindEquipIndexAction(fmeaId, equipmentId, 0, 10000, fname).then(data => {
queryBindEquipIndex = (fmeaId, equipmentId, equipmentPointName) => {
fmeaId && equipmentId && getBindEquipIndexAction(fmeaId, equipmentId, equipmentPointName).then(data => {
console.log(data);
let { selectData } = this.state;
let content = data.content;//内容
if (!fname){
let fireEquip = content.filter(item => item.isBound === 'bound');//已经选择的行数据
if (!equipmentPointName){
let fireEquip = data.filter(item => item.isBound === 'bound');//已经选择的行数据
let selects = fireEquip.map(e=>{//已经选择的id集合
return e.id;
});
......@@ -98,21 +103,25 @@ class EquipModel extends Component {
fireEquip.map(e=>{//再新增
selectData.push({ fmeaId, equipmentId, equipIndexId: e.id });//所有双击过的数据库查询出的绑定关系
});
this.setState({ indexDataList: content, indexTotalCount: data.totalElements, selects, selectData, equipmentId });
this.setState({ indexDataList: data, indexTotalCount: data.totalElements, selects, selectData, equipmentId });
} else {
this.setState({ indexDataList: content, indexTotalCount: data.totalElements });
this.setState({ indexDataList: data, indexTotalCount: data.totalElements });
}
});
}
clearCallback = () => {
this.setState({ dataList: [] });
}
render() {
let { riskSourceId, bindEquipIndexCallback, fmeaId } = this.props;
let { dataList, totalCount, equipmentId, selects, eId, indexTotalCount, indexDataList } = this.state;
let { dataList, totalCount, importEquipId, equipmentId, selects, eId, indexTotalCount, indexDataList } = this.state;
return (
<div className="equip-model">
<EquipTable riskSourceId={riskSourceId} equipmentId={eId} fetchData={this.queryBindEquip} />
<FireEquipTable fmeaId={fmeaId} equipmentId={equipmentId} selects={selects} dataList={dataList} totalCount={totalCount} setParamAndSearch={this.setParamAndSearch} fetchData={this.queryBindEquipIndex} />
<FireEquipIndexTable bindEquipIndexCallback={bindEquipIndexCallback} riskSourceId={riskSourceId} equipmentId={equipmentId} selects={selects} dataList={indexDataList} totalCount={indexTotalCount} callBack={this.setSelectData} setParamAndSearch={this.setParamAndSearch} />
<EquipTable riskSourceId={riskSourceId} importEquipId={eId} fetchData={this.queryBindEquip} clearCallback={this.clearCallback} />
<FireEquipTable fmeaId={fmeaId} importEquipId={importEquipId} selects={selects} dataList={dataList} totalCount={totalCount} setParamAndSearch={this.setParamAndSearch} fetchData={this.queryBindEquipIndex} />
<FireEquipIndexTable bindEquipIndexCallback={bindEquipIndexCallback} fmeaId={fmeaId} equipmentId={equipmentId} selects={selects} dataList={indexDataList} totalCount={indexTotalCount} callBack={this.setSelectData} setParamAndSearch={this.setParamAndSearch} />
</div>
);
}
......
src/view/bizview/preControl/riskModel/model/EquipTable.js
View file @ 75ecfb9e
......@@ -46,15 +46,15 @@ class EquipTable extends Component {
}
componentWillMount = () => {
let { equipmentId } = { ...this.props };
equipmentId && this.setState({ searchParam: [{ 'name': 'id', 'value': equipmentId }] ,equipmentId });
let { importEquipId } = { ...this.props };
importEquipId && this.setState({ searchParam: [{ 'name': 'id', 'value': importEquipId }] , importEquipId });
};
onRowClick =(record, index, event) => {
let { fetchData, riskSourceId } = this.props;
let equimentId = record.id;
this.setState({ equimentId: record.id, riskSourceId });
fetchData(riskSourceId, equimentId,'');
let importEquipId = record.id;
this.setState({ importEquipId: record.id, riskSourceId });
fetchData(riskSourceId, importEquipId, '');
}
onChange = (e,value) =>{
......@@ -106,11 +106,12 @@ class EquipTable extends Component {
};
searchData =()=>{
let { equipmentId,name } = this.state;
let { importEquipId,name } = this.state;
let searchParam = [];
name && searchParam.push({ name: 'name',value: name, type: 'LIKE' });
equipmentId && searchParam.push({ name: 'id', value: equipmentId });
importEquipId && searchParam.push({ name: 'id', value: importEquipId });
this.setState({ searchParam },()=> this.questStatistiscData({ pageNumber: [this.pageConfig.current] - 1, pageSize: this.pageConfig.pageSize }));
this.props.clearCallback();
}
questStatistiscData = param => {
......@@ -161,6 +162,6 @@ class EquipTable extends Component {
}
EquipTable.propTypes = {
clearCallback: PropTypes.func
};
export default EquipTable;
src/view/bizview/preControl/riskModel/model/FireEquipIndexTable.js
View file @ 75ecfb9e
......@@ -100,13 +100,14 @@ class FireEquipIndexTable extends Component {
};
searchData = () => {
let {riskSourceId, equipmentId, setParamAndSearch } = this.props;
let { fmeaId, equipmentId, setParamAndSearch } = this.props;
let { fname } = this.state;
setParamAndSearch({ riskSourceId, equipmentId, fname });
setParamAndSearch({ fmeaId, equipmentId, equipmentPointName: fname, key: 'equipIndex' });
}
save = () => {
this.props.bindEquipIndexCallback();
const { equipmentId } = this.props;
this.props.bindEquipIndexCallback(equipmentId);
}
render() {
......@@ -141,6 +142,8 @@ class FireEquipIndexTable extends Component {
FireEquipIndexTable.propTypes = {
bindEquipIndexCallback: PropTypes.func,
fmeaId: PropTypes.number
fmeaId: PropTypes.number,
equipmentId: PropTypes.number,
setParamAndSearch: PropTypes.func
};
export default FireEquipIndexTable;
src/view/bizview/preControl/riskModel/model/FireEquipTable.js
View file @ 75ecfb9e
......@@ -107,9 +107,9 @@ class FireEquipTable extends Component {
};
searchData =()=>{
let {riskSourceId, equipmentId, setParamAndSearch } = this.props;
let {riskSourceId, importEquipId, setParamAndSearch } = this.props;
let { fname } = this.state;
setParamAndSearch({ riskSourceId, equipmentId, fname });
setParamAndSearch({ riskSourceId, importEquipId, fname, key: 'fireEquip' });
}
......
src/view/bizview/preControl/riskModel/model/PointModel.js
View file @ 75ecfb9e
......@@ -171,10 +171,10 @@ class PointModel extends Component {
onSelectChange = (e, value) => {
let { pointId } = this.state;
let searchParam =[];
value && searchParam.push({name:e,value:value});
pointId && searchParam.push({name:'pointId', value:pointId});
this.setState({ searchParam,[e]: value},()=> this.questStatistiscData({pageNumber:0, pageSize:10}));
let searchParam = [];
value && searchParam.push({ name: e, value });
pointId && searchParam.push({ name: 'pointId', value: pointId });
this.setState({ searchParam,[e]: value },()=> this.questStatistiscData({ pageNumber: 0, pageSize: 10 }));
};
......@@ -209,7 +209,8 @@ class PointModel extends Component {
}
save = () => {
this.props.bindPointsCallback();
const { pointId } = this.state;
this.props.bindPointsCallback(pointId);
}
render() {
......
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