Skip to content

liangzhen / framework-tools-web

Go to a project
Commit fe426ac4 by liuyong
Options

修改bug

1 parent 4f391983
Expand all
Inline Side-by-side
Showing with 575 additions and 19 deletions
public/drawio/extention/js/exApp.js
...@@ -208,15 +208,8 @@ const leftCustomGraph = function(that) {//左侧自定义图形 ...@@ -208,15 +208,8 @@ const leftCustomGraph = function(that) {//左侧自定义图形
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);
// that.saveLibrary(libraryName, images, null, 'ajax', undefined, undefined, undefined);
}else { }else {
// const libraryName2 = item.arciBelongName;
// var xml = that.createLibraryDataFromImages([]);
// var file = new LocalLibrary(that, xml, libraryName2);
// that.libraryLoaded(file, []);
// that.saveLibrary(libraryName2, [], null, 'ajax', undefined, undefined, undefined);
} }
} }
}) })
......
public/drawio/extention/js/exGraph(旧).js 0 → 100644
/**
/**
* 动态获取架构设计的分层归属信息（业务架构、应用架构、数据架构、技术架构、安全架构等信息）
* 该方法可以将归属信息、元素信息带出
*/
// (function()// 旧代码--------------------------------------------------------------
// {
// Sidebar.prototype.addCustomGraph = function()
// {
// this.setCurrentSearchEntryLibrary('eachart');
// $.ajax({
// url: '/drawio/eachart.json', // 代表请求的服务器地址
// method: 'get', // 使用的请求方法
// contentType: 'application/x-www-form-urlencoded', // 请求的 enctype
// dataType: 'json', // 默认根据 response 头部的信息自动推测
// async: true, // 是否使用异步请求的方式
// }).done(data => {
// var ea = data.eadata;
// if(ea) {
// ea.forEach(ele => {
// var ii = ele.elements;
// var items = [];
// ii.forEach(element => {
// // items.push(this.createVertexTemplateEntry(element.styles, element.w, element.h, null, element.name, null, null, element.name));
// items.push(
// this.createEdgeTemplateEntry('endArrow=none;html=1;姓名=测试;', 50, 50, '', 'Line', null, 'simple undirected plain blank no')
// );
// });
// this.addPaletteFunctions(ea.id, ele.title, false, items);
// });
// }
// });
// // this.setCurrentSearchEntryLibrary();
// };
// })();
(function()
{
Sidebar.prototype.addCustomGraph = function()
{
const commonGraph_ = JSON.parse(localStorage.getItem('commonGraph'));
if(commonGraph_.show) {
const graphGroup = window.location.href.split("id=")[1].split("&")[1].split("=")[1];
const commonGraph = commonGraph_.graph.filter(item => item.arciBelongId == graphGroup);
this.sidebarTitles = true;//勾选标签
commonGraph.forEach(item => {
let fns = [];
item.eleDtos.forEach(item2 => {
if(item2.icon) {
if(item2.icon.includes('data')) {
let attr_ = [];
if(item2.dicys && item2.dicys.length > 0) {
item2.dicys.forEach(res => {
if(res.fieldName) {
attr_.push(
{
name: res.fieldName,
value: res.propertyValue,
id: res.propertyId,
controlType: res.controlType,
}
)
}
})
}
fns.push(
item2.color ? this.createVertexTemplateEntry(
item2.iconName + ';fillColor=' + item2.color + ';' + 'attr=' + JSON.stringify(attr_) + ';eleId=' + item2.eleBelongId + ';eaLevel=' + item2.eaLevel + ';',
item2.shapeWidth ? item2.shapeWidth : 150,
item2.shapeHeight ? item2.shapeHeight : 75,
null,
item2.eleName,
null,
null,
'封闭图形2'
) : this.createEdgeTemplateEntry(
item2.iconName + 'attr=' + JSON.stringify(attr_),
item2.shapeWidth ? item2.shapeWidth : 150,
item2.shapeHeight ? item2.shapeHeight : 75,
'',
item2.elementName,
null,
'非封闭图形2'
)
)
}
}
})
this.addPaletteFunctions(item.arciBelongId, item.arciBelongName, true, fns);
});
// $.ajax({
// url: '/drawio/eachart.json', // 代表请求的服务器地址
// method: 'get', // 使用的请求方法
// contentType: 'application/x-www-form-urlencoded', // 请求的 enctype
// dataType: 'json', // 默认根据 response 头部的信息自动推测
// async: true, // 是否使用异步请求的方式
// }).done(data => {
// var ea = data.eadata;
// if(ea) {
// ea.forEach(ele => {
// var ii = ele.elements;
// var items = [];
// ii.forEach(element => {
// // items.push(this.createVertexTemplateEntry(element.styles, element.w, element.h, null, element.name, null, null, element.name));
// items.push(
// this.createEdgeTemplateEntry('endArrow=none;html=1;姓名=测试;', 50, 50, '', 'Line', null, 'simple undirected plain blank no')
// );
// });
// this.addPaletteFunctions(ea.id, ele.title, false, items);
// });
// }
// });
}
};
})();
\ No newline at end of file
src/api/index.js
...@@ -451,3 +451,7 @@ export function evoluteFunAndLineDeleteMore(params) { ...@@ -451,3 +451,7 @@ export function evoluteFunAndLineDeleteMore(params) {
export function evoluteFunAndLineAdd(params) { export function evoluteFunAndLineAdd(params) {
return post('/network/arc-at-ev-road/ad', params); return post('/network/arc-at-ev-road/ad', params);
} }
// 架构视图左侧图元
export function queryArchiGraph(params) {
return post('/network/arc-ast-cn/assetTree', params);
}
\ No newline at end of file
src/views/archi-view-manage/index.vue
...@@ -140,7 +140,8 @@ import { ...@@ -140,7 +140,8 @@ import {
deleteArchiViewManage, deleteArchiViewManage,
queryArchiViewManageCardDetails, queryArchiViewManageCardDetails,
getDrawioLeftCommonGraph, getDrawioLeftCommonGraph,
getDrawioLeftStandardGraph getDrawioLeftStandardGraph,
queryArchiGraph
} from '@/api/index.js'; } from '@/api/index.js';
import { MessageBox, Message } from 'element-ui'; import { MessageBox, Message } from 'element-ui';
import $ from 'jquery'; import $ from 'jquery';
...@@ -437,12 +438,18 @@ export default { ...@@ -437,12 +438,18 @@ export default {
localStorage.setItem('xmlTitle', xmlTitle); localStorage.setItem('xmlTitle', xmlTitle);
Promise.all([ this.queryDrawioGraph(id), this.queryDrawioGraph2(id) ]).then(res2 => { Promise.all([ this.queryDrawioGraph(id), this.queryDrawioGraph2(id) ]).then(res2 => {
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: false, graph: res2[1].dataEle })); localStorage.setItem('standardGraph', JSON.stringify({ show: true, graph: res2[1].dataEle }));
this.$router.push( `/main/archiViewManageDetails?id=${id}&info=${this.graphGroup}`, () => {}, () => {} );
}); });
} }
}); });
}, },
queryArchiGraph() {//查询综合图
queryArchiGraph({}).then(res => {
console.log(res)
localStorage.setItem('joinGraph', JSON.stringify({ graph1: res2[1].dataEle, graph2: [] }));
})
},
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;
......
src/views/archiEleRela/index.vue
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
:title="title" :title="title"
:visible.sync="add_dialog" :visible.sync="add_dialog"
:center="false" :center="false"
class="dialog1"
width="60%"> width="60%">
<div class="add_dialog_content"> <div class="add_dialog_content">
<el-form :model="formData" :rules="rules" ref="relaForm"> <el-form :model="formData" :rules="rules" ref="relaForm">
...@@ -156,6 +157,25 @@ ...@@ -156,6 +157,25 @@
</div> </div>
</div> </div>
</div> </div>
<div style="text-align: right;margin: 20px 0 10px 0;">
<el-button type="primary" size="mini" @click="openDicyDialog">新增</el-button>
</div>
<el-table height="300" :data="tableData2" stripe border>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="fieldName" label="字段名" align="center"></el-table-column>
<el-table-column prop="cnName" label="中文名" align="center"></el-table-column>
<el-table-column prop="displayOrder" label="排序" align="center"></el-table-column>
<el-table-column prop="contentLength" label="长度" align="center"></el-table-column>
<el-table-column prop="controlType" label="控件" align="center"></el-table-column>
<el-table-column label="操作" width="260" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<el-button icon="el-icon-edit" type="primary" size="mini" @click="edit_dicy(scope.row)">编辑</el-button>
<el-button class="shanChu_btn" icon="el-icon-delete" size="mini" @click="delete_dicy(scope.row)">删除</el-button>
</div>
</template>
</el-table-column>
</el-table>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operate('pushAdd')">发布</el-button> <el-button class="greenButton" @click="operate('pushAdd')">发布</el-button>
...@@ -165,6 +185,57 @@ ...@@ -165,6 +185,57 @@
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="编辑字典属性"
:visible.sync="dicy_dialog"
:center="false"
:close-on-click-modal="false"
width="60%">
<el-form :model="ruleForm2" ref="form2" :rules="rules2" style="display: flex;flex-wrap: wrap;">
<el-form-item label="字段名:" prop="let1">
<el-input v-no-backslash v-model="ruleForm2.let1" maxlength="100" :rules="[
{ required: true, message: '请输入字段名', trigger: 'blur' },
]"></el-input>
</el-form-item>
<el-form-item label="中文名:" prop="let2">
<el-input v-no-backslash v-model="ruleForm2.let2" maxlength="100" :rules="[
{ required: true, message: '请输入中文名', trigger: 'blur' },
]"></el-input>
</el-form-item>
<el-form-item label="排序:" prop="let3">
<el-input-number style="width: 200px;" v-model="ruleForm2.let3" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="长度:" prop="let4">
<el-input-number style="width: 200px;" v-model="ruleForm2.let4" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="是否可以展示:" prop="let5">
<el-radio-group v-model="ruleForm2.let5">
<el-radio label="是"></el-radio>
<el-radio label="否"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否展示:" prop="let6">
<el-radio-group v-model="ruleForm2.let6">
<el-radio label="显示"></el-radio>
<el-radio label="不显示"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="控件:" prop="let7" :rules="[
{ required: true, message: '请选择控件', trigger: 'change' },
]">
<el-select clearable placeholder="请选择" v-model="ruleForm2.let7">
<el-option label="单行文本框" value="0"></el-option>
<el-option label="多行文本框" value="1"></el-option>
<el-option label="下拉框" value="2"></el-option>
</el-select>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="save_dicy">保存</el-button>
<el-button @click="dicy_dialog = false">取消</el-button>
</span>
</el-dialog>
<el-dialog
title="查看约束条件" title="查看约束条件"
:visible.sync="add_dialog3" :visible.sync="add_dialog3"
:center="false" :center="false"
...@@ -214,6 +285,28 @@ export default { ...@@ -214,6 +285,28 @@ export default {
}, },
data() { data() {
return { return {
dicy_dialog: false,
ruleForm2: {
let1: null,
let2: null,
let3: 0,
let4: 0,
let5: '是',
let6: '显示',
let7: null,
},
rules2: {
let1: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
let2: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
let7: [
{ required: true, message: '请选择控件', trigger: 'change' },
],
},
tableData2: [],
tableData: [], tableData: [],
selectList: [], selectList: [],
add_dialog: false, add_dialog: false,
...@@ -322,7 +415,7 @@ export default { ...@@ -322,7 +415,7 @@ export default {
belongId: 0, belongId: 0,
} }
], ],
is_add_edit2: 'add'
}; };
}, },
mounted() { mounted() {
...@@ -341,6 +434,35 @@ export default { ...@@ -341,6 +434,35 @@ export default {
created() { created() {
}, },
methods: { methods: {
edit_dicy(row){//编辑字典
this.is_add_edit2 = 'edit';
},
delete_dicy(row){//删除字典
},
openDicyDialog() {//打开字典窗口
this.dicy_dialog = true;
this.is_add_edit2 = 'add';
this.$nextTick(() => {
this.$refs.form2.resetFields();
this.ruleForm2.let1 = null;
this.ruleForm2.let2 = null;
this.ruleForm2.let3 = 0;
this.ruleForm2.let4 = 0;
this.ruleForm2.let5 = '是';
this.ruleForm2.let6 = '显示';
this.ruleForm2.let7 = null;
});
},
save_dicy() {//字典窗口保存
this.$refs.form2.validate(valid => {
if(valid) {
}else {
return false;
}
});
},
// 查询列表 // 查询列表
getList() { getList() {
if (this.params.state != '') { if (this.params.state != '') {
...@@ -708,6 +830,25 @@ export default { ...@@ -708,6 +830,25 @@ export default {
} }
} }
} }
.el-button--primary{
background: rgba(13,134,127,0.1);
color: #0D867F;
border: 0;
}
/deep/ .dialog1 .el-dialog__body{
height: 55vh;
overflow-y: auto;
}
/deep/ .el-dialog__header{
background-color: #0D867F;
text-align: left;
}
/deep/ .el-dialog__title{
color: #fff;
}
/deep/ .el-dialog__close {
color: #fff;
}
.search_menu{ .search_menu{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -842,6 +983,11 @@ export default { ...@@ -842,6 +983,11 @@ export default {
width: 100%; width: 100%;
} }
} }
.el-form-item{
display: flex;
align-items: center;
width: 33%;
}
.dialog_form_item{ .dialog_form_item{
display: flex; display: flex;
align-items: center; align-items: center;
......
src/views/archiViewConfig/index.vue
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
:title="title" :title="title"
:visible.sync="add_dialog" :visible.sync="add_dialog"
top="4%" top="4%"
class="dialog1"
:center="false" :center="false"
width="60%"> width="60%">
<div class="add_dialog_content"> <div class="add_dialog_content">
...@@ -130,6 +131,27 @@ ...@@ -130,6 +131,27 @@
<el-table-column prop="rsName" label="元素关系名称" align="center"></el-table-column> <el-table-column prop="rsName" label="元素关系名称" align="center"></el-table-column>
</el-table> </el-table>
</div> </div>
<div style="text-align: right;margin: 20px 0 10px 0;width: 96%;">
<el-button type="primary" size="mini" @click="openDicyDialog">新增</el-button>
</div>
<div class="dialog_form_item">
<el-table height="300" :data="tableData3" stripe border>
<el-table-column type="index" label="序号" width="80" align="center"></el-table-column>
<el-table-column prop="fieldName" label="字段名" align="center"></el-table-column>
<el-table-column prop="cnName" label="中文名" align="center"></el-table-column>
<el-table-column prop="displayOrder" label="排序" align="center"></el-table-column>
<el-table-column prop="contentLength" label="长度" align="center"></el-table-column>
<el-table-column prop="controlType" label="控件" align="center"></el-table-column>
<el-table-column label="操作" width="260" align="center">
<template slot-scope="scope">
<div style="display: flex;align-items: center;justify-content: center;">
<el-button icon="el-icon-edit" type="primary" size="mini" @click="edit_dicy(scope.row)">编辑</el-button>
<el-button class="shanChu_btn" icon="el-icon-delete" size="mini" @click="delete_dicy(scope.row)">删除</el-button>
</div>
</template>
</el-table-column>
</el-table>
</div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="operate('pushAdd')">发布</el-button> <el-button class="greenButton" @click="operate('pushAdd')">发布</el-button>
...@@ -137,6 +159,61 @@ ...@@ -137,6 +159,61 @@
<el-button @click="add_dialog = false">取消</el-button> <el-button @click="add_dialog = false">取消</el-button>
</span> </span>
</el-dialog> </el-dialog>
<el-dialog
title="编辑字典属性"
:visible.sync="dicy_dialog"
:center="false"
:close-on-click-modal="false"
width="60%">
<el-form :model="ruleForm2" ref="form2" :rules="rules2" style="display: flex;flex-wrap: wrap;">
<el-form-item label="字段名:" prop="let1">
<el-input v-no-backslash v-model="ruleForm2.let1" maxlength="100" :rules="[
{ required: true, message: '请输入字段名', trigger: 'blur' },
]"></el-input>
</el-form-item>
<el-form-item label="中文名:" prop="let2">
<el-input v-no-backslash v-model="ruleForm2.let2" maxlength="100" :rules="[
{ required: true, message: '请输入中文名', trigger: 'blur' },
]"></el-input>
</el-form-item>
<el-form-item label="排序:" prop="let3">
<el-input-number style="width: 200px;" v-model="ruleForm2.let3" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="长度:" prop="let4">
<el-input-number style="width: 200px;" v-model="ruleForm2.let4" :min="0"></el-input-number>
</el-form-item>
<el-form-item label="是否可以展示:" prop="let5">
<el-radio-group v-model="ruleForm2.let5">
<el-radio label="是"></el-radio>
<el-radio label="否"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="是否展示:" prop="let6">
<el-radio-group v-model="ruleForm2.let6">
<el-radio label="显示"></el-radio>
<el-radio label="不显示"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="控件:" prop="let7">
<el-select clearable placeholder="请选择" v-model="ruleForm2.let7">
<el-option label="单行文本框" value="0"></el-option>
<el-option label="多行文本框" value="1"></el-option>
<el-option label="下拉框" value="2"></el-option>
</el-select>
</el-form-item>
<el-form-item v-if="ruleForm2.let7 == 2" label="控件值:" prop="let8">
<el-select v-model="ruleForm2.let8" placeholder="请选择" clearable>
<el-option v-for="(item,idnex) in controlValueSelect" :key="idnex" :label="item.name" :value="item.typeValue"></el-option>
</el-select>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
<el-button class="greenButton" @click="save_dicy">保存</el-button>
<el-button @click="dicy_dialog = false">取消</el-button>
</span>
</el-dialog>
</div> </div>
</template> </template>
...@@ -153,7 +230,13 @@ import { ...@@ -153,7 +230,13 @@ import {
gtEleRelList, gtEleRelList,
query_jia_gou_gui_shu, query_jia_gou_gui_shu,
query_jia_gou_ceng_ci, query_jia_gou_ceng_ci,
getYMXZDGLProyList,
gAllDictKey,
getYMXZDGLProyAdd,
getYMXZDGLProyUpdate,
getYMXZDGLProyDel
} from "@/api/index.js"; } from "@/api/index.js";
import { MessageBox, Message } from 'element-ui';
export default { export default {
name: 'archiViewConfig', name: 'archiViewConfig',
...@@ -162,6 +245,33 @@ export default { ...@@ -162,6 +245,33 @@ export default {
}, },
data() { data() {
return { return {
dicy_dialog: false,
controlValueSelect: [],
is_add_edit2: 'add',
propertyId: null,
ruleForm2: {
let1: null,
let2: null,
let3: 0,
let4: 0,
let5: '是',
let6: '显示',
let7: null,
let8: null,
},
rules2: {
let1: [
{ required: true, message: '请输入字段名', trigger: 'blur' },
],
let2: [
{ required: true, message: '请输入中文名', trigger: 'blur' },
],
let7: [
{ required: true, message: '请选择控件', trigger: 'change' },
],
},
viewId: null,
tableData3: [],
tableData: [], tableData: [],
selectList: [], selectList: [],
add_dialog: false, add_dialog: false,
...@@ -244,6 +354,7 @@ export default { ...@@ -244,6 +354,7 @@ export default {
selectData2: [], selectData2: [],
selectData3: [], selectData3: [],
selectData4: [], selectData4: [],
}; };
}, },
mounted() { mounted() {
...@@ -265,6 +376,139 @@ export default { ...@@ -265,6 +376,139 @@ export default {
}, },
methods: { methods: {
queryAllKey() {//查询控件右边的下拉框值
gAllDictKey().then(res => {
this.controlValueSelect = res.data;
})
},
edit_dicy(row){//编辑字典
this.dicy_dialog = true;
this.is_add_edit2 = 'edit';
this.queryAllKey();
this.propertyId = row.propertyId;
this.ruleForm2.let1 = row.fieldName;
this.ruleForm2.let2 = row.cnName;
this.ruleForm2.let3 = row.displayOrder;
this.ruleForm2.let4 = row.contentLength;
this.ruleForm2.let5 = row.notNull == '0' ? '是' : '否';
this.ruleForm2.let6 = row.isShow == '0' ? '显示' : '不显示';
this.ruleForm2.let7 = String(row.controlType);
this.ruleForm2.let8 = row.dictKey;
},
delete_dicy(row){//删除字典
MessageBox.confirm('确定删除?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
customClass: 'messageClass',
confirmButtonClass: 'confirmClass',
type: 'warning'
}).then(() => {
const params = {
propertyId: row.propertyId,
}
getYMXZDGLProyDel(params).then(res => {
if(res.code == 200) {
this.getDicyTable();
Message({
type: 'success',
message: '删除成功!'
});
}else{
Message({
type: 'error',
message: res.msg
});
}
});
}).catch(() => {
Message({
type: 'info',
message: '已取消'
});
});
},
openDicyDialog() {//打开字典窗口
this.dicy_dialog = true;
this.is_add_edit2 = 'add';
this.$nextTick(() => {
this.$refs.form2.resetFields();
this.ruleForm2.let1 = null;
this.ruleForm2.let2 = null;
this.ruleForm2.let3 = 0;
this.ruleForm2.let4 = 0;
this.ruleForm2.let5 = '是';
this.ruleForm2.let6 = '显示';
this.ruleForm2.let7 = null;
this.ruleForm2.let8 = null;
});
this.queryAllKey();
},
save_dicy() {//字典窗口保存
this.$refs.form2.validate(valid => {
if(valid) {
const params = {
fieldName: this.ruleForm2.let1,
cnName: this.ruleForm2.let2,
displayOrder: this.ruleForm2.let3,
contentLength: this.ruleForm2.let4,
controlType: this.ruleForm2.let7,
type: 3,
typeId: this.viewId,
dictKey: this.ruleForm2.let8,
notNull: this.ruleForm2.let5 == '是' ? 0 : 1,
isShow: this.ruleForm2.let6 == '显示' ? 0 : 1,
};
const requestParams = this.is_add_edit2 == 'add' ? params : { ...params, propertyId: this.propertyId };
if(this.is_add_edit2 == 'add') {
getYMXZDGLProyAdd(requestParams).then(res => {
if(res.code == 200) {
this.dicy_dialog = false;
this.getDicyTable();
Message({
type: 'success',
message: '保存成功!'
});
}else {
Message({
type: 'error',
message: res.msg
});
}
});
}else {
getYMXZDGLProyUpdate(requestParams).then(res => {
if (res.code == 200) {
this.dicy_dialog = false;
this.getDicyTable();
Message({
type: 'success',
message: '保存成功!'
});
}else{
Message({
type: 'error',
message: res.msg
});
}
});
}
}else {
return false;
}
});
},
getDicyTable() {//字典表格
const params = {
type: 3,
typeId: this.viewId
}
getYMXZDGLProyList(params).then(res => {
if (res.code == 200) {
this.tableData3 = res.data;
}
});
},
// 获取下拉 // 获取下拉
getLevelList() { getLevelList() {
query_jia_gou_ceng_ci().then(res => { query_jia_gou_ceng_ci().then(res => {
...@@ -359,6 +603,9 @@ export default { ...@@ -359,6 +603,9 @@ export default {
this.title = "编辑架构视图"; this.title = "编辑架构视图";
this.resetForm(); this.resetForm();
this.viewId = item.viewId;
this.getDicyTable();
this.formData = item; this.formData = item;
if (item.eleName) { if (item.eleName) {
this.selectData1 = item.eleName.split(","); this.selectData1 = item.eleName.split(",");
...@@ -599,7 +846,29 @@ export default { ...@@ -599,7 +846,29 @@ export default {
}, },
} }
</script> </script>
<style>
.confirmClass{
background-color: #0D867F !important;
}
.el-message-box__content{
padding: 60px 15px 60px 15px;
}
</style>
<style lang="scss" scoped> <style lang="scss" scoped>
.el-button--primary{
background: rgba(13,134,127,0.1);
color: #0D867F;
border: 0;
}
.el-form-item{
display: flex;
align-items: center;
width: 33%;
}
.shanChu_btn{
color: #DD6A15;
background-color: #F8EBE2;
}
.JiaGouYuanShuGuanLi{ .JiaGouYuanShuGuanLi{
width: 100%; width: 100%;
height: 100%; height: 100%;
...@@ -608,6 +877,20 @@ export default { ...@@ -608,6 +877,20 @@ export default {
justify-content: flex-start; justify-content: flex-start;
align-items: center; align-items: center;
} }
/deep/ .dialog1 .el-dialog__body{
height: 55vh;
overflow-y: auto;
}
/deep/ .el-dialog__header{
background-color: #0D867F;
text-align: left;
}
/deep/ .el-dialog__title{
color: #fff;
}
/deep/ .el-dialog__close {
color: #fff;
}
.form_item_container{ .form_item_container{
display: flex; display: flex;
flex-wrap: wrap; flex-wrap: wrap;
......
src/views/metaModelDic/pages/page1.vue
...@@ -601,19 +601,14 @@ export default { ...@@ -601,19 +601,14 @@ export default {
this.$refs.page1Form.validate(valid => { this.$refs.page1Form.validate(valid => {
if(valid) { if(valid) {
if (this.formData2.propertyId) { if (this.formData2.propertyId) {
let params = { let params = {
fieldName: this.formData2.fieldName, fieldName: this.formData2.fieldName,
cnName: this.formData2.cnName, cnName: this.formData2.cnName,
displayOrder: this.formData2.displayOrder, displayOrder: this.formData2.displayOrder,
contentLength: this.formData2.contentLength, contentLength: this.formData2.contentLength,
controlType: this.formData2.controlType, controlType: this.formData2.controlType,
propertyId: this.formData2.propertyId,
type: this.formData.type, type: this.formData.type,
typeId: this.formData.typeId, typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
dictKey: this.formData2.dictKey, dictKey: this.formData2.dictKey,
notNull: this.formData2.notNull, notNull: this.formData2.notNull,
isShow: this.formData2.isShow, isShow: this.formData2.isShow,
...@@ -639,9 +634,6 @@ export default { ...@@ -639,9 +634,6 @@ export default {
controlType: this.formData2.controlType, controlType: this.formData2.controlType,
type: this.formData.type, type: this.formData.type,
typeId: this.formData.typeId, typeId: this.formData.typeId,
version: this.formData.version,
dicyId: this.formData.dicyId,
state: this.formData.state,
dictKey: this.formData2.dictKey, dictKey: this.formData2.dictKey,
notNull: this.formData2.notNull, notNull: this.formData2.notNull,
isShow: this.formData2.isShow, isShow: this.formData2.isShow,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!