Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 3b3052df by liuyong
Options

修改bug

1 parent 7c99d083
Inline Side-by-side
Showing with 26 additions and 11 deletions
src/api/index.js
...@@ -393,7 +393,7 @@ export function queryZiChanJiaGouShangJiJieDian(params) { ...@@ -393,7 +393,7 @@ export function queryZiChanJiaGouShangJiJieDian(params) {
} }
// 资产架构，组件类型 // 资产架构，组件类型
export function queryZiChanJiaGouZuJianLeiXing(params) { export function queryZiChanJiaGouZuJianLeiXing(params) {
return post('/network/ma-ml-dicy/archiDicyList', params); return post('/network/ele/archi-ele-list', params);
} }
// 资产架构，组件类型选择后查询表单 // 资产架构，组件类型选择后查询表单
export function queryZuJianLeiXingBelongForm(params) { export function queryZuJianLeiXingBelongForm(params) {
......
src/views/archi-intelligence-search/index.vue
...@@ -122,9 +122,10 @@ export default { ...@@ -122,9 +122,10 @@ export default {
}); });
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: item.assetId, id: item2.assetId,
symbol: item.icon, symbol: item.icon,
draggable: true, draggable: true,
// itemStyle: { // itemStyle: {
...@@ -138,13 +139,19 @@ export default { ...@@ -138,13 +139,19 @@ export default {
// }, // },
// } // }
}) })
linkData.push({ }
source: item.assetId,
target: item2.assetId, // linkData.push({
}) // source: item.assetId,
// target: item2.assetId,
// })
}) })
} }
}) })
console.log(seriesData);
// console.log(linkData);
this.echarts1(seriesData, linkData); this.echarts1(seriesData, linkData);
}else { }else {
this.myChart.dispose(); this.myChart.dispose();
......
src/views/busi-assets-list/index.vue
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">组件类型</span> <span class="search_title">组件类型</span>
<el-select filterable remote :remote-method="queryZuJianLeiXingSelect" v-model="searchParams.archiEleId" clearable placeholder="请选择" class="search_item"> <el-select filterable remote :remote-method="queryZuJianLeiXingSelect" v-model="searchParams.archiEleId" clearable placeholder="请选择" class="search_item">
<el-option v-for="item in zuJianLeiXingSelect" :key="item.typeId" :label="item.elementName" :value="item.typeId"></el-option> <el-option v-for="item in zuJianLeiXingSelect" :key="item.elementId" :label="item.elementName" :value="item.elementId"></el-option>
</el-select> </el-select>
</div> </div>
...@@ -71,8 +71,16 @@ ...@@ -71,8 +71,16 @@
<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="assetName" label="架构组件名称" width="300" :show-overflow-tooltip="true" align="center"></el-table-column> <el-table-column prop="assetName" label="架构组件名称" width="300" :show-overflow-tooltip="true" align="center"></el-table-column>
<el-table-column prop="eleName" label="组件类型" align="center"></el-table-column> <el-table-column prop="eleName" label="组件类型" align="center"></el-table-column>
<el-table-column prop="parentAssetName" label="上级架构组件名称" width="300" :show-overflow-tooltip="true" align="center"></el-table-column> <!-- <el-table-column prop="parentAssetName" label="上级架构组件名称" width="300" :show-overflow-tooltip="true" align="center"></el-table-column> -->
<el-table-column prop="createMan" label="创建人" align="center"></el-table-column> <el-table-column prop="createMan" label="创建人" align="center"></el-table-column>
<el-table-column prop="version" label="版本号" align="center"></el-table-column>
<el-table-column label="状态" align="center">
<template slot-scope="scope">
<span v-if="scope.row.state == 0">已停用</span>
<span v-if="scope.row.state == 1">已发布</span>
<span v-if="scope.row.state == 2">暂存</span>
</template>
</el-table-column>
<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column> <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column label="操作" width="200" align="center"> <el-table-column label="操作" width="200" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
...@@ -142,7 +150,7 @@ ...@@ -142,7 +150,7 @@
</el-form-item> </el-form-item>
<el-form-item label="组件类型:" prop="let3"> <el-form-item label="组件类型:" prop="let3">
<el-select @change="zuJianLeiXingSelectChange" filterable remote :remote-method="queryZuJianLeiXingSelect" clearable placeholder="请选择" v-model="ruleForm.let3"> <el-select @change="zuJianLeiXingSelectChange" filterable remote :remote-method="queryZuJianLeiXingSelect" clearable placeholder="请选择" v-model="ruleForm.let3">
<el-option v-for="item in zuJianLeiXingSelect" :key="item.typeId" :label="item.elementName" :value="item.typeId"></el-option> <el-option v-for="item in zuJianLeiXingSelect" :key="item.elementId" :label="item.elementName" :value="item.elementId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="dynamicFormClass" v-for="(item, index) in ruleForm.dynamicForm0_" :key="index" :label="item.assetName+':'"> <el-form-item class="dynamicFormClass" v-for="(item, index) in ruleForm.dynamicForm0_" :key="index" :label="item.assetName+':'">
...@@ -197,7 +205,7 @@ ...@@ -197,7 +205,7 @@
</el-form-item> </el-form-item>
<el-form-item label="组件类型:" prop="let2"> <el-form-item label="组件类型:" prop="let2">
<el-select v-model="ruleForm2.let2" filterable remote :remote-method="queryZuJianLeiXingSelect" clearable placeholder="请选择"> <el-select v-model="ruleForm2.let2" filterable remote :remote-method="queryZuJianLeiXingSelect" clearable placeholder="请选择">
<el-option v-for="item in zuJianLeiXingSelect" :key="item.typeId" :label="item.elementName" :value="item.typeId"></el-option> <el-option v-for="item in zuJianLeiXingSelect" :key="item.elementId" :label="item.elementName" :value="item.elementId"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
...@@ -368,7 +376,7 @@ ...@@ -368,7 +376,7 @@
// assetCode = items.parentCode; // assetCode = items.parentCode;
// } // }
const items2 = this.zuJianLeiXingSelect.find(item => item.typeId == this.ruleForm.let3); const items2 = this.zuJianLeiXingSelect.find(item => item.elementId == this.ruleForm.let3);
eleName = items2.elementName; eleName = items2.elementName;
if(this.ruleForm.dynamicForm_.length > 0) { if(this.ruleForm.dynamicForm_.length > 0) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!