Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 031ff118 by liuyong
Options

修改bug

1 parent 8bc9010e
Expand all
Inline Side-by-side
Showing with 152 additions and 82 deletions
public/drawio/extention/js/exApp.js
...@@ -54,7 +54,7 @@ const initDrawioGraph = function(that) {//一进入画布显示的图形 ...@@ -54,7 +54,7 @@ const initDrawioGraph = function(that) {//一进入画布显示的图形
var parser = new DOMParser(); var parser = new DOMParser();
var xmlDoc = parser.parseFromString(composedXMLData, "text/xml"); var xmlDoc = parser.parseFromString(composedXMLData, "text/xml");
const mxGraphModel = xmlDoc.getElementsByTagName('diagram')[0].innerHTML; const mxGraphModel = xmlDoc.getElementsByTagName('diagram')[0].innerHTML;
console.log(mxGraphModel)
var graph = that.editor.graph; var graph = that.editor.graph;
var svgImage = graph.getSvg('#fff', 1, 0, true, null, true, null, null, null, null, true, 'light', 'diagram');//当前画布的预览图，svg格式 var svgImage = graph.getSvg('#fff', 1, 0, true, null, true, null, null, null, null, true, 'light', 'diagram');//当前画布的预览图，svg格式
var svgToString = new XMLSerializer().serializeToString(svgImage); var svgToString = new XMLSerializer().serializeToString(svgImage);
...@@ -123,10 +123,10 @@ const setIcon = function (itemIcon, dicys, color) { ...@@ -123,10 +123,10 @@ const setIcon = function (itemIcon, dicys, color) {
} }
// const svg = '<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" style="left: 1px; top: 1px; width: 32px; height: 30px; display: block; position: relative; overflow: hidden; pointer-events: none;"><g style="pointer-events: none;"><g style="pointer-events: none;"></g><g style="pointer-events: none;"><g transform="translate(0.5,0.5)" style="visibility: visible; pointer-events: none;"><path d="M 2.48 27.98 L 28.99 1.48" fill="none" stroke="white" stroke-width="9.3" stroke-miterlimit="10" visibility="hidden" style="pointer-events: none;"></path><path d="M 2.48 27.98 L 28.99 1.48" fill="none" stroke="rgb(0, 0, 0)" stroke-width="1.3" stroke-miterlimit="10" stroke-dasharray="1.59 1.59" style="pointer-events: none;"></path></g></g><g style="pointer-events: none;"></g><g style="pointer-events: none;"></g></g></svg>'; // const svg = '<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" style="left: 1px; top: 1px; width: 32px; height: 30px; display: block; position: relative; overflow: hidden; pointer-events: none;"><g style="pointer-events: none;"><g style="pointer-events: none;"></g><g style="pointer-events: none;"><g transform="translate(0.5,0.5)" style="visibility: visible; pointer-events: none;"><path d="M 2.48 27.98 L 28.99 1.48" fill="none" stroke="white" stroke-width="9.3" stroke-miterlimit="10" visibility="hidden" style="pointer-events: none;"></path><path d="M 2.48 27.98 L 28.99 1.48" fill="none" stroke="rgb(0, 0, 0)" stroke-width="1.3" stroke-miterlimit="10" stroke-dasharray="1.59 1.59" style="pointer-events: none;"></path></g></g><g style="pointer-events: none;"></g><g style="pointer-events: none;"></g></g></svg>';
const svg = '<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" style="left: 1px; top: 1px; width: 32px; height: 30px; display: block; position: relative; overflow: hidden; pointer-events: none;"><g style="pointer-events: none;"><g style="pointer-events: none;"></g><g style="pointer-events: none;"><g transform="translate(0.5,0.5)" style="visibility: visible; pointer-events: none;"><path d="M 2.74 27.74 L 28.74 1.74" fill="none" stroke="white" stroke-width="9.3" stroke-miterlimit="10" visibility="hidden" style="pointer-events: none;"></path><path d="M 2.74 27.74 L 28.74 1.74" fill="none" stroke="rgb(0, 0, 0)" stroke-width="1.3" stroke-miterlimit="10" stroke-dasharray="1.04 3.12" style="pointer-events: none;"></path></g></g><g style="pointer-events: none;"></g><g style="pointer-events: none;"></g></g></svg>'; const svg = '<svg xmlns:xlink="http://www.w3.org/1999/xlink" xmlns="http://www.w3.org/2000/svg" style="left: 1px; top: 1px; width: 32px; height: 30px; display: block; position: relative; overflow: hidden; pointer-events: none;"><g style="pointer-events: none;"><g style="pointer-events: none;"></g><g style="pointer-events: none;"><g transform="translate(0.5,0.5)" style="visibility: visible; pointer-events: none;"><rect x="1" y="3" width="30" height="24" fill="none" stroke="white" visibility="hidden" stroke-width="9" style="pointer-events: none;"></rect><rect x="1" y="3" width="30" height="24" fill="none" stroke="none" style="pointer-events: none;"></rect></g><g style="pointer-events: none;"><g transform="scale(0.3)" style="pointer-events: none;"><foreignObject width="334%" height="334%" style="overflow: visible; text-align: left; pointer-events: none;"><div style="display: flex; align-items: unsafe center; justify-content: unsafe flex-start; width: 98px; height: 1px; padding-top: 50px; margin-left: 5px; pointer-events: none;"><div data-drawio-colors="color: rgb(0, 0, 0); " style="box-sizing: border-box; font-size: 0px; text-align: left; max-height: 76px; overflow: hidden; pointer-events: none;"><div style="display: inline-block; font-size: 12px; font-family: Helvetica; color: rgb(0, 0, 0); line-height: 1.2; pointer-events: none; white-space: normal; overflow-wrap: normal;"><ul style="pointer-events: none;"><li style="pointer-events: none;">Value 1</li><li style="pointer-events: none;">Value 2</li><li style="pointer-events: none;">Value 3</li></ul></div></div></div></foreignObject></g></g></g><g style="pointer-events: none;"></g><g style="pointer-events: none;"></g></g></svg>';
const encode_item_icon = window.btoa(svg);//base64编码 const encode_item_icon = window.btoa(svg);//base64编码
let svgImage= 'data:image/svg+xml;base64,'+ encode_item_icon; let svgImage= 'data:image/svg+xml;base64,'+ encode_item_icon;
console.log(svgImage)
const images_ = [ const images_ = [
{ {
aspect: "fixed", aspect: "fixed",
...@@ -195,33 +195,33 @@ const leftCustomGraph = function(that) {//左侧自定义图形 ...@@ -195,33 +195,33 @@ const leftCustomGraph = function(that) {//左侧自定义图形
const joinGraph_ = JSON.parse(localStorage.getItem('joinGraph')); const joinGraph_ = JSON.parse(localStorage.getItem('joinGraph'));
const joinGraph = joinGraph_.graph; const joinGraph = joinGraph_.graph;
if(joinGraph_.state == 1) { if(joinGraph_.state == 1) {
// joinGraph.pop(); joinGraph.pop();
// joinGraph.forEach(function(item) { joinGraph.forEach(function(item) {
// if(item.eleDtos) { if(item.eleDtos) {
// if(item.eleDtos.length > 0) { if(item.eleDtos.length > 0) {
// const libraryName = item.arciBelongName; const libraryName = item.arciBelongName;
// let images = []; let images = [];
// item.eleDtos.forEach(function(item2) { item.eleDtos.forEach(function(item2) {
// images.unshift({ images.unshift({
// aspect: "fixed", aspect: "fixed",
// xml: item2.iconName, xml: item2.iconName,
// h: 41, h: 41,
// title: item2.eleName, title: item2.eleName,
// w: 71 w: 71
// }) })
// }) })
// var xml = that.createLibraryDataFromImages(images); var xml = that.createLibraryDataFromImages(images);
// var file = new LocalLibrary(that, xml, libraryName); var file = new LocalLibrary(that, xml, libraryName);
// that.libraryLoaded(file, images, null, false); that.libraryLoaded(file, images, null, false);
// }else { }else {
// } }
// } }
// }) })
}else { }else {
// joinGraph.forEach(item => { // joinGraph.forEach(item => {
// item.subList.forEach(item2 => { // item.eleDtos.forEach(item2 => {
// if(item2.eleType == '1') { // if(item2.eleType == '1') {
// console.log(item2) // console.log(item2)
// } // }
......
public/drawio/extention/js/exFormat.js
//二次开发，自定义属性面板 //二次开发，自定义属性面板
const initAttributePanel = function(that) { const initAttributePanel = function(that) {
var graph = that.editorUi.editor.graph; var graph = that.editorUi.editor.graph;
const cell = graph.getSelectionCell(); const cell = graph.getSelectionCell();
// graph.getModel().setValue(cell, '测试');
// cell.setValue('测试');
// let currentNode = graph.getModel().getValue(cell);
// console.log(cell.style)
// console.log(currentNode)
// console.log(cell)
// const str_AES_decode = str => { // const str_AES_decode = str => {
// const str2 = CryptoJS.AES.decrypt(str, 'secretkey'); // const str2 = CryptoJS.AES.decrypt(str, 'secretkey');
// return str2.toString(CryptoJS.enc.Utf8); // return str2.toString(CryptoJS.enc.Utf8);
......
public/drawio/extention/js/exGraph.js
...@@ -46,14 +46,14 @@ ...@@ -46,14 +46,14 @@
if(joinGraph_.state == 2) { if(joinGraph_.state == 2) {
const joinGraph = joinGraph_.graph; const joinGraph = joinGraph_.graph;
this.sidebarTitles = true;//勾选标签 this.sidebarTitles = true;//勾选标签
console.log(joinGraph) // console.log(joinGraph)
joinGraph.forEach(item => { joinGraph.forEach(item => {
if(item.arciBelongName == '架构元素关系') { if(item.arciBelongName == '架构元素关系') {
let fns = []; let fns = [];
item.eleDtos.forEach(item2 => { item.eleDtos.forEach(item2 => {
fns.push( fns.push(
this.createEdgeTemplateEntry( this.createEdgeTemplateEntry(
item2.iconName + 'attr=[]', item2.iconName + 'attr=[];assetName=[' + item2.rsName + '];',
item2.shapeWidth ? item2.shapeWidth : 150, item2.shapeWidth ? item2.shapeWidth : 150,
item2.shapeHeight ? item2.shapeHeight : 75, item2.shapeHeight ? item2.shapeHeight : 75,
'', '',
...@@ -86,7 +86,7 @@ ...@@ -86,7 +86,7 @@
// console.log(item3.fieldsValue) // console.log(item3.fieldsValue)
fns.push( fns.push(
this.createVertexTemplateEntry( this.createVertexTemplateEntry(
item2.iconName + ';fillColor=' + item2.color + ';' + 'attr=' + JSON.stringify(attr_) + ';assetId=' + item3.assetId + ';archiBelongId=' + item3.archiBelongId + ';', item2.iconName + ';fillColor=' + item2.color + ';' + 'attr=' + JSON.stringify(attr_) + ';assetId=' + item3.assetId + ';archiBelongId=' + item3.archiBelongId + ';assetName=[' + item3.assetName + '];',
item2.shapeWidth ? item2.shapeWidth : 150, item2.shapeWidth ? item2.shapeWidth : 150,
item2.shapeHeight ? item2.shapeHeight : 75, item2.shapeHeight ? item2.shapeHeight : 75,
null, null,
......
public/drawio/js/grapheditor/Sidebar.js
...@@ -2348,6 +2348,10 @@ Sidebar.prototype.createItem = function(cells, title, showLabel, showTitle, widt ...@@ -2348,6 +2348,10 @@ Sidebar.prototype.createItem = function(cells, title, showLabel, showTitle, widt
{ {
var originalCells = cells; var originalCells = cells;
cells = this.graph.cloneCells(cells); cells = this.graph.cloneCells(cells);
// cells[0].value = '测试';
// console.log(cells[0].value)
this.editorUi.insertHandler(originalCells, null, this.graph.model, this.editorUi.insertHandler(originalCells, null, this.graph.model,
this.editorUi.editor.graph.defaultVertexStyle, this.editorUi.editor.graph.defaultVertexStyle,
this.editorUi.editor.graph.defaultEdgeStyle, this.editorUi.editor.graph.defaultEdgeStyle,
...@@ -3767,6 +3771,12 @@ Sidebar.prototype.addClickHandler = function(elt, ds, cells, clickFn) ...@@ -3767,6 +3771,12 @@ Sidebar.prototype.addClickHandler = function(elt, ds, cells, clickFn)
ds.mouseDown =function(evt) ds.mouseDown =function(evt)
{ {
if(cells[0].style.includes("assetName")) {//二次开发，左侧点击图形时候给图形设置名称
const assetNameList = cells[0].style.match(/assetName=\[[^\]]*\]/);
const assetName = assetNameList[0].split("assetName=[")[1].split("]")[0];
// console.log(assetName);
cells[0].value = assetName;
}
oldMouseDown.apply(this, arguments); oldMouseDown.apply(this, arguments);
first = new mxPoint(mxEvent.getClientX(evt), mxEvent.getClientY(evt)); first = new mxPoint(mxEvent.getClientX(evt), mxEvent.getClientY(evt));
op = elt.style.opacity; op = elt.style.opacity;
......
src/api/index.js
...@@ -377,19 +377,19 @@ export function getComCenterServeDetail(params) { ...@@ -377,19 +377,19 @@ export function getComCenterServeDetail(params) {
} }
// 资产架构，表格 // 资产架构，表格
export function getZiChanJiaGouTable(params) { export function getZiChanJiaGouTable(params) {
return post('/network/arc-ast-cn/', params); return post('/network/arc-ast-info/', params);
} }
// 资产架构编辑 // 资产架构编辑
export function editZiChanJiaGouTable(params) { export function editZiChanJiaGouTable(params) {
return post('/network/arc-ast-cn/upd', params); return post('/network/arc-ast-info/upd', params);
} }
// 资产架构，删除，批量删除 // 资产架构，删除，批量删除
export function deleteMoreZiChanJiaGouTable(params) { export function deleteMoreZiChanJiaGouTable(params) {
return post('/network/arc-ast-cn/delBatch', params); return post('/network/arc-ast-info/delBatch', params);
} }
// 资产架构，新增 // 资产架构，新增
export function addMoreZiChanJiaGouTable(params) { export function addMoreZiChanJiaGouTable(params) {
return post('/network/arc-ast-cn/ad', params); return post('/network/arc-ast-info/ad', params);
} }
// 资产架构，上级节点 // 资产架构，上级节点
export function queryZiChanJiaGouShangJiJieDian(params) { export function queryZiChanJiaGouShangJiJieDian(params) {
...@@ -413,7 +413,7 @@ export function importZhiChanJiaGou(params) { ...@@ -413,7 +413,7 @@ export function importZhiChanJiaGou(params) {
} }
// 资产架构，关联资产 // 资产架构，关联资产
export function queryGuanLianZiChanSelect(params) { export function queryGuanLianZiChanSelect(params) {
return post('/network/arc-ast-cn/assetList', params); return post('/network/arc-ast-info/assetList', params);
} }
// 日志管理，列表 // 日志管理，列表
export function queryLogManageTable(params) { export function queryLogManageTable(params) {
...@@ -572,3 +572,11 @@ export function systemArchiSaveFactor(params) { ...@@ -572,3 +572,11 @@ export function systemArchiSaveFactor(params) {
export function getGaiSheJiaGouZunCongJiaChaTable(params) { export function getGaiSheJiaGouZunCongJiaChaTable(params) {
return post('/network/app-archi-control-requirements/', params); return post('/network/app-archi-control-requirements/', params);
} }
// 概设架构遵从检查, 右侧图片
export function getReviewArchiFollowCheckRightGraph(params) {
return post('/network/app-archi-control-requirements/qView', params);
}
// 概设架构遵从检查, 保存
export function saveReviewArchiFollowCheckRightSuggestion(params) {
return post('/network/app-archi-control-requirements/cComment', params);
}
src/views/archi-asset-manage/index.vue
...@@ -429,7 +429,7 @@ ...@@ -429,7 +429,7 @@
}, },
zuJianLeiXingSelect: [], zuJianLeiXingSelect: [],
archiBelongId: null, archiBelongId: null,
assetConstant: null, archiType: null,
treeDefaultExpand: [], treeDefaultExpand: [],
currentNodekey: null, currentNodekey: null,
editId: null, editId: null,
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
}); });
this.treeData[0].subList = res.data; this.treeData[0].subList = res.data;
this.archiBelongId = res.data[0].viewId; this.archiBelongId = res.data[0].viewId;
this.assetConstant = res.data[0].archiType; this.archiType = res.data[0].archiType;
this.get_table(); this.get_table();
}else { }else {
Message({ Message({
...@@ -505,7 +505,7 @@ ...@@ -505,7 +505,7 @@
"assetName": this.searchParams.let1, "assetName": this.searchParams.let1,
"createMan": this.searchParams.let3, "createMan": this.searchParams.let3,
"archiEleId": this.searchParams.let2, "archiEleId": this.searchParams.let2,
"assetConstant": this.assetConstant, "archiType": this.archiType,
// "archiAssetTypeId": this.archiAssetTypeId, // "archiAssetTypeId": this.archiAssetTypeId,
"current": this.pager.current, "current": this.pager.current,
"pageSize": this.pager.size, "pageSize": this.pager.size,
...@@ -530,7 +530,7 @@ ...@@ -530,7 +530,7 @@
}, },
treeClick(data) {//左侧树点击 treeClick(data) {//左侧树点击
this.archiBelongId = data.viewId; this.archiBelongId = data.viewId;
this.assetConstant = data.archiType; this.archiType = data.archiType;
this.get_table(); this.get_table();
}, },
queryZuJianLeiXingSelect(data) {//组件类型搜索 queryZuJianLeiXingSelect(data) {//组件类型搜索
...@@ -713,6 +713,7 @@ ...@@ -713,6 +713,7 @@
}); });
}, },
editItem(row) {//编辑 editItem(row) {//编辑
this.getZuJianLeiXingSelect(null);
this.add_dialog3 = true; this.add_dialog3 = true;
this.is_add_edit = 'edit'; this.is_add_edit = 'edit';
this.ruleForm.let1 = row.assetName; this.ruleForm.let1 = row.assetName;
...@@ -748,7 +749,7 @@ ...@@ -748,7 +749,7 @@
assetId: [row.assetId], assetId: [row.assetId],
state: row.state, state: row.state,
delFlag: 1, delFlag: 1,
assetConstant: this.assetConstant, archiType: this.archiType,
} }
deleteSystemTable(params).then(res => { deleteSystemTable(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
...@@ -799,7 +800,7 @@ ...@@ -799,7 +800,7 @@
this.elementTree.forEach(item => { this.elementTree.forEach(item => {
if(item.checkedCities.length > 0) { if(item.checkedCities.length > 0) {
extend.push({ extend.push({
assetConstant: item.archiType, archiType: item.archiType,
assetIdList: item.checkedCities assetIdList: item.checkedCities
}) })
} }
...@@ -847,7 +848,7 @@ ...@@ -847,7 +848,7 @@
archiAssetState: this.searchParams.archiAssetState, archiAssetState: this.searchParams.archiAssetState,
archiStage: this.searchParams.archiStage, archiStage: this.searchParams.archiStage,
archiBelongId: this.archiBelongId, archiBelongId: this.archiBelongId,
assetConstant: this.assetConstant, archiType: this.archiType,
// archiAssetTypeId: this.archiAssetTypeId, // archiAssetTypeId: this.archiAssetTypeId,
archiEleId: this.ruleForm.let4, archiEleId: this.ruleForm.let4,
assetName: this.ruleForm.let1, assetName: this.ruleForm.let1,
...@@ -864,6 +865,7 @@ ...@@ -864,6 +865,7 @@
appCode: this.showSelectTitle.appCode, appCode: this.showSelectTitle.appCode,
appName: this.showSelectTitle.appName, appName: this.showSelectTitle.appName,
isExtend: 0, isExtend: 0,
state: 2
} }
if(this.is_add_edit == 'add') { if(this.is_add_edit == 'add') {
addSystemTable(params).then(res => { addSystemTable(params).then(res => {
...@@ -914,7 +916,7 @@ ...@@ -914,7 +916,7 @@
const params = { const params = {
assetId: row.assetId, assetId: row.assetId,
state: 0, state: 0,
assetConstant: this.assetConstant, archiType: this.archiType,
} }
editSystemTable(params).then(res => { editSystemTable(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
...@@ -948,7 +950,7 @@ ...@@ -948,7 +950,7 @@
const params = { const params = {
assetId: row.assetId, assetId: row.assetId,
state: 1, state: 1,
assetConstant: this.assetConstant, archiType: this.archiType,
} }
editSystemTable(params).then(res => { editSystemTable(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
...@@ -1096,7 +1098,7 @@ ...@@ -1096,7 +1098,7 @@
}); });
const params = { const params = {
assetId: assetIdArray, assetId: assetIdArray,
assetConstant: this.assetConstant, archiType: this.archiType,
// archiAssetTypeId: this.archiAssetTypeId, // archiAssetTypeId: this.archiAssetTypeId,
}; };
MessageBox.confirm('确定删除?', '提示', { MessageBox.confirm('确定删除?', '提示', {
......
src/views/archi-view-manage/index.vue
...@@ -198,7 +198,7 @@ export default { ...@@ -198,7 +198,7 @@ export default {
}, },
addStatus: null, addStatus: null,
graphGroup: null, graphGroup: null,
assetConstant: null, archiType: null,
}; };
}, },
mounted(){ mounted(){
...@@ -441,7 +441,7 @@ export default { ...@@ -441,7 +441,7 @@ export default {
localStorage.setItem('commonGraph', JSON.stringify({ show: true, graph: res2[0].dataEle })); localStorage.setItem('commonGraph', JSON.stringify({ show: true, graph: res2[0].dataEle }));
localStorage.setItem('standardGraph', JSON.stringify({ show: true, graph: res2[1].dataEle })); localStorage.setItem('standardGraph', JSON.stringify({ show: true, graph: res2[1].dataEle }));
localStorage.setItem('joinGraph', JSON.stringify({ state: 2, graph: res2[2].dataEle })); localStorage.setItem('joinGraph', JSON.stringify({ state: 2, graph: res2[2].dataEle }));
this.$router.push( `/main/archiViewManageDetails?id=${id}&info=${this.graphGroup}&viewId=${this.viewId}&assetConstant=${this.assetConstant}`, () => {}, () => {} ); this.$router.push( `/main/archiViewManageDetails?id=${id}&info=${this.graphGroup}&viewId=${this.viewId}&assetConstant=${this.archiType}`, () => {}, () => {} );
}); });
} }
}); });
...@@ -454,7 +454,7 @@ export default { ...@@ -454,7 +454,7 @@ export default {
delFlag: 0, delFlag: 0,
state: 1, state: 1,
archiBelongId: this.graphGroup, archiBelongId: this.graphGroup,
assetConstant: this.assetConstant, archiType: this.archiType,
archiViewId: this.viewId archiViewId: this.viewId
} }
queryArchiGraph(params).then(res => { queryArchiGraph(params).then(res => {
...@@ -473,7 +473,7 @@ export default { ...@@ -473,7 +473,7 @@ export default {
treeClick(data, node, e) {//树点击的时候 treeClick(data, node, e) {//树点击的时候
if(!data.subList) { if(!data.subList) {
this.graphGroup = node.parent.data.viewId; this.graphGroup = node.parent.data.viewId;
this.assetConstant = node.parent.data.archiType; this.archiType = node.parent.data.archiType;
this.viewId = data.viewId; this.viewId = data.viewId;
this.pager1.current = 1; this.pager1.current = 1;
this.pager2.current = 1; this.pager2.current = 1;
...@@ -498,7 +498,7 @@ export default { ...@@ -498,7 +498,7 @@ export default {
getArchiViewManage(params).then(res => { getArchiViewManage(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.graphGroup = res.data[0].viewId; this.graphGroup = res.data[0].viewId;
this.assetConstant = res.data[0].archiType; this.archiType = res.data[0].archiType;
this.treeData[0].subList = res.data; this.treeData[0].subList = res.data;
this.treeDefaultExpand = [res.data[0].viewId]; this.treeDefaultExpand = [res.data[0].viewId];
this.currentNodekey = res.data[0].subList[0].viewId; this.currentNodekey = res.data[0].subList[0].viewId;
......
src/views/current-assets-list/tab1.vue
...@@ -170,7 +170,6 @@ export default { ...@@ -170,7 +170,6 @@ export default {
font-size: 14px; font-size: 14px;
color: #0D867F; color: #0D867F;
cursor: pointer; cursor: pointer;
margin-left: 15px;
} }
.cancel_version_btn{ .cancel_version_btn{
display: flex; display: flex;
......
src/views/current-assets-list/tab2.vue
...@@ -170,7 +170,6 @@ export default { ...@@ -170,7 +170,6 @@ export default {
font-size: 14px; font-size: 14px;
color: #0D867F; color: #0D867F;
cursor: pointer; cursor: pointer;
margin-left: 15px;
} }
.cancel_version_btn{ .cancel_version_btn{
display: flex; display: flex;
......
src/views/current-assets-list/tab3.vue
...@@ -171,7 +171,6 @@ export default { ...@@ -171,7 +171,6 @@ export default {
font-size: 14px; font-size: 14px;
color: #0D867F; color: #0D867F;
cursor: pointer; cursor: pointer;
margin-left: 15px;
} }
.cancel_version_btn{ .cancel_version_btn{
display: flex; display: flex;
......
src/views/current-assets-list/tab4.vue
...@@ -168,7 +168,6 @@ export default { ...@@ -168,7 +168,6 @@ export default {
font-size: 14px; font-size: 14px;
color: #0D867F; color: #0D867F;
cursor: pointer; cursor: pointer;
margin-left: 15px;
} }
.cancel_version_btn{ .cancel_version_btn{
display: flex; display: flex;
......
src/views/current-assets-list/tab5.vue
...@@ -168,7 +168,6 @@ export default { ...@@ -168,7 +168,6 @@ export default {
font-size: 14px; font-size: 14px;
color: #0D867F; color: #0D867F;
cursor: pointer; cursor: pointer;
margin-left: 15px;
} }
.cancel_version_btn{ .cancel_version_btn{
display: flex; display: flex;
......
src/views/etpManage/index.vue
...@@ -359,15 +359,17 @@ export default { ...@@ -359,15 +359,17 @@ export default {
} }
}else if (type == "del") { }else if (type == "del") {
// 删除 // 删除
this.formData = item; const params = {
this.formData.delFlag = 1; talentId: item.talentId,
delFlag: 1,
}
this.$confirm("确认删除吗", "提示", { this.$confirm("确认删除吗", "提示", {
confirmButtonText: "确定", confirmButtonText: "确定",
cancelButtonText: "取消", cancelButtonText: "取消",
confirmButtonClass: 'confirmClass', confirmButtonClass: 'confirmClass',
type: "warning" type: "warning"
}).then(() => { }).then(() => {
getETPManageUpdate(this.formData).then(res => { getETPManageUpdate(params).then(res => {
if (res.code == 200) { if (res.code == 200) {
this.$message.success("删除成功"); this.$message.success("删除成功");
this.getList(); this.getList();
......
src/views/reviewArchiFollowCheck/details.vue
<template> <template>
<div class="reviewArchiFollowCheckDetails"> <div class="reviewArchiFollowCheckDetails">
<el-tabs> <el-tabs v-model="activeName">
<el-tab-pane label="安全架构遵从"> <el-tab-pane label="安全架构遵从" name="1">
<Tab1></Tab1> <Tab1></Tab1>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="部署架构审查"> <el-tab-pane label="部署架构审查" name="2">
<Tab2></Tab2> <Tab2></Tab2>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="技术架构遵从"> <el-tab-pane label="技术架构遵从" name="3">
<Tab3></Tab3> <Tab3></Tab3>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="应用架构遵从"> <el-tab-pane label="应用架构遵从" name="4">
<Tab4></Tab4> <Tab4></Tab4>
</el-tab-pane> </el-tab-pane>
<el-tab-pane label="物理数据架构遵从"> <el-tab-pane label="物理数据架构遵从" name="5">
<Tab5></Tab5> <Tab5></Tab5>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
...@@ -43,11 +43,11 @@ ...@@ -43,11 +43,11 @@
}, },
data() { data() {
return { return {
routerId: null, activeName: '1'
}; };
}, },
mounted(){ mounted(){
this.activeName = this.$route.query.type;
}, },
methods: { methods: {
......
src/views/reviewArchiFollowCheck/tab1.vue
...@@ -9,9 +9,10 @@ ...@@ -9,9 +9,10 @@
</div> </div>
<div class="right_container"> <div class="right_container">
<el-alert title="评审内容" type="success" :closable="false"></el-alert> <el-alert title="评审内容" type="success" :closable="false"></el-alert>
<el-select v-model="select2" class="rightSelect"> <el-select v-model="select2" class="rightSelect" @change="select2Change">
<el-option label="1" value="1"></el-option> <el-option v-for="item in rightSelect" :key="item.viewDetailsId" :label="item.viewDetailName" :value="item.viewDetailsId"></el-option>
</el-select> </el-select>
<img :src="rightImageSrc" alt="">
</div> </div>
</div> </div>
<div class="bottom_container"> <div class="bottom_container">
...@@ -20,9 +21,9 @@ ...@@ -20,9 +21,9 @@
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<span style="margin-right: 50px;">评审意见</span> <span style="margin-right: 50px;">评审意见</span>
<el-radio v-model="radio" label="1">通过</el-radio> <el-radio v-model="radio" label="1">通过</el-radio>
<el-radio v-model="radio" label="2">不通过</el-radio> <el-radio v-model="radio" label="0">不通过</el-radio>
</div> </div>
<el-button type="primary" size="medium">带入批准</el-button> <el-button type="primary" size="medium" @click="saveSuggestion">带入批准</el-button>
</div> </div>
<el-input type="textarea" :rows="4" v-model="textarea" style="width: 98%;"></el-input> <el-input type="textarea" :rows="4" v-model="textarea" style="width: 98%;"></el-input>
</div> </div>
...@@ -31,7 +32,8 @@ ...@@ -31,7 +32,8 @@
<script> <script>
import { import {
getArchiViewManageTable getReviewArchiFollowCheckRightGraph,
saveReviewArchiFollowCheckRightSuggestion
} from '@/api/index.js'; } from '@/api/index.js';
import { MessageBox, Message } from 'element-ui'; import { MessageBox, Message } from 'element-ui';
export default { export default {
...@@ -45,13 +47,54 @@ export default { ...@@ -45,13 +47,54 @@ export default {
textarea: '', textarea: '',
select1: null, select1: null,
select2: null, select2: null,
rightImageSrc: null,
prjId: null,
rightSelect: []
}; };
}, },
mounted(){ mounted(){
this.prjId = this.$route.query.prjId;
this.getRightGraph(5);
}, },
methods: { methods: {
getRightGraph(archiBelongId) {//获取右侧图片
const params = {
archiBelongId: archiBelongId,
prjId: this.prjId,
}
getReviewArchiFollowCheckRightGraph(params).then(res => {
if (res.code == 200) {
if(res.data.length > 0) {
this.rightSelect = res.data;
this.select2 = res.data[0].viewDetailsId;
this.rightImageSrc = 'data:image/svg+xml;base64,'+ res.data[0].metaModelSvg;
}
}
})
},
select2Change(data) {//右侧下拉框选择
const res = this.rightSelect.find(item => item.viewDetailsId == data);
this.rightImageSrc = 'data:image/svg+xml;base64,'+ res.metaModelSvg;
},
saveSuggestion() {//保存
const params = {
"archiPrjReviewEnum": "CONFORMANCE_REVIEW",
"prjId": this.prjId,
"reviewState": this.radio,
"reviewSuggestion": this.textarea
}
saveReviewArchiFollowCheckRightSuggestion(params).then(res => {
if (res.code == 200) {
console.log(res.code)
}else {
Message({
type: "error",
message: res.msg,
});
}
})
}
} }
} }
</script> </script>
......
src/views/summaryArchiDesign/index.vue
...@@ -217,7 +217,7 @@ export default { ...@@ -217,7 +217,7 @@ export default {
], ],
}, },
graphGroup: null, graphGroup: null,
assetConstant: null, archiType: null,
}; };
}, },
mounted(){ mounted(){
...@@ -344,7 +344,7 @@ export default { ...@@ -344,7 +344,7 @@ export default {
getArchiViewManage(params).then(res => { getArchiViewManage(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.graphGroup = res.data[0].viewId; this.graphGroup = res.data[0].viewId;
this.assetConstant = res.data[0].archiType; this.archiType = res.data[0].archiType;
this.treeData[0].subList = res.data; this.treeData[0].subList = res.data;
this.currentNodekey = res.data[0].subList[0].viewId; this.currentNodekey = res.data[0].subList[0].viewId;
this.$nextTick(() => { this.$nextTick(() => {
...@@ -359,7 +359,7 @@ export default { ...@@ -359,7 +359,7 @@ export default {
treeClick(data, node, e) {//树点击的时候 treeClick(data, node, e) {//树点击的时候
if(!data.subList) { if(!data.subList) {
this.graphGroup = node.parent.data.viewId; this.graphGroup = node.parent.data.viewId;
this.assetConstant = node.parent.data.archiType; this.archiType = node.parent.data.archiType;
this.viewId = data.viewId; this.viewId = data.viewId;
this.pager.current = 1; this.pager.current = 1;
this.get_list(); this.get_list();
...@@ -408,7 +408,7 @@ export default { ...@@ -408,7 +408,7 @@ export default {
localStorage.setItem('commonGraph', JSON.stringify({ show: true, graph: [] })); localStorage.setItem('commonGraph', JSON.stringify({ show: true, graph: [] }));
localStorage.setItem('standardGraph', JSON.stringify({ show: true, graph: [] })); localStorage.setItem('standardGraph', JSON.stringify({ show: true, graph: [] }));
localStorage.setItem('joinGraph', JSON.stringify({ state: 2, graph: res.dataEle })); localStorage.setItem('joinGraph', JSON.stringify({ state: 2, graph: res.dataEle }));
this.$router.push( `/main/summaryArchiDesignDetails?id=${id}&info=${this.graphGroup}&viewId=${this.viewId}&assetConstant=${this.assetConstant}`, () => {}, () => {} ); this.$router.push( `/main/summaryArchiDesignDetails?id=${id}&info=${this.graphGroup}&viewId=${this.viewId}&assetConstant=${this.archiType}`, () => {}, () => {} );
}); });
} }
}); });
...@@ -421,7 +421,7 @@ export default { ...@@ -421,7 +421,7 @@ export default {
delFlag: 0, delFlag: 0,
state: 1, state: 1,
archiBelongId: this.graphGroup, archiBelongId: this.graphGroup,
assetConstant: this.assetConstant, archiType: this.archiType,
archiViewId: this.viewId, archiViewId: this.viewId,
prjId: this.showSelectTitle.prjId prjId: this.showSelectTitle.prjId
} }
......
src/views/systemArchiViewDesign/index.vue
...@@ -210,7 +210,7 @@ export default { ...@@ -210,7 +210,7 @@ export default {
], ],
}, },
graphGroup: null, graphGroup: null,
assetConstant: null, archiType: null,
}; };
}, },
mounted(){ mounted(){
...@@ -337,7 +337,7 @@ export default { ...@@ -337,7 +337,7 @@ export default {
getArchiViewManage(params).then(res => { getArchiViewManage(params).then(res => {
if(res.code == 200) { if(res.code == 200) {
this.graphGroup = res.data[0].viewId; this.graphGroup = res.data[0].viewId;
this.assetConstant = res.data[0].archiType; this.archiType = res.data[0].archiType;
this.treeData[0].subList = res.data; this.treeData[0].subList = res.data;
this.currentNodekey = res.data[0].subList[0].viewId; this.currentNodekey = res.data[0].subList[0].viewId;
this.$nextTick(() => { this.$nextTick(() => {
...@@ -352,7 +352,7 @@ export default { ...@@ -352,7 +352,7 @@ export default {
treeClick(data, node, e) {//树点击的时候 treeClick(data, node, e) {//树点击的时候
if(!data.subList) { if(!data.subList) {
this.graphGroup = node.parent.data.viewId; this.graphGroup = node.parent.data.viewId;
this.assetConstant = node.parent.data.archiType; this.archiType = node.parent.data.archiType;
this.viewId = data.viewId; this.viewId = data.viewId;
this.pager.current = 1; this.pager.current = 1;
this.get_list(); this.get_list();
...@@ -401,7 +401,7 @@ export default { ...@@ -401,7 +401,7 @@ export default {
localStorage.setItem('commonGraph', JSON.stringify({ show: true, graph: [] })); localStorage.setItem('commonGraph', JSON.stringify({ show: true, graph: [] }));
localStorage.setItem('standardGraph', JSON.stringify({ show: true, graph: [] })); localStorage.setItem('standardGraph', JSON.stringify({ show: true, graph: [] }));
localStorage.setItem('joinGraph', JSON.stringify({ state: 2, graph: res.dataEle })); localStorage.setItem('joinGraph', JSON.stringify({ state: 2, graph: res.dataEle }));
this.$router.push( `/main/systemArchiViewDesignDetails?id=${id}&info=${this.graphGroup}&viewId=${this.viewId}&assetConstant=${this.assetConstant}`, () => {}, () => {} ); this.$router.push( `/main/systemArchiViewDesignDetails?id=${id}&info=${this.graphGroup}&viewId=${this.viewId}&assetConstant=${this.archiType}`, () => {}, () => {} );
}); });
} }
}); });
...@@ -414,7 +414,7 @@ export default { ...@@ -414,7 +414,7 @@ export default {
delFlag: 0, delFlag: 0,
state: 1, state: 1,
archiBelongId: this.graphGroup, archiBelongId: this.graphGroup,
assetConstant: this.assetConstant, archiType: this.archiType,
archiViewId: this.viewId, archiViewId: this.viewId,
appId: this.showSelectTitle.appId appId: this.showSelectTitle.appId
} }
......
src/views/total-archi-property-document/index.vue
...@@ -50,7 +50,7 @@ ...@@ -50,7 +50,7 @@
<el-table-column prop="createTime" label="创建时间" align="center"></el-table-column> <el-table-column prop="createTime" label="创建时间" align="center"></el-table-column>
<el-table-column prop="fileName" label="附件" align="center"> <el-table-column prop="fileName" label="附件" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<span ><a :href="scope.row.fileUrl" :download="scope.row.fileName">{{scope.row.fileName}}</a></span> <a style="color: #0D867F;text-decoration: underline;" :href="scope.row.fileUrl" :download="scope.row.fileName">{{scope.row.fileName}}</a>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!