Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 035d54aa by liuyong
Options

Merge branch 'master' of http://47.97.176.204:19000/wangwansu/iact_jiagou_drowio

2 parents 1eb2e207 5109c0cd
Inline Side-by-side
Showing with 59 additions and 52 deletions
src/views/archiEleRela/index.vue
...@@ -10,17 +10,8 @@ ...@@ -10,17 +10,8 @@
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">适用范围</span> <span class="search_title">适用范围</span>
<el-select v-model="params.scope" placeholder="请选择" clearable class="search_item"> <el-select v-model="params.scope" placeholder="请选择" clearable class="search_item">
<el-option label="架构之间" value="0"></el-option>
<el-option label="系统架构" value="1"></el-option>
<el-option label="业务架构" value="2"></el-option>
<el-option label="应用架构" value="3"></el-option>
<el-option label="数据架构" value="4"></el-option>
<el-option label="技术架构" value="5"></el-option>
<el-option label="安全架构" value="6"></el-option>
</el-select>
<!-- <el-select v-model="params.scope" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in search_select1" :key="idnex" :label="item.name" :value="item.belongId" ></el-option> <el-option v-for="(item,idnex) in search_select1" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
</el-select> --> </el-select>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">状态</span> <span class="search_title">状态</span>
...@@ -132,7 +123,7 @@ ...@@ -132,7 +123,7 @@
</div> </div>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>约束条件</div> <div class="dialog_form_item_title">约束条件</div>
<div class="formArea"> <div class="formArea">
<div class="formLine" v-for="(item,index) in formData.arrList" :key="index"> <div class="formLine" v-for="(item,index) in formData.arrList" :key="index">
情况{{index+1}} 情况{{index+1}}
...@@ -151,7 +142,7 @@ ...@@ -151,7 +142,7 @@
<div class="formItem"> <div class="formItem">
<div class="label">适用范围</div> <div class="label">适用范围</div>
<el-select v-model="item.scope" placeholder="请选择" :disabled="true"> <el-select v-model="item.scope" placeholder="请选择" :disabled="true">
<el-option v-for="(item,idnex) in guishuList" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in search_select1" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
</el-select> </el-select>
</div> </div>
<div class="newBtn"> <div class="newBtn">
...@@ -268,12 +259,6 @@ export default { ...@@ -268,12 +259,6 @@ export default {
2: "暂存", 2: "暂存",
}, },
scope: { scope: {
0: "架构之间",
1: "业务架构",
2: "应用架构",
3: "数据架构",
4: "技术架构",
5: "安全架构",
}, },
eleLtId: { eleLtId: {
...@@ -325,19 +310,27 @@ export default { ...@@ -325,19 +310,27 @@ export default {
], ],
eleList: [], eleList: [],
radioName: "", radioName: "",
search_select1: [], search_select1: [
{
name: "架构之间",
belongId: 0,
}
],
}; };
}, },
mounted() { mounted() {
// 适用范围下拉
this.get_dialog_select2().then(res => {
this.search_select1 = this.search_select1.concat(res);
this.search_select1.forEach(item=>{
this.dicObj.scope[item.belongId] = item.name;
})
});
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
// 获取元素列表 // 获取元素列表
this.getYuansuList(); this.getYuansuList();
this.get_dialog_select2().then(res => {
this.search_select1 = res;
});
}, },
created() { created() {
}, },
...@@ -424,7 +417,7 @@ export default { ...@@ -424,7 +417,7 @@ export default {
this.$message.error("请选择图标"); this.$message.error("请选择图标");
return; return;
} }
// if (this.formData.arrList.length <= 0) { // if (this.formData.arrList[0].scope === "") {
// this.$message.error("请选择至少一种约束条件"); // this.$message.error("请选择至少一种约束条件");
// return; // return;
// } // }
...@@ -649,19 +642,20 @@ export default { ...@@ -649,19 +642,20 @@ export default {
} }
this.search_select1.forEach(itemX => { this.search_select1.forEach(itemX => {
if (lastStr == itemX.belongId) { if (lastStr == itemX.belongId) {
if (itemX.name == "系统架构") { this.formData.arrList[index].scope = itemX.belongId;
this.formData.arrList[index].scope = 1; // if (itemX.name == "系统架构") {
}else if (itemX.name == "业务架构") { // this.formData.arrList[index].scope = 1;
this.formData.arrList[index].scope = 2; // }else if (itemX.name == "业务架构") {
}else if (itemX.name == "应用架构") { // this.formData.arrList[index].scope = 2;
this.formData.arrList[index].scope = 3; // }else if (itemX.name == "应用架构") {
}else if (itemX.name == "数据架构") { // this.formData.arrList[index].scope = 3;
this.formData.arrList[index].scope = 4; // }else if (itemX.name == "数据架构") {
}else if (itemX.name == "技术架构") { // this.formData.arrList[index].scope = 4;
this.formData.arrList[index].scope = 5; // }else if (itemX.name == "技术架构") {
}else if (itemX.name == "安全架构") { // this.formData.arrList[index].scope = 5;
this.formData.arrList[index].scope = 6; // }else if (itemX.name == "安全架构") {
} // this.formData.arrList[index].scope = 6;
// }
} }
}) })
} }
......
src/views/metaModelDic/pages/page2.vue
...@@ -10,13 +10,7 @@ ...@@ -10,13 +10,7 @@
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">适用范围</span> <span class="search_title">适用范围</span>
<el-select v-model="params.scope" placeholder="请选择" clearable class="search_item"> <el-select v-model="params.scope" placeholder="请选择" clearable class="search_item">
<el-option label="架构之间" value="0"></el-option> <el-option v-for="(item,idnex) in search_select1" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
<el-option label="系统架构" value="1"></el-option>
<el-option label="业务架构" value="2"></el-option>
<el-option label="应用架构" value="3"></el-option>
<el-option label="数据架构" value="4"></el-option>
<el-option label="技术架构" value="5"></el-option>
<el-option label="安全架构" value="6"></el-option>
</el-select> </el-select>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
...@@ -93,14 +87,8 @@ ...@@ -93,14 +87,8 @@
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">适用范围</div> <div class="dialog_form_item_title">适用范围</div>
<el-select v-model="formData.scope" placeholder="" :disabled="true" class="search_item"> <el-select v-model="formData.scope" placeholder="请选择" :disabled="true" class="search_item">
<el-option label="架构之间" value="0"></el-option> <el-option v-for="(item,idnex) in search_select1" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
<el-option label="系统架构" value="1"></el-option>
<el-option label="业务架构" value="2"></el-option>
<el-option label="应用架构" value="3"></el-option>
<el-option label="数据架构" value="4"></el-option>
<el-option label="技术架构" value="5"></el-option>
<el-option label="安全架构" value="6"></el-option>
</el-select> </el-select>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
...@@ -219,6 +207,7 @@ import { ...@@ -219,6 +207,7 @@ import {
getYMXZDGLProyDel, getYMXZDGLProyDel,
getYMXZDGLProyAdd, getYMXZDGLProyAdd,
getYMXZDGLProyUpdate, getYMXZDGLProyUpdate,
query_jia_gou_gui_shu,
} from "@/api/index.js"; } from "@/api/index.js";
export default { export default {
...@@ -336,15 +325,38 @@ export default { ...@@ -336,15 +325,38 @@ export default {
], ],
columnIsShow: false, columnIsShow: false,
editIndex: -1, // 当前编辑行 editIndex: -1, // 当前编辑行
search_select1: [
{
name: "架构之间",
belongId: 0,
}
],
}; };
}, },
mounted() { mounted() {
// 适用范围下拉
this.get_dialog_select2().then(res => {
this.search_select1 = this.search_select1.concat(res);
});
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
}, },
created() { created() {
}, },
methods: { methods: {
// 查询架构归属下拉框值
get_dialog_select2() {
return new Promise((resolve, reject) => {
query_jia_gou_gui_shu({}).then(res => {
if(res.code == 200) {
resolve(res.data);
}else {
reject(res.msg);
}
});
})
},
// 查询列表 // 查询列表
getList() { getList() {
getYMXZDGLlist(this.params).then(res => { getYMXZDGLlist(this.params).then(res => {
...@@ -386,6 +398,7 @@ export default { ...@@ -386,6 +398,7 @@ export default {
this.add_dialog = true; this.add_dialog = true;
this.title = "编辑字典"; this.title = "编辑字典";
this.formData = item; this.formData = item;
this.formData.scope = Number(this.formData.scope);
this.getProyList(item); this.getProyList(item);
}else if (type == "create") { }else if (type == "create") {
this.formData.state = 2; this.formData.state = 2;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!