Commit 8ad34154 by liuyong

修改菜单

1 parent ae30e62e
......@@ -33,6 +33,6 @@ var loadDiagram = function (id, diagramTitle) {
console.log(error);
}
});
console.log(resultData);
// console.log(resultData);
return resultData;
}
\ No newline at end of file
......@@ -257,7 +257,7 @@
};
var t0 = new Date();
console.log(urlParams)
// Changes paths for local development environment
if (urlParams['dev'] == '1')
{
......
......@@ -3756,9 +3756,6 @@ App.prototype.showSplash = function(force)
// }
// });
if (this.editor.isChromelessView())
{
this.handleError({message: mxResources.get('noFileSelected')},
......@@ -3766,35 +3763,22 @@ App.prototype.showSplash = function(force)
{
this.showSplash();
}));
}
else if (urlParams['id'] == 1) {//二次开发----如果有id,表示打开了一个存在的文档,进入编辑模式,这里的mockFile只是个例子,元模型管理
var mockFile = loadDiagram(urlParams['id'],'元模型管理');
// this.setDatabaseItem('.draft_' + Editor.guid(), JSON.stringify(draft));
const file = new LocalFile(this, mockFile.data, mockFile.title, this.mode);
this.loadFile(`-1`, true, file);
}else if (urlParams['id'] == 2) {//二次开发----如果有id,表示打开了一个存在的文档,进入编辑模式,这里的mockFile只是个例子,业务架构资产管理
var mockFile = loadDiagram(urlParams['id'],'业务架构资产管理');
const draft2 = {
type: 'draft',
created: new Date().getTime(),
modified: new Date().getTime(),
data: mockFile.data,
title: mockFile.title,
fileObject: null,
aliveCheck: null
};
// this.setDatabaseItem('.draft_' + Editor.guid(), JSON.stringify(draft2));
const file = new LocalFile(this, mockFile.data, mockFile.title, this.mode);
this.loadFile(`-2`, true, file);
}
else if (!mxClient.IS_CHROMEAPP && (this.mode == null || force))
}else if (urlParams['id']) {//二次开发,初始化画面内容
console.log(urlParams);
$.ajax({
method: "get",
url: "http://192.168.148.128:7003/api/ynMol/getByMetaModelId",
data: { metaModelId: urlParams['id'] },
success: result => {
console.log(result)
// const file = new LocalFile(this, result.data.content, '测试文件', this.mode);
// this.loadFile(`-1`, true, file);
},
error: function( error ) {
}
});
}else if (!mxClient.IS_CHROMEAPP && (this.mode == null || force))
{
var rowLimit = (serviceCount == 4) ? 2 : 3;
......@@ -3806,8 +3790,7 @@ App.prototype.showSplash = function(force)
this.showDialog(dlg.container, (rowLimit < 3) ? 200 : 300,
((serviceCount > 3) ? 320 : 210), true, false);
}
else if (urlParams['create'] == null)
}else if (urlParams['create'] == null)
{
showSecondDialog();
}
......
<template>
<iframe class="drawio_show" name="content_frame" :src="'/drawio/index.html?id='+this.initGraphId" frameborder=0 scrolling="no"></iframe>
<iframe class="drawio_show" name="content_frame" :src="'/drawio/index.html?id='+ initGraphId_" frameborder=0 scrolling="no"></iframe>
</template>
<script>
export default {
props: {
initGraphId: Number
initGraphId: String
},
data() {
return {
initGraphId_: null
};
},
watch: {
initGraphId: {
handler(newVal, oldVal) {
this.initGraphId_ = newVal;
},
}
},
mounted(){
// console.log(this.initGraphId)
},
}
</script>
......
......@@ -20,9 +20,9 @@ const routes = [
component: () => import(/* webpackChunkName: "about" */ '../views/Main/index.vue'),
children: [
{
path: '/main/JiaGouYuanSuGuanLi',//架构元素管理
name: 'JiaGouYuanSuGuanLi',
component: () => import('@/views/JiaGouYuanSuGuanLi/index.vue'),
path: '/main/archiEleList',//架构元素管理
name: 'archiEleList',
component: () => import('@/views/archi-ele-list/index.vue'),
},
{
path: '/main/JiaGouYuanSuGuanXiGuanLi',//架构元素关系管理
......@@ -40,9 +40,9 @@ const routes = [
component: () => import('@/views/JiaGouYMXZD/index.vue'),
},
{
path: '/main/YeWuZiChanGuanLi',//业务架构资产管理
name: 'YeWuZiChanGuanLi',
component: () => import('@/views/YeWuZiChanGuanLi/index.vue'),
path: '/main/busiAssetslist',//业务架构资产管理
name: 'busiAssetslist',
component: () => import('@/views/busi-assets-list/index.vue'),
},
// {
// path: '/main/YuanMoXingGuanLiCanvas',//元模型管理画布
......@@ -55,14 +55,14 @@ const routes = [
component: () => import('@/views/wenDangDemo/index.vue'),
},
{
path: '/main/YuanMoXingGuanLi',//元模型管理
name: 'YuanMoXingGuanLi',
component: () => import('@/views/YuanMoXingGuanLi/index.vue'),
path: '/main/metaModelList',//元模型管理
name: 'metaModelList',
component: () => import('@/views/meta-model-list/index.vue'),
},
{
path: '/main/YuanMoXingGuanLiDetails',//元模型管理详情
name: 'YuanMoXingGuanLiDetails',
component: () => import('@/views/YuanMoXingGuanLi/details.vue'),
path: '/main/metaModelListDetails/:id',//元模型管理详情
name: 'metaModelListDetails',
component: () => import('@/views/meta-model-list/details.vue'),
}
// {
// path: '/main/YuanMoXingGuanLiTable',//drawio跳转的表格
......
......@@ -535,7 +535,7 @@
switch(breadcrumb3_){
case '架构元素管理':
this.$router.push( '/main/JiaGouYuanSuGuanLi', () => {}, () => {} );
this.$router.push( '/main/archiEleList', () => {}, () => {} );
this.visible1 = false;
break;
case '架构元素关系管理':
......@@ -551,11 +551,11 @@
this.visible1 = false;
break;
case '元模型管理':
this.$router.push( '/main/YuanMoXingGuanLi', () => {}, () => {} );
this.$router.push( '/main/metaModelList', () => {}, () => {} );
this.visible1 = false;
break;
case '总体架构资产管理':
this.$router.push( '/main/YeWuZiChanGuanLi', () => {}, () => {} );
this.$router.push( '/main/busiAssetslist', () => {}, () => {} );
this.visible1 = false;
break;
case '在线文档编制':
......
<template>
<div class="JiaGouYuanShuGuanLi">
<div class="archiEleList">
<div class="table_container">
<div class="search_menu">
<div class="search_menu_item_container">
......@@ -141,7 +141,8 @@
</div>
<div class="dialog_form_item3">
<div class="dialog_form_item_title">图标设置:</div>
<div>
<input type="file" />
<!-- <div>
<div class="dialog_form_item3_content1" style="margin-bottom: 10px;">
<el-radio v-model="radio" label="长方形">
<img class="tu_biao_icon" src="@/assets/长方形.svg" alt="" />
......@@ -173,7 +174,7 @@
<img class="tu_biao_icon2" src="@/assets/正方形6.svg" alt="" />
</el-radio>
</div>
</div>
</div> -->
</div>
</div>
<span slot="footer" class="dialog-footer">
......@@ -200,7 +201,7 @@ import {
import { MessageBox, Message } from 'element-ui';
export default {
name: 'JiaGouYuanShuGuanLi',
name: 'ArchiEleList',
components: {
},
......@@ -501,7 +502,7 @@ export default {
}
</script>
<style scoped>
.JiaGouYuanShuGuanLi{
.archiEleList{
width: 100%;
height: 100%;
display: flex;
......
<template>
<div class="YeWuZiChanGuanLi">
<div class="busiAssetslist">
<div class="left_container">
<el-input placeholder="请输入搜索内容" v-model="filterText" prefix-icon="el-icon-search"></el-input>
<el-tree
......@@ -12,7 +12,7 @@
</el-tree>
</div>
<div class="right_container">
<Drawio :initGraphId="2"></Drawio>
<Drawio initGraphId="2"></Drawio>
</div>
</div>
</template>
......@@ -21,7 +21,7 @@
import Drawio from '@/components/drawio.vue';
export default {
name: 'YeWuZiChanGuanLi',
name: 'BusiAssetslist',
components: {
Drawio
},
......@@ -96,7 +96,7 @@
}
</script>
<style scoped>
.YeWuZiChanGuanLi{
.busiAssetslist{
width: 100%;
/* height: calc(100% - 20px); */
height: 100%;
......
<template>
<div class="YuanMoXingGuanLiCanvas">
<Drawio :initGraphId="1"></Drawio>
<div class="canvas">
<Drawio :initGraphId="routerId"></Drawio>
</div>
</template>
......@@ -8,14 +8,25 @@
import Drawio from '@/components/drawio.vue';
export default {
name: 'YuanMoXingGuanLi',
name: 'Canvas',
components: {
Drawio
},
data() {
return {
routerId: null
};
},
mounted(){
this.routerId = window.location.href.split("=")[1];
},
methods: {
}
}
</script>
<style scoped>
.YuanMoXingGuanLiCanvas{
.canvas{
width: 100%;
/* height: calc(100% - 20px); */
height: 100%;
......
<template>
<div class="YuanMoXingGuanLiDetails">
<div class="Details">
<el-tabs type="border-card">
<el-tab-pane>
<span slot="label">
......@@ -18,11 +18,11 @@
</template>
<script>
import YuanMoXingGuanLiCanvas from './YuanMoXingGuanLiCanvas/index.vue';
import YuanMoXingGuanLiTable from './YuanMoXingGuanLiTable/index.vue';
import YuanMoXingGuanLiCanvas from './canvas/index.vue';
import YuanMoXingGuanLiTable from './table/index.vue';
export default {
name: 'YuanMoXingGuanLiDetails',
name: 'Details',
components: {
YuanMoXingGuanLiCanvas,
YuanMoXingGuanLiTable
......@@ -41,7 +41,7 @@ export default {
}
</script>
<style scoped>
.YuanMoXingGuanLiDetails{
.Details{
width: 100%;
height: 100%;
}
......
<template>
<div class="YuanMoXingGuanLi">
<div class="metaModelList">
<div class="search_menu">
<el-dropdown trigger="click" @command="handleCommand">
<div class="el-dropdown-link add_btn">
......@@ -16,49 +16,52 @@
<p>版本分析</p>
</div>
</div>
<div class="line_title_container">
<div class="title_container">
<el-divider direction="vertical"></el-divider>
<span>已发布</span>
</div>
<el-divider></el-divider>
</div>
<div class="card_container">
<el-card class="card_item" v-for="o in 7" :key="o">
<img class="card_image" @click="to_current_details" src="@/assets/元模型管理.svg" alt="" />
<div class="card_info">
<div class="card_title">
<i class="el-icon-location"></i>
元模型 版本XX
</div>
<div class="card_icon">
<i class="el-icon-delete"></i>
<div class="version_container">
<div class="version_content">
<div class="line_title_container">
<div class="title_container">
<el-divider direction="vertical"></el-divider>
<span>已发布</span>
</div>
<el-divider></el-divider>
</div>
</el-card>
</div>
<div class="line_title_container">
<div class="title_container">
<el-divider direction="vertical"></el-divider>
<span>暂存</span>
</div>
<el-divider></el-divider>
</div>
<div class="card_container">
<el-card class="card_item" v-for="o in 7" :key="o">
<img class="card_image" @click="to_current_details" src="@/assets/元模型管理.svg" alt="" />
<div class="card_info">
<div class="card_title">
<i class="el-icon-location"></i>
元模型 版本XX
</div>
<div class="card_icon">
<i class="el-icon-delete"></i>
<div class="card_container">
<el-card class="card_item" v-for="o in 7" :key="o">
<img class="card_image" @click="to_current_details" src="@/assets/元模型管理.svg" alt="" />
<div class="card_info">
<div class="card_title">
<i class="el-icon-location"></i>
元模型 版本XX
</div>
<div class="card_icon">
<i class="el-icon-delete"></i>
</div>
</div>
</el-card>
</div>
<div class="line_title_container">
<div class="title_container">
<el-divider direction="vertical"></el-divider>
<span>暂存</span>
</div>
<el-divider></el-divider>
</div>
<div class="card_container">
<el-card class="card_item" v-for="o in 7" :key="o">
<img class="card_image" @click="to_current_details" src="@/assets/元模型管理.svg" alt="" />
<div class="card_info">
<div class="card_title">
<i class="el-icon-location"></i>
元模型 版本XX
</div>
<div class="card_icon">
<i class="el-icon-delete"></i>
</div>
</div>
</el-card>
</div>
</el-card>
</div>
</div>
<el-dialog
title="新建元模型视图"
:visible.sync="add_dialog"
......@@ -86,7 +89,7 @@ import {
import { MessageBox, Message } from 'element-ui';
export default {
name: 'YuanMoXingGuanLi',
name: 'metaModelList',
components: {
},
......@@ -118,7 +121,7 @@ export default {
// console.log(res)
if(res.code == 200) {
this.add_dialog = false;
this.$router.push( '/main/YuanMoXingGuanLiDetails', () => {}, () => {} );
this.$router.push(`/main/metaModelListDetails/id=${res.data}`, () => {}, () => {} );
Message({
type: 'success',
message: '新增成功!'
......@@ -137,7 +140,7 @@ export default {
});
},
to_current_details() {//跳转到详情
this.$router.push( '/main/YuanMoXingGuanLiDetails', () => {}, () => {} );
this.$router.push( '/main/metaModelListDetails/1', () => {}, () => {} );
},
handleCommand(command) {//新建按钮点击
if(command == '自由绘图') {
......@@ -154,6 +157,13 @@ export default {
background-color: #0D867F;
color: #fff;
}
.version_container{
height: calc(100% - 70px);
overflow: auto;
}
.version_content{
height: 1500px;
}
.el-form-item{
display: flex;
}
......@@ -182,7 +192,7 @@ export default {
.card_image{
width: 165px;
}
.YuanMoXingGuanLi{
.metaModelList{
width: 100%;
height: 100%;
}
......@@ -247,10 +257,8 @@ export default {
border: 2px solid #0D867F;
}
.card_container{
height: 260px;
margin-bottom: 10px;
overflow-x: hidden;
overflow-y: auto;
display: flex;
flex-wrap: wrap;
}
......
<template>
<div class="YuanMoXingGuanLiTable">
<div class="table">
<div class="table_container">
<el-table v-loading="loading" :data="tableData" stripe border>
<el-table-column type="selection" width="55"></el-table-column>
......@@ -77,7 +77,7 @@
<script>
export default {
name: 'YuanMoXingGuanLiTable',
name: 'Table',
components: {
},
......@@ -95,7 +95,7 @@ export default {
}
</script>
<style scoped>
.YuanMoXingGuanLiTable{
.table{
width: 100%;
height: 100%;
}
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!