Skip to content

liangzhen / framework-tools-web

Go to a project
Commit f1104ee5 by liuyong
Options

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

2 parents 3eea2603 0acd01d8
Inline Side-by-side
Showing with 176 additions and 63 deletions
public/drawio/js/diagramly/App.js
...@@ -584,7 +584,7 @@ App.getStoredMode = function() ...@@ -584,7 +584,7 @@ App.getStoredMode = function()
window.location.hash == '') || (window.location.hash != null && window.location.hash == '') || (window.location.hash != null &&
window.location.hash.substring(0, 2) == '#G')) window.location.hash.substring(0, 2) == '#G'))
{ {
mxscript('https://apis.google.com/js/api.js'); //二次开发 删除apis.google.com的加载过程,改为加载本地文件 // mxscript('https://apis.google.com/js/api.js'); //二次开发 删除apis.google.com的加载过程,改为加载本地文件
// mxscript('js/api.js'); // mxscript('js/api.js');
} }
// Keeps lazy loading for fallback to authenticated Google file if not public in loadFile // Keeps lazy loading for fallback to authenticated Google file if not public in loadFile
...@@ -982,8 +982,8 @@ App.main = function(callback, createUi) ...@@ -982,8 +982,8 @@ App.main = function(callback, createUi)
(urlParams['embed'] == '1' && urlParams['gapi'] == '1')) && isSvgBrowser && (urlParams['embed'] == '1' && urlParams['gapi'] == '1')) && isSvgBrowser &&
isLocalStorage && (document.documentMode == null || document.documentMode >= 10)))) isLocalStorage && (document.documentMode == null || document.documentMode >= 10))))
{ {
mxscript('https://apis.google.com/js/api.js?onload=DrawGapiClientCallback', null, null, null, mxClient.IS_SVG); // mxscript('https://apis.google.com/js/api.js?onload=DrawGapiClientCallback', null, null, null, mxClient.IS_SVG);
// mxscript('js/api.js', null, null, null, mxClient.IS_SVG);//二次开发，下载翻墙插件到本地 // mxscript('js/api.js?onload=DrawGapiClientCallback', null, null, null, mxClient.IS_SVG);//二次开发，下载翻墙插件到本地
} }
// Disables client // Disables client
else if (typeof window.gapi === 'undefined') else if (typeof window.gapi === 'undefined')
......
src/api/index.js
...@@ -70,6 +70,7 @@ export function get_yuan_mo_xing_list(params) { ...@@ -70,6 +70,7 @@ export function get_yuan_mo_xing_list(params) {
export function delete_yuan_mo_xing_list(params) { export function delete_yuan_mo_xing_list(params) {
return post('/ynMol/deleteYnMol', params); return post('/ynMol/deleteYnMol', params);
} }
// 架构视图配置 // 架构视图配置
// 列表查询 // 列表查询
export function getJGSTPZlist(params) { export function getJGSTPZlist(params) {
...@@ -95,6 +96,13 @@ export function getJGSTPZDel(params) { ...@@ -95,6 +96,13 @@ export function getJGSTPZDel(params) {
export function getViewNameList(params) { export function getViewNameList(params) {
return post('/vwDis/getviewName', params); return post('/vwDis/getviewName', params);
} }
// 获取元素和元素关系列表
export function getEleList(params) {
return post('/vwDis/gtEleList', params);
}
export function gtEleRelList(params) {
return post('/vwDis/gtEleRelList', params);
}
// 元模型字典管理 // 元模型字典管理
......
src/views/archiEleRela/index.vue
...@@ -53,9 +53,15 @@ ...@@ -53,9 +53,15 @@
<el-table-column prop="object2" label="对象2" 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="scope" 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="content" label="关系描述" width="180" align="center"></el-table-column> <el-table-column prop="content" label="关系描述" width="180" align="center"></el-table-column>
<el-table-column label="图标" align="center"> <el-table-column label="图标" align="center" width="100">
<template> <template slot-scope="scope">
<el-button type="text" style="color: #0D867F;">预览</el-button> <div class="tableIcon">
<img class="iconItem" src="@/assets/archiEleRela/img1.svg" alt="" v-if="scope.row.icon == 'img1'" />
<img class="iconItem" src="@/assets/archiEleRela/img2.svg" alt="" v-if="scope.row.icon == 'img2'" />
<img class="iconItem" src="@/assets/archiEleRela/img3.svg" alt="" v-if="scope.row.icon == 'img3'" />
<img class="iconItem" src="@/assets/archiEleRela/img4.svg" alt="" v-if="scope.row.icon == 'img4'" />
<img class="iconItem" src="@/assets/archiEleRela/img5.svg" alt="" v-if="scope.row.icon == 'img5'" />
</div>
</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="180" align="center"></el-table-column>
...@@ -107,7 +113,7 @@ ...@@ -107,7 +113,7 @@
:title="title" :title="title"
:visible.sync="add_dialog" :visible.sync="add_dialog"
:center="false" :center="false"
width="40%"> width="50%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<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>
...@@ -121,19 +127,19 @@ ...@@ -121,19 +127,19 @@
<div class="dialog_form_item_title">图标设置</div> <div class="dialog_form_item_title">图标设置</div>
<div> <div>
<div class="dialog_form_item3_content1"> <div class="dialog_form_item3_content1">
<el-radio v-model="radio2" label="img1"> <el-radio v-model="formData.icon" label="img1">
<img class="tu_biao_icon2" src="@/assets/archiEleRela/img1.svg" alt="" /> <img class="tu_biao_icon2" src="@/assets/archiEleRela/img1.svg" alt="" />
</el-radio> </el-radio>
<el-radio v-model="radio2" label="img2"> <el-radio v-model="formData.icon" label="img2">
<img class="tu_biao_icon2" src="@/assets/archiEleRela/img2.svg" alt="" /> <img class="tu_biao_icon2" src="@/assets/archiEleRela/img2.svg" alt="" />
</el-radio> </el-radio>
<el-radio v-model="radio2" label="img3"> <el-radio v-model="formData.icon" label="img3">
<img class="tu_biao_icon2" src="@/assets/archiEleRela/img3.svg" alt="" /> <img class="tu_biao_icon2" src="@/assets/archiEleRela/img3.svg" alt="" />
</el-radio> </el-radio>
<el-radio v-model="radio2" label="img4"> <el-radio v-model="formData.icon" label="img4">
<img class="tu_biao_icon2" src="@/assets/archiEleRela/img4.svg" alt="" /> <img class="tu_biao_icon2" src="@/assets/archiEleRela/img4.svg" alt="" />
</el-radio> </el-radio>
<el-radio v-model="radio2" label="img5"> <el-radio v-model="formData.icon" label="img5">
<img class="tu_biao_icon2" src="@/assets/archiEleRela/img5.svg" alt="" /> <img class="tu_biao_icon2" src="@/assets/archiEleRela/img5.svg" alt="" />
</el-radio> </el-radio>
</div> </div>
...@@ -146,24 +152,26 @@ ...@@ -146,24 +152,26 @@
情况{{index+1}} 情况{{index+1}}
<div class="formItem"> <div class="formItem">
<div class="label">对象1</div> <div class="label">对象1</div>
<!-- <el-select v-model="formData.object1" placeholder="请选择" clearable v-if="index == 0">
<el-option v-for="(item,idnex) in eleList" :key="idnex" :label="item.elementName" :value="item.elementId" ></el-option>
</el-select> -->
<el-select v-model="item.name1" placeholder="请选择" clearable> <el-select v-model="item.name1" placeholder="请选择" clearable>
<el-option label="业务架构" value="业务架构"></el-option> <el-option v-for="(item,idnex) in eleList" :key="idnex" :label="item.elementName" :value="item.elementId" ></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="formItem"> <div class="formItem">
<div class="label">对象2</div> <div class="label">对象2</div>
<!-- <el-select v-model="formData.object2" placeholder="请选择" clearable v-if="index == 0">
<el-option v-for="(item,idnex) in eleList" :key="idnex" :label="item.elementName" :value="item.elementId" ></el-option>
</el-select> -->
<el-select v-model="item.name2" placeholder="请选择" clearable> <el-select v-model="item.name2" placeholder="请选择" clearable>
<el-option label="业务架构" value="业务架构"></el-option> <el-option v-for="(item,idnex) in eleList" :key="idnex" :label="item.elementName" :value="item.elementId" ></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="formItem">
<div class="label">适用范围</div>
<el-input placeholder="" class="dialog_form_item_content" v-model="item.name3" :disabled="true"></el-input>
</div>
<div class="newBtn"> <div class="newBtn">
<el-button class="addItem" icon="el-icon-plus" circle @click="operateDia('add')" v-if="tableData2.length == index+1"></el-button> <el-button class="addItem" icon="el-icon-plus" circle @click="operateDia('add')" v-if="tableData2.length == index+1"></el-button>
<el-button class="addItem" icon="el-icon-minus" circle @click="operateDia('del')" v-else></el-button> <el-button class="addItem" icon="el-icon-minus" circle @click="operateDia('del')" v-else></el-button>
...@@ -189,6 +197,7 @@ import { ...@@ -189,6 +197,7 @@ import {
getJGYSGLDel, getJGYSGLDel,
getJGYSGLUpdate, getJGYSGLUpdate,
getJGYSGLUpdateBatch, getJGYSGLUpdateBatch,
getEleList,
} from "@/api/index.js"; } from "@/api/index.js";
export default { export default {
...@@ -203,6 +212,7 @@ export default { ...@@ -203,6 +212,7 @@ export default {
{ {
name1: "", name1: "",
name2: "", name2: "",
name3: "",
}, },
], ],
selectList: [], selectList: [],
...@@ -212,10 +222,6 @@ export default { ...@@ -212,10 +222,6 @@ export default {
query_item1: null, query_item1: null,
query_item3: null, query_item3: null,
query_item4: null, query_item4: null,
let1: '',
let2: '',
let3: '',
let4: '',
formData: { formData: {
rsName: "", rsName: "",
content: "", content: "",
...@@ -255,15 +261,18 @@ export default { ...@@ -255,15 +261,18 @@ export default {
}, },
], ],
radio2: '', radio2: '',
eleList: [],
}; };
}, },
mounted() { mounted() {
// 初始化查询列表
this.getList();
}, },
created() { created() {
// 初始化查询列表
this.getList();
// 获取元素列表
this.getYuansuList();
}, },
methods: { methods: {
// 查询列表 // 查询列表
...@@ -278,6 +287,14 @@ export default { ...@@ -278,6 +287,14 @@ export default {
} }
}); });
}, },
// 获取元素列表
getYuansuList() {
getEleList().then(res => {
if (res.code == 200) {
this.eleList = res.data;
}
});
},
// 重置 // 重置
reset(){ reset(){
this.params = { this.params = {
...@@ -439,6 +456,7 @@ export default { ...@@ -439,6 +456,7 @@ export default {
{ {
name1: "", name1: "",
name2: "", name2: "",
name3: "",
} }
); );
break; break;
...@@ -566,6 +584,15 @@ export default { ...@@ -566,6 +584,15 @@ export default {
.table_container{ .table_container{
width: 97%; width: 97%;
margin-top: 20px; margin-top: 20px;
.tableIcon{
width: 100%;
display: flex;
justify-content: center;
.iconItem{
width: 30px;
height: 30px;
}
}
} }
.el-pagination{ .el-pagination{
margin-top: 50px; margin-top: 50px;
...@@ -575,7 +602,7 @@ export default { ...@@ -575,7 +602,7 @@ export default {
align-items: center; align-items: center;
margin-bottom: 10px; margin-bottom: 10px;
.formArea{ .formArea{
width: 700px; width: 900px;
border-radius: 5px; border-radius: 5px;
border: 1px solid #0D867F; border: 1px solid #0D867F;
margin-top: 10px; margin-top: 10px;
...@@ -589,12 +616,15 @@ export default { ...@@ -589,12 +616,15 @@ export default {
display: flex; display: flex;
align-items: center; align-items: center;
.label{ .label{
width: 40px; width: 70px;
text-align: right; text-align: right;
margin-right: 5px; margin-right: 5px;
} }
/deep/.el-select{ /deep/.el-select{
width: 185px; width: 140px;
}
/deep/.el-input{
width: 140px;
} }
} }
.newBtn{ .newBtn{
......
src/views/archiViewConfig/index.vue
...@@ -6,9 +6,6 @@ ...@@ -6,9 +6,6 @@
<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.viewName" placeholder="请输入内容" class="search_item"></el-input> <el-input v-model="params.viewName" 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>
...@@ -59,10 +56,10 @@ ...@@ -59,10 +56,10 @@
</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="元素范围" align="center"></el-table-column>
<el-table-column prop="let7" label="包含元素" width="150" align="center"></el-table-column> <el-table-column prop="relName" label="元素关系范围" 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="状态" width="80" 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>
...@@ -99,9 +96,10 @@ ...@@ -99,9 +96,10 @@
<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>
<el-select v-model="formData.viewName" placeholder="请选择" clearable class="search_item"> <el-input v-model="formData.viewName" placeholder="请输入内容" class="search_item"></el-input>
<!-- <el-select v-model="formData.viewName" placeholder="请选择" clearable 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"><span class="reqIcon">*</span>架构层次</div> <div class="dialog_form_item_title"><span class="reqIcon">*</span>架构层次</div>
...@@ -122,18 +120,18 @@ ...@@ -122,18 +120,18 @@
</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-table :data="tableData2" border> <el-table :data="tableData1" ref="multipleTable1" border height="195" @selection-change="handleSelectionChange1">
<el-table-column type="selection" width="55"></el-table-column> <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="name" label="元素名称" align="center"></el-table-column> <el-table-column prop="elementName" label="元素名称" align="center"></el-table-column>
</el-table> </el-table>
</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-table :data="tableData2" border> <el-table :data="tableData2" ref="multipleTable2" border height="195" @selection-change="handleSelectionChange2">
<el-table-column type="selection" width="55"></el-table-column> <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="name" label="元素名称" align="center"></el-table-column> <el-table-column prop="rsName" label="元素关系名称" align="center"></el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
...@@ -155,6 +153,8 @@ import { ...@@ -155,6 +153,8 @@ import {
getJGSTPZUpdate, getJGSTPZUpdate,
getJGSTPZUpdateBatch, getJGSTPZUpdateBatch,
getViewNameList, getViewNameList,
getEleList,
gtEleRelList,
} from "@/api/index.js"; } from "@/api/index.js";
export default { export default {
...@@ -168,29 +168,21 @@ export default { ...@@ -168,29 +168,21 @@ export default {
selectList: [], selectList: [],
add_dialog: false, add_dialog: false,
title: "", title: "",
tableData1: [ tableData1: [],
{ name: '业务域'}, tableData2: [],
{ name: '业务职能'},
{ name: '业务流程'},
],
tableData2: [
{ name: '业务域'},
{ name: '业务职能'},
{ name: '业务流程'},
],
add_dialog: false, add_dialog: false,
query_item1: null, query_item1: null,
query_item3: null, query_item3: null,
query_item4: null, query_item4: null,
let1: '带出',
let2: '',
let3: '',
let4: '',
formData: { formData: {
schemaLevel: "", schemaLevel: "",
schemaBelong: "", schemaBelong: "",
viewName: "", viewName: "",
content: "", content: "",
eleName: "",
archiEleId: "",
archiEleRelId: "",
relName: "",
}, },
params: { params: {
current: 1, current: 1,
...@@ -280,17 +272,24 @@ export default { ...@@ -280,17 +272,24 @@ export default {
}, },
], ],
viewNameList: [], viewNameList: [],
selectData1: [],
selectData2: [],
selectData3: [],
selectData4: [],
}; };
}, },
mounted() { mounted() {
},
created() {
// 初始化查询列表 // 初始化查询列表
this.getList(); this.getList();
// 查询视图下拉 // 查询视图下拉
this.getViewNameList(); this.getViewNameList();
}, // 获取元素和元素关系下拉
created() { this.getEleList();
this.gtEleRelList();
}, },
methods: { methods: {
// 查询列表 // 查询列表
...@@ -312,6 +311,21 @@ export default { ...@@ -312,6 +311,21 @@ export default {
} }
}); });
}, },
getEleList() {
getEleList().then(res => {
if (res.code == 200) {
this.tableData1 = res.data;
}
});
},
gtEleRelList() {
gtEleRelList().then(res => {
if (res.code == 200) {
console.log(res.data);
this.tableData2 = res.data;
}
});
},
// 重置查询 // 重置查询
reset(){ reset(){
this.params = { this.params = {
...@@ -345,8 +359,47 @@ export default { ...@@ -345,8 +359,47 @@ export default {
this.add_dialog = true; this.add_dialog = true;
this.title = "编辑架构视图"; this.title = "编辑架构视图";
this.formData = item; this.formData = item;
if (item.eleName) {
this.selectData1 = item.eleName.split(",");
}
if (item.archiEleId) {
this.selectData2 = item.archiEleId.split(",");
}
if (item.relName) {
this.selectData3 = item.relName.split(",");
}
if (item.archiEleRelId) {
this.selectData4 = item.archiEleRelId.split(",");
}
// this.selectData1 = item.eleName.split(",");
// this.selectData2 = item.archiEleId.split(",");
// this.selectData3 = item.relName.split(",");
// this.selectData4 = item.archiEleRelId.split(",");
this.tableData1.forEach(item => {
this.selectData2.forEach(item2 => {
if (item.elementId == item2) {
this.$nextTick(function() {
this.$refs.multipleTable1.toggleRowSelection(item, true);
});
}
});
});
this.tableData2.forEach(item => {
this.selectData4.forEach(item2 => {
if (item.eleRelaId == item2) {
this.$nextTick(function() {
this.$refs.multipleTable2.toggleRowSelection(item, true);
});
}
});
});
}else if (type == "create") { }else if (type == "create") {
this.formData.state = 2; this.formData.state = 2;
// 赋值
this.formData.eleName = this.selectData1.join(",");
this.formData.archiEleId = this.selectData2.join(",");
this.formData.relName = this.selectData3.join(",");
this.formData.archiEleRelId = this.selectData4.join(",");
if (this.formData.viewId) { if (this.formData.viewId) {
// 编辑保存 // 编辑保存
getJGSTPZUpdate(this.formData).then(res => { getJGSTPZUpdate(this.formData).then(res => {
...@@ -368,6 +421,10 @@ export default { ...@@ -368,6 +421,10 @@ export default {
} }
}else if (type == "pushAdd") { }else if (type == "pushAdd") {
this.formData.state = 1; this.formData.state = 1;
this.formData.eleName = this.selectData1.join(",");
this.formData.archiEleId = this.selectData2.join(",");
this.formData.relName = this.selectData3.join(",");
this.formData.archiEleRelId = this.selectData4.join(",");
if (this.formData.viewId) { if (this.formData.viewId) {
// 编辑发布 // 编辑发布
getJGSTPZUpdate(this.formData).then(res => { getJGSTPZUpdate(this.formData).then(res => {
...@@ -450,13 +507,31 @@ export default { ...@@ -450,13 +507,31 @@ export default {
schemaBelong: "", schemaBelong: "",
viewName: "", viewName: "",
content: "", content: "",
eleName: "",
archiEleId: "",
archiEleRelId: "",
relName: "",
} }
this.$refs.multipleTable1.clearSelection();
this.$refs.multipleTable2.clearSelection();
this.selectData1 = [];
this.selectData2 = [];
this.selectData3 = [];
this.selectData4 = [];
}, },
// 表格多选 // 表格多选
handleSelectionChange(e) { handleSelectionChange(e) {
this.selectList = e; this.selectList = e;
}, },
handleSelectionChange1(e) {
this.selectData1 = e.map(item => item.elementName);
this.selectData2 = e.map(item => item.elementId);
},
handleSelectionChange2(e) {
this.selectData3 = e.map(item => item.rsName);
this.selectData4 = e.map(item => item.eleRelaId);
},
selectInit(row,index){ selectInit(row,index){
if(row.state != "1"){ if(row.state != "1"){
return true //可勾选 return true //可勾选
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!