Skip to content

liangzhen / framework-tools-web

Go to a project
Commit b0c7412c by liuyong
Options

修改bug

1 parent 96b3f338
Inline Side-by-side
Showing with 77 additions and 34 deletions
public/drawio/extention/js/exGraph.js
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
// console.log(item3.fieldsValue) // console.log(item3.fieldsValue)
fns.push( fns.push(
this.createVertexTemplateEntry( this.createVertexTemplateEntry(
item2.iconName + ';fillColor=' + item2.color + ';' + 'attr=' + JSON.stringify(attr_) + ';assetId=' + item3.assetId + ';archiBelongId=' + item3.archiBelongId + ';assetName=[' + item3.assetName + '];', item2.iconName + ';fillColor=' + item2.color + ';' + 'attr=' + JSON.stringify(attr_) + ';assetId=' + item3.assetId + ';archiBelongId=' + item3.archiBelongId + ';assetName=[' + item3.assetName + '];eleName=' + item2.eleName +';elementId=' + item2.elementId + ';',
item2.shapeWidth ? item2.shapeWidth : 150, item2.shapeWidth ? item2.shapeWidth : 150,
item2.shapeHeight ? item2.shapeHeight : 75, item2.shapeHeight ? item2.shapeHeight : 75,
null, null,
......
src/api/index.js
...@@ -501,7 +501,7 @@ export function archiAssetShowTree(params) { ...@@ -501,7 +501,7 @@ export function archiAssetShowTree(params) {
} }
// 总体架构资产智能搜索，左侧树 // 总体架构资产智能搜索，左侧树
export function archiIntelligenceSearchTree(params) { export function archiIntelligenceSearchTree(params) {
return post('/network/archi-asset-view/assetTreeView', params); return post('/network/archi-asset-view/assetTree', params);
} }
// 总体架构资产智能搜索，架构版本 // 总体架构资产智能搜索，架构版本
export function archiIntelligenceSearchVersionList(params) { export function archiIntelligenceSearchVersionList(params) {
......
src/views/archi-intelligence-search/index.vue
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
class="filter-tree" class="filter-tree"
:data="treeData" :data="treeData"
:highlight-current="true" :highlight-current="true"
:props="{ children: 'children', label: 'name', id: 'id' }" :props="{ children: 'children', label: 'assetName', assetId: 'id' }"
default-expand-all default-expand-all
show-checkbox show-checkbox
node-key="id" node-key="id"
......
src/views/archiAssetVisualShow/tab1.vue
...@@ -114,6 +114,9 @@ ...@@ -114,6 +114,9 @@
overflow-y: auto; overflow-y: auto;
text-align: left; text-align: left;
} }
/deep/ .el-collapse-item__content{
text-align: left;
}
.containerLeft{ .containerLeft{
width: 20%; width: 20%;
height: 100%; height: 100%;
......
src/views/archiAssetVisualShow/tab2.vue
...@@ -109,6 +109,9 @@ ...@@ -109,6 +109,9 @@
height: calc(100% - 20px); height: calc(100% - 20px);
display: flex; display: flex;
} }
/deep/ .el-collapse-item__content{
text-align: left;
}
.buttonContainer{ .buttonContainer{
height: calc(100% - 90px); height: calc(100% - 90px);
overflow-y: auto; overflow-y: auto;
......
src/views/archiAssetVisualShow/tab3.vue
...@@ -109,6 +109,9 @@ ...@@ -109,6 +109,9 @@
height: calc(100% - 20px); height: calc(100% - 20px);
display: flex; display: flex;
} }
/deep/ .el-collapse-item__content{
text-align: left;
}
.buttonContainer{ .buttonContainer{
height: calc(100% - 90px); height: calc(100% - 90px);
overflow-y: auto; overflow-y: auto;
......
src/views/archiAssetVisualShow/tab4.vue
...@@ -109,6 +109,9 @@ ...@@ -109,6 +109,9 @@
height: calc(100% - 20px); height: calc(100% - 20px);
display: flex; display: flex;
} }
/deep/ .el-collapse-item__content{
text-align: left;
}
.buttonContainer{ .buttonContainer{
height: calc(100% - 90px); height: calc(100% - 90px);
overflow-y: auto; overflow-y: auto;
......
src/views/archiAssetVisualShow/tab5.vue
...@@ -114,6 +114,9 @@ ...@@ -114,6 +114,9 @@
overflow-y: auto; overflow-y: auto;
text-align: left; text-align: left;
} }
/deep/ .el-collapse-item__content{
text-align: left;
}
.containerLeft{ .containerLeft{
width: 20%; width: 20%;
height: 100%; height: 100%;
......
src/views/busi-assets-list/index.vue
...@@ -117,25 +117,12 @@ ...@@ -117,25 +117,12 @@
<el-input placeholder="请输入内容" v-no-backslash v-model="ruleForm.let1" :disabled="is_add_edit == 'view' ? true: false" maxlength="100"></el-input> <el-input placeholder="请输入内容" v-no-backslash v-model="ruleForm.let1" :disabled="is_add_edit == 'view' ? true: false" maxlength="100"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="上级节点:" prop="let2"> <el-form-item label="组件类型:" prop="let3">
<el-select class="treeSelectClass" clearable :disabled="is_add_edit == 'view' ? true: false" placeholder="请选择" v-model="ruleForm.let2"> <el-select :disabled="is_add_edit == 'view' ? true: false" @change="zuJianLeiXingSelectChange" v-model="ruleForm.let3" filterable remote :remote-method="queryZuJianLeiXingSelect" clearable placeholder="请选择">
<!-- <el-option v-for="item in shangJiJieDianSelect" :key="item.assetId" :label="item.assetName" :value="item.assetId"></el-option> --> <el-option v-for="item in zuJianLeiXingSelect" :key="item.elementId" :label="item.elementName" :value="item.elementId"></el-option>
<el-option :value="selectValue" :label="selectLabel">
<el-tree
ref="treeSelect"
node-key="assetId"
show-checkbox
:check-strictly="true"
lazy
@check="handleCheckChange"
:data="treeSelectData"
:props="{ children: 'children', label: 'assetName', id: 'assetId' }"
:load="loadTreeSelect">
</el-tree>
</el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<!-- <el-form-item label="关联资产:" prop="let6"> <!-- <el-form-item label="关联资产:" prop="let6">
<el-select clearable @change="guanLianZiChanChange" filterable remote :remote-method="queryGuanLianZiChan" placeholder="请选择" multiple v-model="ruleForm.let6"> <el-select clearable @change="guanLianZiChanChange" filterable remote :remote-method="queryGuanLianZiChan" placeholder="请选择" multiple v-model="ruleForm.let6">
<el-option v-for="item in guanLianZiChanSelect" :key="String(item.assetId)" :label="item.assetName" :value="item.assetId"></el-option> <el-option v-for="item in guanLianZiChanSelect" :key="String(item.assetId)" :label="item.assetName" :value="item.assetId"></el-option>
...@@ -150,9 +137,23 @@ ...@@ -150,9 +137,23 @@
<el-radio label="隐藏"></el-radio> <el-radio label="隐藏"></el-radio>
</el-radio-group> </el-radio-group>
</el-form-item> </el-form-item>
<el-form-item label="组件类型:" prop="let3"> <el-form-item label="上级节点:" prop="let2">
<el-select :disabled="is_add_edit == 'view' ? true: false" @change="zuJianLeiXingSelectChange" filterable remote :remote-method="queryZuJianLeiXingSelect" clearable placeholder="请选择" v-model="ruleForm.let3"> <el-select class="treeSelectClass" clearable :disabled="is_add_edit == 'view' ? true: disabled1" placeholder="请选择" v-model="ruleForm.let2">
<el-option v-for="item in zuJianLeiXingSelect" :key="item.elementId" :label="item.elementName" :value="item.elementId"></el-option> <!-- <el-option v-for="item in shangJiJieDianSelect" :key="item.assetId" :label="item.assetName" :value="item.assetId"></el-option> -->
<el-option :value="selectValue" :label="selectLabel">
<el-tree
ref="treeSelect"
node-key="assetId"
show-checkbox
:check-strictly="true"
lazy
@check="handleCheckChange"
:data="treeSelectData"
:props="{ children: 'children', label: 'assetName', id: 'assetId' }"
:load="loadTreeSelect">
</el-tree>
</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+':'">
...@@ -319,6 +320,7 @@ ...@@ -319,6 +320,7 @@
archiType: null, archiType: null,
// archiAssetTypeId: null, // archiAssetTypeId: null,
treeSelectData: [], treeSelectData: [],
disabled1: false,
}; };
}, },
mounted(){ mounted(){
...@@ -531,8 +533,11 @@ ...@@ -531,8 +533,11 @@
addItem() {//新建 addItem() {//新建
this.addDialog = true; this.addDialog = true;
this.is_add_edit = 'add'; this.is_add_edit = 'add';
this.disabled1 = false;
// this.getShangJiJieDianSelect(); // this.getShangJiJieDianSelect();
this.getZuJianLeiXingSelect(null); this.getZuJianLeiXingSelect(null).then(res => {
this.zuJianLeiXingSelect = res;
});
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.form.resetFields(); this.$refs.form.resetFields();
this.ruleForm.let1 = null; this.ruleForm.let1 = null;
...@@ -550,7 +555,9 @@ ...@@ -550,7 +555,9 @@
}); });
}, },
viewItem(row) {//查看架构 viewItem(row) {//查看架构
this.getZuJianLeiXingSelect(null); this.getZuJianLeiXingSelect(null).then(res => {
this.zuJianLeiXingSelect = res;
});
this.addDialog = true; this.addDialog = true;
this.is_add_edit = 'view'; this.is_add_edit = 'view';
this.ruleForm.let1 = row.assetName; this.ruleForm.let1 = row.assetName;
...@@ -595,12 +602,12 @@ ...@@ -595,12 +602,12 @@
} }
}, },
editItem(row){//编辑 editItem(row){//编辑
this.getZuJianLeiXingSelect(null);
this.addDialog = true; this.addDialog = true;
this.is_add_edit = 'edit'; this.is_add_edit = 'edit';
this.ruleForm.let1 = row.assetName; this.ruleForm.let1 = row.assetName;
this.ruleForm.let2 = row.parentAssetName; this.ruleForm.let2 = row.parentAssetName;
this.ruleForm.let3 = row.archiEleId; this.ruleForm.let3 = row.archiEleId;
this.ruleForm.let4 = row.sort; this.ruleForm.let4 = row.sort;
this.ruleForm.let5 = row.isShow == 0 ? '显示' : '隐藏'; this.ruleForm.let5 = row.isShow == 0 ? '显示' : '隐藏';
this.editRow = row; this.editRow = row;
...@@ -609,8 +616,18 @@ ...@@ -609,8 +616,18 @@
this.selectCode = row.assetCode; this.selectCode = row.assetCode;
this.selectLabel = row.parentAssetName; this.selectLabel = row.parentAssetName;
this.selectValue = row.parentAssetId; this.selectValue = row.parentAssetId;
let targetAsset_id = [];
this.getZuJianLeiXingSelect(null).then(res => {
this.zuJianLeiXingSelect = res;
const currentItem = this.zuJianLeiXingSelect.find(item => item.elementId == this.ruleForm.let3);
if(currentItem.eaLevel == 1) {
this.disabled1 = true;
}else {
this.disabled1 = false;
}
});
let targetAsset_id = [];
if(targetAsset) { if(targetAsset) {
if(targetAsset.length == 4) { if(targetAsset.length == 4) {
this.ruleForm.dynamicForm0_ = []; this.ruleForm.dynamicForm0_ = [];
...@@ -705,6 +722,14 @@ ...@@ -705,6 +722,14 @@
}) })
}, },
zuJianLeiXingSelectChange(data) {//组件类型选择后 zuJianLeiXingSelectChange(data) {//组件类型选择后
// console.log(data)
// console.log(this.zuJianLeiXingSelect)
const currentItem = this.zuJianLeiXingSelect.find(item => item.elementId == data);
if(currentItem.eaLevel == 1) {
this.disabled1 = true;
}else {
this.disabled1 = false;
}
if(data) { if(data) {
const params = { const params = {
type: '1', type: '1',
...@@ -721,7 +746,6 @@ ...@@ -721,7 +746,6 @@
} }
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_ = [];
...@@ -735,10 +759,14 @@ ...@@ -735,10 +759,14 @@
queryZuJianLeiXingSelect(data) {//组件类型搜索 queryZuJianLeiXingSelect(data) {//组件类型搜索
if (data !== '') { if (data !== '') {
setTimeout(() => { setTimeout(() => {
this.getZuJianLeiXingSelect(data); this.getZuJianLeiXingSelect(data).then(res => {
this.zuJianLeiXingSelect = res;
});
}, 200); }, 200);
}else { }else {
this.getZuJianLeiXingSelect(null); this.getZuJianLeiXingSelect(null).then(res => {
this.zuJianLeiXingSelect = res;
});
} }
}, },
getZuJianLeiXingSelect(elementName) {//组件类型下拉框值 getZuJianLeiXingSelect(elementName) {//组件类型下拉框值
...@@ -748,19 +776,19 @@ ...@@ -748,19 +776,19 @@
elementName: elementName, elementName: elementName,
archiBelongId: this.archiBelongId archiBelongId: this.archiBelongId
}; };
return new Promise((resolve, reject) => {
queryZiChanJiaGouZuJianLeiXing(params).then(res => { queryZiChanJiaGouZuJianLeiXing(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
console.log('组件类型') resolve(res.data);
console.log(res.data)
this.zuJianLeiXingSelect = res.data;
}else { }else {
Message({ Message({
type: 'error', type: 'error',
message: res.msg message: res.msg
}); });
reject(res.msg);
} }
}) })
})
}, },
moreDelete() {//批量删除 moreDelete() {//批量删除
if(this.selectTable.length == 0) { if(this.selectTable.length == 0) {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!