Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 2b53d285 by liuyong
Options

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

2 parents 30523c49 1e25344c
Expand all
Inline Side-by-side
Showing with 66 additions and 19 deletions
src/views/archiViewConfig/index.vue
...@@ -358,6 +358,8 @@ export default { ...@@ -358,6 +358,8 @@ export default {
}else if (type == "edit") { }else if (type == "edit") {
this.add_dialog = true; this.add_dialog = true;
this.title = "编辑架构视图"; this.title = "编辑架构视图";
this.resetForm();
this.formData = item; this.formData = item;
if (item.eleName) { if (item.eleName) {
this.selectData1 = item.eleName.split(","); this.selectData1 = item.eleName.split(",");
...@@ -479,6 +481,7 @@ export default { ...@@ -479,6 +481,7 @@ export default {
this.getList(); this.getList();
} }
}); });
}).catch(() => {
}); });
}else if (type == "pushAll") { }else if (type == "pushAll") {
if (this.selectList.length <= 0) { if (this.selectList.length <= 0) {
...@@ -512,8 +515,11 @@ export default { ...@@ -512,8 +515,11 @@ export default {
archiEleRelId: "", archiEleRelId: "",
relName: "", relName: "",
} }
this.$nextTick(() => {
this.$refs.multipleTable1.clearSelection(); this.$refs.multipleTable1.clearSelection();
this.$refs.multipleTable2.clearSelection(); this.$refs.multipleTable2.clearSelection();
});
this.selectData1 = []; this.selectData1 = [];
this.selectData2 = []; this.selectData2 = [];
this.selectData3 = []; this.selectData3 = [];
......
src/views/metaModelDic/pages/page1.vue
...@@ -10,7 +10,7 @@ ...@@ -10,7 +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.archIBelongId" placeholder="请选择" clearable class="search_item"> <el-select v-model="params.archIBelongId" placeholder="请选择" clearable class="search_item">
<el-option v-for="item in search_select1" :key="item.belongId" :label="item.name" :value="item.belongId"></el-option> <el-option v-for="item in search_select2" :key="item.belongId" :label="item.name" :value="item.belongId"></el-option>
</el-select> </el-select>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
...@@ -36,8 +36,18 @@ ...@@ -36,8 +36,18 @@
<el-table :data="tableData" stripe border height="450"> <el-table :data="tableData" stripe border height="450">
<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="elementName" label="元素名称" align="center"></el-table-column> <el-table-column prop="elementName" label="元素名称" align="center"></el-table-column>
<el-table-column prop="archiLevelName" label="架构层次" align="center"></el-table-column> <el-table-column prop="archiLevelId" label="架构层次" width="150" align="center">
<el-table-column prop="archiBelongName" label="架构归属" align="center"></el-table-column> <template slot-scope="scope">
<span >{{dicObj.schemaLevel[scope.row.archiLevelId]}}</span>
</template>
</el-table-column>
<el-table-column prop="archiBelongId" label="架构归属" width="150" align="center">
<template slot-scope="scope">
<span >{{dicObj.schemaBelong[scope.row.archiBelongId]}}</span>
</template>
</el-table-column>
<!-- <el-table-column prop="archiLevelName" label="架构层次" align="center"></el-table-column>
<el-table-column prop="archiBelongName" label="架构归属" align="center"></el-table-column> -->
<el-table-column prop="content" label="描述" align="center"></el-table-column> <el-table-column prop="content" label="描述" align="center"></el-table-column>
<el-table-column label="图标" align="center"> <el-table-column label="图标" align="center">
<template> <template>
...@@ -87,8 +97,8 @@ ...@@ -87,8 +97,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.archIBelongId" placeholder="" :disabled="true" class="search_item"> <el-select v-model="formData.archiBelongId" placeholder="" :disabled="true" 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_select2" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
</el-select> </el-select>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
...@@ -211,6 +221,7 @@ import { ...@@ -211,6 +221,7 @@ import {
getYMXZDGLDel, getYMXZDGLDel,
getYMXZDGLUpdate, getYMXZDGLUpdate,
query_jia_gou_gui_shu, query_jia_gou_gui_shu,
query_jia_gou_ceng_ci,
getYMXZDGLProyList, getYMXZDGLProyList,
getYMXZDGLProyDel, getYMXZDGLProyDel,
getYMXZDGLProyAdd, getYMXZDGLProyAdd,
...@@ -271,6 +282,19 @@ export default { ...@@ -271,6 +282,19 @@ export default {
1: "已发布", 1: "已发布",
2: "暂存", 2: "暂存",
}, },
schemaLevel: {
0: "策略层",
1: "管理层",
2: "设计层",
3: "实施层",
},
schemaBelong: {
3: "业务架构",
4: "应用架构",
5: "数据架构",
6: "技术架构",
7: "安全架构",
},
controlType: { controlType: {
0: "单行文本框", 0: "单行文本框",
1: "多行文本框", 1: "多行文本框",
...@@ -292,6 +316,7 @@ export default { ...@@ -292,6 +316,7 @@ export default {
}, },
], ],
search_select1: [], search_select1: [],
search_select2: [],
selectTypeList: [ selectTypeList: [
{ {
label: "单行文本框", label: "单行文本框",
...@@ -313,9 +338,13 @@ export default { ...@@ -313,9 +338,13 @@ export default {
mounted() { mounted() {
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
this.get_dialog_select2().then(res => { this.get_dialog_select1().then(res => {
this.search_select1 = res; this.search_select1 = res;
}); });
this.get_dialog_select2().then(res => {
this.search_select2 = res;
console.log(this.search_select2);
});
}, },
created() { created() {
...@@ -359,6 +388,7 @@ export default { ...@@ -359,6 +388,7 @@ export default {
this.add_dialog = true; this.add_dialog = true;
this.title = "编辑字典"; this.title = "编辑字典";
this.formData = item; this.formData = item;
console.log(this.formData);
this.getProyList(item); this.getProyList(item);
}else if (type == "create") { }else if (type == "create") {
this.formData.state = 2; this.formData.state = 2;
...@@ -449,6 +479,18 @@ export default { ...@@ -449,6 +479,18 @@ export default {
return false //不可勾选 return false //不可勾选
} }
}, },
get_dialog_select1() {//查询架构层次下拉框值
return new Promise((resolve, reject) => {
query_jia_gou_ceng_ci({}).then(res => {
if(res.code == 200) {
resolve(res.data);
}else{
reject(res.msg);
}
});
});
},
get_dialog_select2() {//查询架构归属下拉框值 get_dialog_select2() {//查询架构归属下拉框值
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
query_jia_gou_gui_shu({}).then(res => { query_jia_gou_gui_shu({}).then(res => {
......
src/views/metaModelDic/pages/page2.vue
...@@ -39,23 +39,22 @@ ...@@ -39,23 +39,22 @@
</div> </div>
<el-table :data="tableData" stripe border height="450"> <el-table :data="tableData" stripe border height="450">
<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="rsName" label="元素关系名称" width="180" align="center"></el-table-column> <el-table-column prop="rsName" label="元素关系名称" align="center"></el-table-column>
<el-table-column prop="object1" label="对象1" width="180" align="center"></el-table-column> <el-table-column prop="content" label="关系描述" align="center"></el-table-column>
<el-table-column prop="object2" label="对象2" width="180" align="center"></el-table-column> <el-table-column label="图标" align="center" width="100">
<el-table-column prop="scope" label="适用范围" width="180" align="center"></el-table-column> <template slot-scope="scope">
<el-table-column prop="content" label="关系描述" width="180" align="center"></el-table-column> <div class="tableIcon">
<el-table-column label="图标" align="center"> <img class="iconItem" :src="scope.row.icon" alt="">
<template> </div>
<el-button type="text" style="color: #0D867F;">预览</el-button>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="version" label="版本" width="180" align="center"></el-table-column> <el-table-column prop="version" label="版本" width="250" align="center"></el-table-column>
<el-table-column prop="state" label="状态" align="center"> <el-table-column prop="state" label="状态" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span >{{dicObj.state[scope.row.state]}}</span> <span >{{dicObj.state[scope.row.state]}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" width="360" align="center"> <el-table-column label="操作" width="400" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;"> <div style="display: flex;align-items: center;justify-content: center;">
<el-button icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)" :disabled="scope.row.state == 1">编辑</el-button> <el-button icon="el-icon-edit" size="mini" @click="operate('edit',scope.row)" :disabled="scope.row.state == 1">编辑</el-button>
......
src/views/metaModelDic/pages/page3.vue
...@@ -49,8 +49,8 @@ ...@@ -49,8 +49,8 @@
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="content" label="视图描述" width="150" align="center"></el-table-column> <el-table-column prop="content" label="视图描述" width="150" align="center"></el-table-column>
<el-table-column prop="let6" label="元素范围" width="150" align="center"></el-table-column> <el-table-column prop="eleName" label="元素范围" width="150" align="center"></el-table-column>
<el-table-column prop="let7" label="包含元素" width="150" align="center"></el-table-column> <el-table-column prop="relName" label="包含元素" width="150" align="center"></el-table-column>
<el-table-column prop="version" label="版本" width="150" align="center"></el-table-column> <el-table-column prop="version" label="版本" width="150" align="center"></el-table-column>
<el-table-column prop="state" label="状态" align="center"> <el-table-column prop="state" label="状态" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!