Commit f9dd2a4c authored by shanqiyun's avatar shanqiyun

新增任务流程组件

parent 011fb531
......@@ -220,7 +220,7 @@ export const FasSerUrl = {
getTreeNodeTypeUrl: completePrefix(baseURI, 'api/riskModel/riskSource/getChildTypeByPid?riskSourceId={riskSourceId}'),// 根据节点ID获取子节点可能的类型
getAllUserUrl: completePrefix(baseURI, 'api/common/user/list'),//获取所有用户
queryFmeaControlObjUrl: completePrefix(baseURI, 'api/riskModel/fmea/{ids}/controlObjCount'),//根据fmea id查询关联对象个数
queryTopographyUrl: completePrefix(baseURI, 'api/Topography/{appId}'),//获取Topo图数据
queryTopographyUrl: completePrefix(baseURI, 'api/Topography/query/{type}/{appId}'),//获取Topo图数据
updateTopographyUrl: completePrefix(baseURI, 'api/Topography/updateTopo'),//更新Topo图数据
queryNodeDetailUrl: completePrefix(baseURI, 'api/Topography/detail/{id}'),//获取node节点详情
saveNodeDetailUrl:completePrefix(baseURI, 'api/Topography/detail'),//保存nodeDetail详情
......
......@@ -197,8 +197,8 @@ export const queryAllUserAction = () => {
/**
* 获取节点
*/
export const queryTopographyAction = (appId) => {
return commonGet(formatUrl(FasSerUrl.queryTopographyUrl,{ appId }));
export const queryTopographyAction = (type,appId) => {
return commonGet(formatUrl(FasSerUrl.queryTopographyUrl,{ type,appId }));
};
/**
......
......@@ -2,3 +2,4 @@
@import './plan.scss';
@import './leaderStruct.scss';
@import './text.scss';
@import './taskTopo.scss';
.publish-view-task{
width: 300px;
right: 0 ;
top: 82 ;
bottom: 0 ;
overflow: auto !important;
position: absolute;
}
.task-topo{
.task-topo{
height: 100%;
width: 300px;
right: 0 ;
......@@ -76,4 +67,4 @@
}
}
}
}
}
This diff is collapsed.
......@@ -28,7 +28,8 @@ class LeaderStruct extends Component {
toolBarFlag: '',
selectNode: {},
selectNodeType: '',
rightGridData: []
rightGridData: [],
type: '1',//topo 类型 1 领导架构
};
this.diagram = null; //gojs图
this.myPalette = null; //工具栏
......@@ -41,7 +42,7 @@ class LeaderStruct extends Component {
}
fetchData = (appId) => {
queryTopographyAction(appId).then(res =>{
queryTopographyAction(this.state.type, appId).then(res =>{
this.setState({nodeData: res.nodeData , linkData: res.linkData })
this.renderCanvas();
});
......@@ -267,6 +268,7 @@ class LeaderStruct extends Component {
const { nodeDataArray,linkDataArray } = this.updateTopologyData;
const params = {
appId: this.props.location.state.appId,
type: this.state.type,
nodeData: nodeDataArray,
linkData: linkDataArray,
nodeDetail: nodeDetail
......
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