Commit f9197d99 by liuyong

修改bug

1 parent d8a2f89d
...@@ -71,9 +71,9 @@ export default { ...@@ -71,9 +71,9 @@ export default {
} }
}, },
force: { force: {
repulsion: 1000 repulsion: 6000
}, },
edgeSymbol: ['circle', 'arrow'], // edgeSymbol: ['circle', 'arrow'],
data: seriesData, data: seriesData,
links: linkData links: linkData
} }
...@@ -95,7 +95,6 @@ export default { ...@@ -95,7 +95,6 @@ export default {
}, },
treeCheckChange(data, tree) {//左侧树勾选 treeCheckChange(data, tree) {//左侧树勾选
let seriesData = [], linkData = []; let seriesData = [], linkData = [];
console.log(tree.checkedNodes)
if(tree.checkedNodes.length > 0) { if(tree.checkedNodes.length > 0) {
tree.checkedNodes.forEach(item => { tree.checkedNodes.forEach(item => {
if(!item.targetList){ if(!item.targetList){
...@@ -125,7 +124,6 @@ export default { ...@@ -125,7 +124,6 @@ export default {
}, },
} }
}) })
linkData.push({ linkData.push({
source: item.assetCode, source: item.assetCode,
target: item2.assetCode, target: item2.assetCode,
...@@ -133,7 +131,20 @@ export default { ...@@ -133,7 +131,20 @@ export default {
}) })
} }
}) })
console.log(seriesData)
var new_arr2 = []
for (var i = 0; i < seriesData.length; i++) {
var flag = true
for (var j = 0; j < new_arr2.length; j++) {
if (new_arr2[j].id == seriesData[i].id) {
flag = false
}
}
if (flag) {
new_arr2.push(seriesData[i])
}
}
seriesData = new_arr2;
this.echarts1(seriesData, linkData); this.echarts1(seriesData, linkData);
}else { }else {
this.myChart.dispose(); this.myChart.dispose();
......
...@@ -382,6 +382,7 @@ ...@@ -382,6 +382,7 @@
if(this.ruleForm.dynamicForm_.length > 0) { if(this.ruleForm.dynamicForm_.length > 0) {
this.ruleForm.dynamicForm_.forEach(item => { this.ruleForm.dynamicForm_.forEach(item => {
fieldsValue.push({ fieldsValue.push({
id: item.propertyId,
cnName: item.cnName, cnName: item.cnName,
value_: item.value_, value_: item.value_,
controlType: item.controlType, controlType: item.controlType,
...@@ -669,6 +670,7 @@ ...@@ -669,6 +670,7 @@
} }
item['value_'] = ''; item['value_'] = '';
}); });
console.log(res.data)
this.ruleForm.dynamicForm_ = res.data; this.ruleForm.dynamicForm_ = res.data;
}else { }else {
this.ruleForm.dynamicForm_ = []; this.ruleForm.dynamicForm_ = [];
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!