Skip to content

liangzhen / framework-tools-web

Go to a project
Commit b2b258cf by liuyong
Options

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

2 parents a7260922 cbdce38e
Inline Side-by-side
Showing with 175 additions and 108 deletions
src/views/archiEleRela/index.vue
...@@ -45,7 +45,7 @@ ...@@ -45,7 +45,7 @@
<p>版本发布</p> <p>版本发布</p>
</div> </div>
</div> </div>
<el-table :data="tableData" stripe border @selection-change="handleSelectionChange"> <el-table :data="tableData" stripe border @selection-change="handleSelectionChange" height="450">
<el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column> <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
<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="元素关系名称" width="180" align="center"></el-table-column>
......
src/views/archiViewConfig/index.vue
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
<p>版本发布</p> <p>版本发布</p>
</div> </div>
</div> </div>
<el-table :data="tableData" stripe border @selection-change="handleSelectionChange"> <el-table :data="tableData" stripe border @selection-change="handleSelectionChange" height="450">
<el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column> <el-table-column type="selection" width="55" :selectable="selectInit"></el-table-column>
<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="viewName" label="架构视图名称" width="150" align="center"></el-table-column> <el-table-column prop="viewName" label="架构视图名称" width="150" align="center"></el-table-column>
...@@ -95,10 +95,6 @@ ...@@ -95,10 +95,6 @@
:center="false" :center="false"
width="50%"> width="50%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<!-- <div class="dialog_form_item">
<div class="dialog_form_item_title"><span class="reqIcon">*</span>架构视图名称</div>
<el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="formData.viewName"></el-input>
</div> -->
<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"><span class="reqIcon">*</span>架构层次</div> <div class="dialog_form_item_title"><span class="reqIcon">*</span>架构层次</div>
...@@ -191,7 +187,9 @@ export default { ...@@ -191,7 +187,9 @@ export default {
let3: '', let3: '',
let4: '', let4: '',
formData: { formData: {
rsName: "", schemaLevel: "",
schemaBelong: "",
viewName: "",
content: "", content: "",
}, },
params: { params: {
......
src/views/metaModelDic/pages/page1.vue
...@@ -4,17 +4,13 @@ ...@@ -4,17 +4,13 @@
<div class="search_menu"> <div class="search_menu">
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">字典名称</span> <span class="search_title">元素名称</span>
<el-input v-model="params.rsName" placeholder="请输入内容" class="search_item"></el-input> <el-input v-model="params.elementName" placeholder="请输入内容" class="search_item"></el-input>
</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.scope" placeholder="请选择" clearable class="search_item"> <el-select v-model="params.archIBelongId" placeholder="请选择" clearable class="search_item">
<el-option label="业务架构" value="业务架构"></el-option> <el-option v-for="item in search_select1" :key="item.belongId" :label="item.name" :value="item.belongId"></el-option>
<el-option label="应用架构" value="应用架构"></el-option>
<el-option label="内容架构" value="内容架构"></el-option>
<el-option label="技术架构" value="技术架构"></el-option>
<el-option label="安全架构" value="安全架构"></el-option>
</el-select> </el-select>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
...@@ -36,24 +32,20 @@ ...@@ -36,24 +32,20 @@
</div> </div>
</div> </div>
<div class="search_btn"> <div class="search_btn">
<div class="add_btn" @click="operate('add')">
<img class="btn_icon" src="@/assets/新建icon.png" alt="" />
<p>新建</p>
</div> </div>
<div class="version_btn" @click="operate('pushAll')"> <el-table :data="tableData" stripe border height="450">
<img class="btn_icon" src="@/assets/版本发布icon.png" alt="" />
<p>版本发布</p>
</div>
</div>
<el-table :data="tableData" stripe border>
<el-table-column type="selection" width="55"></el-table-column>
<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="let1" label="字典名称" width="180" align="center"></el-table-column> <el-table-column prop="elementName" label="元素名称" align="center"></el-table-column>
<el-table-column prop="let2" label="架构层次" width="180" align="center"></el-table-column> <el-table-column prop="archiLevelName" label="架构层次" align="center"></el-table-column>
<el-table-column prop="let3" label="架构归属" width="180" align="center"></el-table-column> <el-table-column prop="archiBelongName" label="架构归属" align="center"></el-table-column>
<el-table-column prop="let4" label="描述" width="180" align="center"></el-table-column> <el-table-column prop="content" label="描述" align="center"></el-table-column>
<el-table-column prop="let5" label="字典版本号" align="center"></el-table-column> <el-table-column label="图标" align="center">
<el-table-column prop="state" label="状态" align="center"> <template>
<el-button type="text" style="color: #0D867F;">预览</el-button>
</template>
</el-table-column>
<el-table-column prop="version" label="版本" align="center"></el-table-column>
<el-table-column label="状态" 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>
...@@ -112,7 +104,7 @@ import { ...@@ -112,7 +104,7 @@ import {
getYMXZDGLAdd, getYMXZDGLAdd,
getYMXZDGLDel, getYMXZDGLDel,
getYMXZDGLUpdate, getYMXZDGLUpdate,
// getYMXZDGLUpdateBatch, query_jia_gou_gui_shu,
} from "@/api/index.js"; } from "@/api/index.js";
export default { export default {
...@@ -142,9 +134,10 @@ export default { ...@@ -142,9 +134,10 @@ export default {
params: { params: {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
rsName: "", elementName: "",
scope: "", archIBelongId: "",
state: "", state: "",
type: 1,
}, },
page: { page: {
current: 1, current: 1,
...@@ -173,12 +166,15 @@ export default { ...@@ -173,12 +166,15 @@ export default {
value: 2, value: 2,
}, },
], ],
search_select1: [],
}; };
}, },
mounted() { mounted() {
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
this.get_dialog_select2().then(res => {
this.search_select1 = res;
});
}, },
created() { created() {
...@@ -186,9 +182,6 @@ export default { ...@@ -186,9 +182,6 @@ export default {
methods: { methods: {
// 查询列表 // 查询列表
getList() { getList() {
if (this.params.state != '') {
this.params.state = Number(this.params.state)
}
getYMXZDGLlist(this.params).then(res => { getYMXZDGLlist(this.params).then(res => {
if (res.code == 200) { if (res.code == 200) {
// this.page.total = res.data.total; // this.page.total = res.data.total;
...@@ -202,9 +195,10 @@ export default { ...@@ -202,9 +195,10 @@ export default {
this.params = { this.params = {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
rsName: "", elementName: "",
scope: "", archIBelongId: "",
state: "", state: "",
type: 1,
} }
}, },
// 分页事件 // 分页事件
...@@ -336,6 +330,17 @@ export default { ...@@ -336,6 +330,17 @@ export default {
return false //不可勾选 return false //不可勾选
} }
}, },
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);
}
});
})
},
}, },
} }
</script> </script>
...@@ -376,8 +381,8 @@ export default { ...@@ -376,8 +381,8 @@ export default {
.search_btn{ .search_btn{
width: 100%; width: 100%;
display: flex; display: flex;
margin-top: 50px; margin-top: 10px;
margin-bottom: 20px; margin-bottom: 10px;
} }
.add_btn{ .add_btn{
display: flex; display: flex;
......
src/views/metaModelDic/pages/page2.vue
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<div class="search_menu"> <div class="search_menu">
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">字典名称</span> <span class="search_title">元素关系名称</span>
<el-input v-model="params.rsName" placeholder="请输入内容" class="search_item"></el-input> <el-input v-model="params.rsName" placeholder="请输入内容" class="search_item"></el-input>
</div> </div>
<div class="search_menu_item"> <div class="search_menu_item">
...@@ -36,23 +36,20 @@ ...@@ -36,23 +36,20 @@
</div> </div>
</div> </div>
<div class="search_btn"> <div class="search_btn">
<div class="add_btn" @click="operate('add')">
<img class="btn_icon" src="@/assets/新建icon.png" alt="" />
<p>新建</p>
</div> </div>
<div class="version_btn" @click="operate('pushAll')"> <el-table :data="tableData" stripe border height="450">
<img class="btn_icon" src="@/assets/版本发布icon.png" alt="" />
<p>版本发布</p>
</div>
</div>
<el-table :data="tableData" stripe border>
<el-table-column type="selection" width="55"></el-table-column>
<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="let1" label="字典名称" width="180" align="center"></el-table-column> <el-table-column prop="rsName" label="元素关系名称" width="180" align="center"></el-table-column>
<el-table-column prop="let2" label="架构层次" width="180" align="center"></el-table-column> <el-table-column prop="object1" label="对象1" width="180" align="center"></el-table-column>
<el-table-column prop="let3" label="架构归属" width="180" align="center"></el-table-column> <el-table-column prop="object2" label="对象2" width="180" align="center"></el-table-column>
<el-table-column prop="let4" label="描述" width="180" align="center"></el-table-column> <el-table-column prop="scope" label="适用范围" width="180" align="center"></el-table-column>
<el-table-column prop="let5" label="字典版本号" align="center"></el-table-column> <el-table-column prop="content" label="关系描述" width="180" align="center"></el-table-column>
<el-table-column label="图标" align="center">
<template>
<el-button type="text" style="color: #0D867F;">预览</el-button>
</template>
</el-table-column>
<el-table-column prop="version" label="版本" width="180" 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">
<span >{{dicObj.state[scope.row.state]}}</span> <span >{{dicObj.state[scope.row.state]}}</span>
...@@ -112,7 +109,6 @@ import { ...@@ -112,7 +109,6 @@ import {
getYMXZDGLAdd, getYMXZDGLAdd,
getYMXZDGLDel, getYMXZDGLDel,
getYMXZDGLUpdate, getYMXZDGLUpdate,
// getYMXZDGLUpdateBatch,
} from "@/api/index.js"; } from "@/api/index.js";
export default { export default {
...@@ -145,6 +141,7 @@ export default { ...@@ -145,6 +141,7 @@ export default {
rsName: "", rsName: "",
scope: "", scope: "",
state: "", state: "",
type: 2,
}, },
page: { page: {
current: 1, current: 1,
...@@ -173,7 +170,6 @@ export default { ...@@ -173,7 +170,6 @@ export default {
value: 2, value: 2,
}, },
], ],
}; };
}, },
mounted() { mounted() {
...@@ -181,15 +177,12 @@ export default { ...@@ -181,15 +177,12 @@ export default {
this.getList(); this.getList();
}, },
created() { created() {
}, },
methods: { methods: {
// 查询列表 // 查询列表
getList() { getList() {
if (this.params.state != '') {
this.params.state = Number(this.params.state)
}
getYMXZDGLlist(this.params).then(res => { getYMXZDGLlist(this.params).then(res => {
console.log(res);
if (res.code == 200) { if (res.code == 200) {
// this.page.total = res.data.total; // this.page.total = res.data.total;
// this.tableData = res.data.records; // this.tableData = res.data.records;
...@@ -205,6 +198,7 @@ export default { ...@@ -205,6 +198,7 @@ export default {
rsName: "", rsName: "",
scope: "", scope: "",
state: "", state: "",
type: 2,
} }
}, },
// 分页事件 // 分页事件
...@@ -376,8 +370,8 @@ export default { ...@@ -376,8 +370,8 @@ export default {
.search_btn{ .search_btn{
width: 100%; width: 100%;
display: flex; display: flex;
margin-top: 50px; margin-top: 10px;
margin-bottom: 20px; margin-bottom: 10px;
} }
.add_btn{ .add_btn{
display: flex; display: flex;
......
src/views/metaModelDic/pages/page3.vue
...@@ -4,23 +4,21 @@ ...@@ -4,23 +4,21 @@
<div class="search_menu"> <div class="search_menu">
<div class="search_menu_item_container"> <div class="search_menu_item_container">
<div class="search_menu_item"> <div class="search_menu_item">
<span class="search_title">字典名称</span> <span class="search_title">架构视图名称</span>
<el-input v-model="params.rsName" placeholder="请输入内容" class="search_item"></el-input> <el-select v-model="params.viewName" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in viewNameList" :key="idnex" :label="item" :value="item" ></el-option>
</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.scope" placeholder="请选择" clearable class="search_item"> <el-select v-model="params.schemaLevel" placeholder="请选择" clearable class="search_item">
<el-option label="业务架构" value="业务架构"></el-option> <el-option v-for="(item,idnex) in levelList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
<el-option label="应用架构" value="应用架构"></el-option>
<el-option label="内容架构" value="内容架构"></el-option>
<el-option label="技术架构" value="技术架构"></el-option>
<el-option label="安全架构" value="安全架构"></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.state" placeholder="请选择" clearable class="search_item"> <el-select v-model="params.schemaBelong" placeholder="请选择" clearable class="search_item">
<el-option v-for="(item,idnex) in stateList" :key="idnex" :label="item.label" :value="item.value" ></el-option> <el-option v-for="(item,idnex) in belongList" :key="idnex" :label="item.label" :value="item.value" ></el-option>
</el-select> </el-select>
</div> </div>
</div> </div>
...@@ -36,23 +34,24 @@ ...@@ -36,23 +34,24 @@
</div> </div>
</div> </div>
<div class="search_btn"> <div class="search_btn">
<div class="add_btn" @click="operate('add')">
<img class="btn_icon" src="@/assets/新建icon.png" alt="" />
<p>新建</p>
</div>
<div class="version_btn" @click="operate('pushAll')">
<img class="btn_icon" src="@/assets/版本发布icon.png" alt="" />
<p>版本发布</p>
</div>
</div> </div>
<el-table :data="tableData" stripe border> <el-table :data="tableData" stripe border height="450">
<el-table-column type="selection" width="55"></el-table-column>
<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="let1" label="字典名称" width="180" align="center"></el-table-column> <el-table-column prop="viewName" label="架构视图名称" width="150" align="center"></el-table-column>
<el-table-column prop="let2" label="架构层次" width="180" align="center"></el-table-column> <el-table-column prop="schemaLevel" label="架构层次" width="150" align="center">
<el-table-column prop="let3" label="架构归属" width="180" align="center"></el-table-column> <template slot-scope="scope">
<el-table-column prop="let4" label="描述" width="180" align="center"></el-table-column> <span >{{dicObj.schemaLevel[scope.row.schemaLevel]}}</span>
<el-table-column prop="let5" label="字典版本号" align="center"></el-table-column> </template>
</el-table-column>
<el-table-column prop="schemaBelong" label="架构归属" width="150" align="center">
<template slot-scope="scope">
<span >{{dicObj.schemaBelong[scope.row.schemaBelong]}}</span>
</template>
</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="let7" 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">
<span >{{dicObj.state[scope.row.state]}}</span> <span >{{dicObj.state[scope.row.state]}}</span>
...@@ -112,7 +111,7 @@ import { ...@@ -112,7 +111,7 @@ import {
getYMXZDGLAdd, getYMXZDGLAdd,
getYMXZDGLDel, getYMXZDGLDel,
getYMXZDGLUpdate, getYMXZDGLUpdate,
// getYMXZDGLUpdateBatch, getViewNameList,
} from "@/api/index.js"; } from "@/api/index.js";
export default { export default {
...@@ -136,15 +135,18 @@ export default { ...@@ -136,15 +135,18 @@ export default {
let3: '', let3: '',
let4: '', let4: '',
formData: { formData: {
rsName: "", schemaLevel: "",
schemaBelong: "",
viewName: "",
content: "", content: "",
}, },
params: { params: {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
rsName: "", viewName: "",
scope: "", schemaLevel: "",
state: "", schemaBelong: "",
type: 3,
}, },
page: { page: {
current: 1, current: 1,
...@@ -158,6 +160,19 @@ export default { ...@@ -158,6 +160,19 @@ export default {
1: "已发布", 1: "已发布",
2: "暂存", 2: "暂存",
}, },
schemaLevel: {
0: "策略层",
1: "管理层",
2: "设计层",
3: "实施层",
},
schemaBelong: {
0: "业务架构",
1: "应用架构",
2: "数据架构",
3: "技术架构",
4: "安全架构",
},
}, },
stateList: [ stateList: [
{ {
...@@ -173,12 +188,56 @@ export default { ...@@ -173,12 +188,56 @@ export default {
value: 2, value: 2,
}, },
], ],
levelList: [
{
label: "策略层",
value: 0,
},
{
label: "管理层",
value: 1,
},
{
label: "设计层",
value: 2,
},
{
label: "实施层",
value: 3,
},
],
belongList: [
{
label: "业务架构",
value: 0,
},
{
label: "应用架构",
value: 1,
},
{
label: "数据架构",
value: 2,
},
{
label: "技术架构",
value: 3,
},
{
label: "安全架构",
value: 4,
},
],
viewNameList: [],
}; };
}, },
mounted() { mounted() {
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
// 查询视图下拉
this.getViewNameList();
}, },
created() { created() {
...@@ -186,9 +245,6 @@ export default { ...@@ -186,9 +245,6 @@ export default {
methods: { methods: {
// 查询列表 // 查询列表
getList() { getList() {
if (this.params.state != '') {
this.params.state = Number(this.params.state)
}
getYMXZDGLlist(this.params).then(res => { getYMXZDGLlist(this.params).then(res => {
if (res.code == 200) { if (res.code == 200) {
// this.page.total = res.data.total; // this.page.total = res.data.total;
...@@ -197,14 +253,26 @@ export default { ...@@ -197,14 +253,26 @@ export default {
} }
}); });
}, },
// 获取下拉
getViewNameList() {
getViewNameList().then(res => {
if (res.code == 200) {
console.log(res);
let arr = JSON.parse(res.msg);
let viewStr = arr[0].viewName;
this.viewNameList = viewStr.split(",");
}
});
},
// 重置 // 重置
reset(){ reset(){
this.params = { this.params = {
current: 1, current: 1,
pageSize: 10, pageSize: 10,
rsName: "", viewName: "",
scope: "", schemaLevel: "",
state: "", schemaBelong: "",
type: 3,
} }
}, },
// 分页事件 // 分页事件
...@@ -320,7 +388,9 @@ export default { ...@@ -320,7 +388,9 @@ export default {
// 新建清空表单 // 新建清空表单
resetForm(){ resetForm(){
this.formData = { this.formData = {
rsName: "", schemaLevel: "",
schemaBelong: "",
viewName: "",
content: "", content: "",
} }
}, },
...@@ -376,8 +446,8 @@ export default { ...@@ -376,8 +446,8 @@ export default {
.search_btn{ .search_btn{
width: 100%; width: 100%;
display: flex; display: flex;
margin-top: 50px; margin-top: 10px;
margin-bottom: 20px; margin-bottom: 10px;
} }
.add_btn{ .add_btn{
display: flex; display: flex;
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!