Commit 8ad34154 by liuyong

修改菜单

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