Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 77e28311 by liuyong
Options

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

2 parents 77d063d1 579aa6a4
Inline Side-by-side
Showing with 118 additions and 167 deletions
src/views/archiEleRela/index.vue
...@@ -11,11 +11,12 @@ ...@@ -11,11 +11,12 @@
<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="0"></el-option>
<el-option label="业务架构" value="1"></el-option> <el-option label="系统架构" value="1"></el-option>
<el-option label="应用架构" value="2"></el-option> <el-option label="业务架构" value="2"></el-option>
<el-option label="数据架构" value="3"></el-option> <el-option label="应用架构" value="3"></el-option>
<el-option label="技术架构" value="4"></el-option> <el-option label="数据架构" value="4"></el-option>
<el-option label="安全架构" value="5"></el-option> <el-option label="技术架构" value="5"></el-option>
<el-option label="安全架构" value="6"></el-option>
</el-select> </el-select>
<!-- <el-select v-model="params.scope" placeholder="请选择" clearable class="search_item"> <!-- <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>
...@@ -298,25 +299,29 @@ export default { ...@@ -298,25 +299,29 @@ export default {
value: 0, value: 0,
}, },
{ {
label: "业务架构", label: "系统架构",
value: 1, value: 1,
}, },
{ {
label: "应用架构", label: "业务架构",
value: 2, value: 2,
}, },
{ {
label: "数据架构", label: "应用架构",
value: 3, value: 3,
}, },
{ {
label: "技术架构", label: "数据架构",
value: 4, value: 4,
}, },
{ {
label: "安全架构", label: "技术架构",
value: 5, value: 5,
}, },
{
label: "安全架构",
value: 6,
},
], ],
eleList: [], eleList: [],
radioName: "", radioName: "",
...@@ -332,7 +337,6 @@ export default { ...@@ -332,7 +337,6 @@ export default {
this.get_dialog_select2().then(res => { this.get_dialog_select2().then(res => {
this.search_select1 = res; this.search_select1 = res;
console.log(this.search_select1);
}); });
}, },
created() { created() {
...@@ -355,7 +359,6 @@ export default { ...@@ -355,7 +359,6 @@ export default {
getEleList().then(res => { getEleList().then(res => {
if (res.code == 200) { if (res.code == 200) {
this.eleList = res.data; this.eleList = res.data;
console.log(this.eleList);
this.eleList.forEach(item=>{ this.eleList.forEach(item=>{
this.dicObj.eleLtId[item.elementId] = item.elementName; this.dicObj.eleLtId[item.elementId] = item.elementName;
}) })
...@@ -646,16 +649,18 @@ export default { ...@@ -646,16 +649,18 @@ export default {
} }
this.search_select1.forEach(itemX => { this.search_select1.forEach(itemX => {
if (lastStr == itemX.belongId) { if (lastStr == itemX.belongId) {
if (itemX.name == "业务架构") { if (itemX.name == "系统架构") {
this.formData.arrList[index].scope = 1; this.formData.arrList[index].scope = 1;
}else if (itemX.name == "应用架构") { }else if (itemX.name == "业务架构") {
this.formData.arrList[index].scope = 2; this.formData.arrList[index].scope = 2;
}else if (itemX.name == "数据架构") { }else if (itemX.name == "应用架构") {
this.formData.arrList[index].scope = 3; this.formData.arrList[index].scope = 3;
}else if (itemX.name == "技术架构") { }else if (itemX.name == "数据架构") {
this.formData.arrList[index].scope = 4; this.formData.arrList[index].scope = 4;
}else if (itemX.name == "安全架构") { }else if (itemX.name == "技术架构") {
this.formData.arrList[index].scope = 5; this.formData.arrList[index].scope = 5;
}else if (itemX.name == "安全架构") {
this.formData.arrList[index].scope = 6;
} }
} }
}) })
......
src/views/archiViewConfig/index.vue
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
<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.archiLevelId" placeholder="请选择" clearable class="search_item"> <el-select v-model="params.archiLevelId" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.name" :value="item.levelId" ></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>
<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,idnex) in belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
...@@ -101,12 +101,12 @@ ...@@ -101,12 +101,12 @@
</el-form-item> </el-form-item>
<el-form-item class="cross" label="架构层次:" prop="archiLevelId"> <el-form-item class="cross" label="架构层次:" prop="archiLevelId">
<el-select v-model="formData.archiLevelId" placeholder="请选择" clearable> <el-select v-model="formData.archiLevelId" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.name" :value="item.levelId" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="cross" label="架构层次:" prop="archiBelongId"> <el-form-item class="cross" label="架构归属:" prop="archiBelongId">
<el-select v-model="formData.archiBelongId" placeholder="请选择" clearable> <el-select v-model="formData.archiBelongId" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item class="cross1" label="视图描述:" prop="content"> <el-form-item class="cross1" label="视图描述:" prop="content">
...@@ -151,6 +151,8 @@ import { ...@@ -151,6 +151,8 @@ import {
getViewNameList, getViewNameList,
getEleList, getEleList,
gtEleRelList, gtEleRelList,
query_jia_gou_gui_shu,
query_jia_gou_ceng_ci,
} from "@/api/index.js"; } from "@/api/index.js";
export default { export default {
...@@ -214,17 +216,8 @@ export default { ...@@ -214,17 +216,8 @@ export default {
2: "暂存", 2: "暂存",
}, },
archiLevelId: { archiLevelId: {
0: "策略层",
1: "管理层",
2: "设计层",
3: "实施层",
}, },
archiBelongId: { archiBelongId: {
0: "业务架构",
1: "应用架构",
2: "数据架构",
3: "技术架构",
4: "安全架构",
}, },
}, },
stateList: [ stateList: [
...@@ -242,44 +235,8 @@ export default { ...@@ -242,44 +235,8 @@ export default {
}, },
], ],
levelList: [ levelList: [
{
label: "策略层",
value: 0,
},
{
label: "管理层",
value: 1,
},
{
label: "设计层",
value: 2,
},
{
label: "实施层",
value: 3,
},
], ],
belongList: [ belongList: [
{
label: "业务架构",
value: 0,
},
{
label: "应用架构",
value: 1,
},
{
label: "数据架构",
value: 2,
},
{
label: "技术架构",
value: 3,
},
{
label: "安全架构",
value: 4,
},
], ],
viewNameList: [], viewNameList: [],
...@@ -292,16 +249,44 @@ export default { ...@@ -292,16 +249,44 @@ export default {
mounted() { mounted() {
}, },
created() { created() {
// 获取下拉
this.getLevelList();
this.getBelongList();
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
// 查询视图下拉 // 查询视图下拉
this.getViewNameList(); // this.getViewNameList();
// 获取元素和元素关系下拉
// 获取元素和元素关系列表
this.getEleList(); this.getEleList();
this.gtEleRelList(); this.gtEleRelList();
}, },
methods: { methods: {
// 获取下拉
getLevelList() {
query_jia_gou_ceng_ci().then(res => {
if (res.code == 200) {
this.levelList = res.data;
this.levelList.forEach(item=>{
this.dicObj.archiLevelId[item.levelId] = item.name;
})
}
});
},
getBelongList() {
query_jia_gou_gui_shu().then(res => {
if (res.code == 200) {
this.belongList = res.data;
this.belongList.forEach(item=>{
this.dicObj.archiBelongId[item.belongId] = item.name;
})
}
});
},
// 查询列表 // 查询列表
getList() { getList() {
getJGSTPZlist(this.params).then(res => { getJGSTPZlist(this.params).then(res => {
...@@ -312,15 +297,15 @@ export default { ...@@ -312,15 +297,15 @@ export default {
}); });
}, },
// 获取下拉 // 获取下拉
getViewNameList() { // getViewNameList() {
getViewNameList().then(res => { // getViewNameList().then(res => {
if (res.code == 200) { // if (res.code == 200) {
let arr = JSON.parse(res.msg); // let arr = JSON.parse(res.msg);
let viewStr = arr && arr[0] ? arr[0].viewName:''; // let viewStr = arr && arr[0] ? arr[0].viewName:'';
this.viewNameList = viewStr.split(","); // this.viewNameList = viewStr.split(",");
} // }
}); // });
}, // },
getEleList() { getEleList() {
getEleList().then(res => { getEleList().then(res => {
if (res.code == 200) { if (res.code == 200) {
......
src/views/metaModelDic/pages/page2.vue
...@@ -10,11 +10,13 @@ ...@@ -10,11 +10,13 @@
<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="业务架构"></el-option> <el-option label="架构之间" value="0"></el-option>
<el-option label="应用架构" value="应用架构"></el-option> <el-option label="系统架构" value="1"></el-option>
<el-option label="内容架构" value="内容架构"></el-option> <el-option label="业务架构" value="2"></el-option>
<el-option label="技术架构" value="技术架构"></el-option> <el-option label="应用架构" value="3"></el-option>
<el-option label="安全架构" value="安全架构"></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">
...@@ -92,11 +94,13 @@ ...@@ -92,11 +94,13 @@
<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="业务架构"></el-option> <el-option label="架构之间" value="0"></el-option>
<el-option label="应用架构" value="应用架构"></el-option> <el-option label="系统架构" value="1"></el-option>
<el-option label="内容架构" value="内容架构"></el-option> <el-option label="业务架构" value="2"></el-option>
<el-option label="技术架构" value="技术架构"></el-option> <el-option label="应用架构" value="3"></el-option>
<el-option label="安全架构" value="安全架构"></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">
......
src/views/metaModelDic/pages/page3.vue
...@@ -10,13 +10,13 @@ ...@@ -10,13 +10,13 @@
<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.archiLevelId" placeholder="请选择" clearable class="search_item"> <el-select v-model="params.archiLevelId" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.name" :value="item.levelId" ></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>
<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,idnex) in belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
...@@ -88,61 +88,35 @@ ...@@ -88,61 +88,35 @@
<div class="dialog_content_1"> <div class="dialog_content_1">
<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="params.viewName" placeholder="" :disabled="true" class="search_item"> <el-input v-model="formData.viewName" placeholder="请输入内容" :disabled="true" class="search_item"></el-input>
<!-- <el-select v-model="params.viewName" placeholder="" :disabled="true" class="search_item">
<el-option v-for="(item,idnex) in viewNameList" :key="idnex" :label="item" :value="item" ></el-option> <el-option v-for="(item,idnex) in viewNameList" :key="idnex" :label="item" :value="item" ></el-option>
</el-select> </el-select> -->
</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.archiLevelId" placeholder="" :disabled="true" class="search_item"> <el-select v-model="formData.archiLevelId" placeholder="" :disabled="true" class="search_item">
<el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.name" :value="item.levelId" ></el-option>
</el-select> </el-select>
</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 belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.name" :value="item.belongId" ></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
<el-table :data="tableData2" stripe border height="350" @cell-dblclick="tableDbclick"> <el-table :data="tableData2" stripe border height="350" @cell-dblclick="tableDbclick">
<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 prop="fieldName" label="字段名" align="center">
<!-- <template slot-scope="scope">
<div v-show=" !columnIsShow|| (editIndex!= scope.row.index)">{{scope.row.fieldName}}</div>
<el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.fieldName"></el-input>
</template> -->
</el-table-column> </el-table-column>
<el-table-column prop="chineseName" label="中文名" align="center"> <el-table-column prop="chineseName" label="中文名" align="center">
<!-- <template slot-scope="scope">
<div v-show=" !columnIsShow|| (editIndex!= scope.row.index)">{{scope.row.chineseName}}</div>
<el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.chineseName"></el-input>
</template> -->
</el-table-column> </el-table-column>
<el-table-column prop="displayOrder" label="排序" align="center"> <el-table-column prop="displayOrder" label="排序" align="center">
<!-- <template slot-scope="scope">
<div v-show=" !columnIsShow|| (editIndex!= scope.row.index)">{{scope.row.displayOrder}}</div>
<el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.displayOrder"></el-input>
</template> -->
</el-table-column> </el-table-column>
<el-table-column prop="contentLength" label="长度" align="center"> <el-table-column prop="contentLength" label="长度" align="center">
<!-- <template slot-scope="scope">
<div v-show=" !columnIsShow|| (editIndex!= scope.row.index)">{{scope.row.contentLength}}</div>
<el-input v-show="columnIsShow&& (editIndex== scope.row.index)" @blur="columnIsShow = false" v-model="scope.row.contentLength"></el-input>
</template> -->
</el-table-column> </el-table-column>
<el-table-column prop="controlType" label="控件" align="center"> <el-table-column prop="controlType" label="控件" align="center">
<!-- <template slot-scope="scope">
<div v-show=" !columnIsShow|| (editIndex!= scope.row.index)">{{dicObj.controlType[scope.row.controlType]}}</div>
<el-select v-show="columnIsShow&& (editIndex== scope.row.index)" v-model="scope.row.controlType">
<el-option
v-for="(item, index) in selectTypeList"
:key="index"
:label="item.label"
:value="item.value"
></el-option>
</el-select>
</template> -->
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{dicObj.controlType[scope.row.controlType]}}</span> <span>{{dicObj.controlType[scope.row.controlType]}}</span>
</template> </template>
...@@ -215,6 +189,8 @@ import { ...@@ -215,6 +189,8 @@ import {
getYMXZDGLProyDel, getYMXZDGLProyDel,
getYMXZDGLProyAdd, getYMXZDGLProyAdd,
getYMXZDGLProyUpdate, getYMXZDGLProyUpdate,
query_jia_gou_ceng_ci,
query_jia_gou_gui_shu,
} from "@/api/index.js"; } from "@/api/index.js";
export default { export default {
...@@ -291,17 +267,8 @@ export default { ...@@ -291,17 +267,8 @@ export default {
2: "暂存", 2: "暂存",
}, },
archiLevelId: { archiLevelId: {
0: "策略层",
1: "管理层",
2: "设计层",
3: "实施层",
}, },
archiBelongId: { archiBelongId: {
0: "业务架构",
1: "应用架构",
2: "数据架构",
3: "技术架构",
4: "安全架构",
}, },
controlType: { controlType: {
0: "单行文本框", 0: "单行文本框",
...@@ -324,44 +291,8 @@ export default { ...@@ -324,44 +291,8 @@ export default {
}, },
], ],
levelList: [ levelList: [
{
label: "策略层",
value: 0,
},
{
label: "管理层",
value: 1,
},
{
label: "设计层",
value: 2,
},
{
label: "实施层",
value: 3,
},
], ],
belongList: [ belongList: [
{
label: "业务架构",
value: 0,
},
{
label: "应用架构",
value: 1,
},
{
label: "数据架构",
value: 2,
},
{
label: "技术架构",
value: 3,
},
{
label: "安全架构",
value: 4,
},
], ],
viewNameList: [], viewNameList: [],
selectTypeList: [ selectTypeList: [
...@@ -384,16 +315,42 @@ export default { ...@@ -384,16 +315,42 @@ export default {
}; };
}, },
mounted() { mounted() {
// 获取下拉
this.getLevelList();
this.getBelongList();
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
// 查询视图下拉 // 查询视图下拉
this.getViewNameList(); // this.getViewNameList();
}, },
created() { created() {
}, },
methods: { methods: {
// 获取下拉
getLevelList() {
query_jia_gou_ceng_ci().then(res => {
if (res.code == 200) {
this.levelList = res.data;
this.levelList.forEach(item=>{
this.dicObj.archiLevelId[item.levelId] = item.name;
})
}
});
},
getBelongList() {
query_jia_gou_gui_shu().then(res => {
if (res.code == 200) {
this.belongList = res.data;
this.belongList.forEach(item=>{
this.dicObj.archiBelongId[item.belongId] = item.name;
})
}
});
},
// 查询列表 // 查询列表
getList() { getList() {
getYMXZDGLlist(this.params).then(res => { getYMXZDGLlist(this.params).then(res => {
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!