Skip to content

liangzhen / framework-tools-web

Go to a project
Commit b9670dd2 by liuyong
Options

修改bug

1 parent 117f1417
Inline Side-by-side
Showing with 28 additions and 46 deletions
src/views/archi-ele-list/index.vue
...@@ -177,11 +177,11 @@ ...@@ -177,11 +177,11 @@
</div> </div>
</div> </div>
</el-form> </el-form>
<div style="text-align: right;margin-bottom: 10px;"> <div style="text-align: right;margin-bottom: 10px;" v-if="is_add_edit != 'add'">
<el-button type="primary" size="mini" @click="openDicyDialog">新增</el-button> <el-button type="primary" size="mini" @click="openDicyDialog">新增</el-button>
</div> </div>
<el-table height="300" :data="tableData2" stripe border> <el-table height="300" :data="tableData2" stripe border v-if="is_add_edit != 'add'">
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="fieldName" label="字段名" align="center"></el-table-column> <el-table-column prop="fieldName" label="字段名" align="center"></el-table-column>
<el-table-column prop="cnName" label="中文名" align="center"></el-table-column> <el-table-column prop="cnName" label="中文名" align="center"></el-table-column>
......
src/views/archi-intelligence-search/index.vue
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
} }
}, },
force: { force: {
repulsion: 6000 repulsion: 1000
}, },
edgeSymbol: ['circle', 'arrow'], edgeSymbol: ['circle', 'arrow'],
data: seriesData, data: seriesData,
...@@ -94,64 +94,46 @@ export default { ...@@ -94,64 +94,46 @@ export default {
}); });
}, },
treeCheckChange(data, tree) {//左侧树勾选 treeCheckChange(data, tree) {//左侧树勾选
// console.log(data)
console.log(tree.checkedNodes);
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 => {
// console.log(item.icon)
if(!item.targetList){ if(!item.targetList){
return; return;
} }
seriesData.push({ seriesData.push({
name: item.assetName, name: item.assetName,
id: item.assetId, id: item.assetCode,
symbol: item.icon, symbol: item.icon,
draggable: true, draggable: true,
itemStyle: { itemStyle: {
// color: 'green', normal: {
// normal: { color: item.color
// borderColor: '#82dffe', },
// borderWidth: 6,
// shadowBlur: 20,
// shadowColor: '#04f2a7',
// color: 'rgb(13,134,127)',
// },
} }
}); });
if(item.targetList.length > 0) { if(item.targetList.length > 0) {
item.targetList.forEach(item2 => { item.targetList.forEach(item2 => {
if(item.assetId != item2.assetId) { seriesData.push({
seriesData.push({ name: item2.assetName,
name: item2.assetName, id: item2.assetCode,
id: item2.assetId, symbol: item.icon,
symbol: item.icon, draggable: true,
draggable: true, itemStyle: {
// itemStyle: { normal: {
// color: 'green', color: item2.color
// normal: { },
// borderColor: '#82dffe', }
// borderWidth: 6, })
// shadowBlur: 20,
// shadowColor: '#04f2a7',
// color: 'rgb(13,134,127)',
// },
// }
})
}
// linkData.push({ linkData.push({
// source: item.assetId, source: item.assetCode,
// target: item2.assetId, target: item2.assetCode,
// }) })
}) })
} }
}) })
console.log(seriesData); console.log(seriesData)
// console.log(linkData);
this.echarts1(seriesData, linkData); this.echarts1(seriesData, linkData);
}else { }else {
this.myChart.dispose(); this.myChart.dispose();
......
src/views/archiEleRela/index.vue
...@@ -157,10 +157,10 @@ ...@@ -157,10 +157,10 @@
</div> </div>
</div> </div>
</div> </div>
<div style="text-align: right;margin: 20px 0 10px 0;"> <div style="text-align: right;margin: 20px 0 10px 0;" v-if="title != '新建关系元素'">
<el-button type="primary" size="mini" @click="openDicyDialog">新增</el-button> <el-button type="primary" size="mini" @click="openDicyDialog">新增</el-button>
</div> </div>
<el-table height="300" :data="tableData2" stripe border> <el-table height="300" :data="tableData2" stripe border v-if="title != '新建关系元素'">
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="fieldName" label="字段名" align="center"></el-table-column> <el-table-column prop="fieldName" label="字段名" align="center"></el-table-column>
<el-table-column prop="cnName" label="中文名" align="center"></el-table-column> <el-table-column prop="cnName" label="中文名" align="center"></el-table-column>
......
src/views/archiViewConfig/index.vue
...@@ -170,10 +170,10 @@ ...@@ -170,10 +170,10 @@
<el-table-column prop="rsName" label="元素关系名称" align="center"></el-table-column> <el-table-column prop="rsName" label="元素关系名称" align="center"></el-table-column>
</el-table> --> </el-table> -->
</div> </div>
<div style="text-align: right;margin: 20px 0 10px 0;width: 96%;"> <div style="text-align: right;margin: 20px 0 10px 0;width: 96%;" v-if="title != '新建架构视图'">
<el-button type="primary" size="mini" @click="openDicyDialog">新增</el-button> <el-button type="primary" size="mini" @click="openDicyDialog">新增</el-button>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item" v-if="title != '新建架构视图'">
<el-table height="300" :data="tableData3" stripe border> <el-table height="300" :data="tableData3" stripe border>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column> <el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="fieldName" label="字段名" align="center"></el-table-column> <el-table-column prop="fieldName" label="字段名" align="center"></el-table-column>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!