Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 42d23ab0 by Thews
Options

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

2 parents 02f9470b a22bfd2a
Inline Side-by-side
Showing with 255 additions and 105 deletions
package-lock.json
{
"name": "dwawio-vue",
"version": "0.1.0",
"lockfileVersion": 1,
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
......@@ -12,14 +12,7 @@
"bufferutil": "^4.0.8",
"core-js": "^3.8.3",
"element-ui": "^2.15.14",
<<<<<<< HEAD
"encoding": "^0.1.13",
"request": "^2.88.2",
"typescript": "^5.3.2",
"utf-8-validate": "^6.0.3",
=======
"jquery": "^3.7.1",
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
"vue": "^2.6.14",
"vue-cli": "^2.9.6",
"vue-router": "^3.5.1",
......@@ -1925,6 +1918,14 @@
"node": ">= 8"
}
},
"node_modules/@onlyoffice/document-editor-vue": {
"version": "1.3.0",
"resolved": "https://registry.npmmirror.com/@onlyoffice/document-editor-vue/-/document-editor-vue-1.3.0.tgz",
"integrity": "sha512-nopUT3fPD6uM76IHBkn4QGCqwgqC/9zqyYJhQZGN9FS/Ii57KbEKEgueoTaF/P/TvcAPIa745zqlpFdRidbqQQ==",
"peerDependencies": {
"vue": "^3.0.0"
}
},
"node_modules/@polka/url": {
"version": "1.0.0-next.23",
"resolved": "https://registry.npmmirror.com/@polka/url/-/url-1.0.0-next.23.tgz",
......@@ -5683,7 +5684,6 @@
"version": "1.15.3",
"resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.3.tgz",
"integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
"dev": true,
"engines": {
"node": ">=4.0"
},
......@@ -8895,6 +8895,11 @@
"node": ">= 0.10"
}
},
"node_modules/proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
},
"node_modules/pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/pseudomap/-/pseudomap-1.0.2.tgz",
......@@ -12825,7 +12830,7 @@
},
"@onlyoffice/document-editor-vue": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/@onlyoffice/document-editor-vue/-/document-editor-vue-1.3.0.tgz",
"resolved": "https://registry.npmmirror.com/@onlyoffice/document-editor-vue/-/document-editor-vue-1.3.0.tgz",
"integrity": "sha512-nopUT3fPD6uM76IHBkn4QGCqwgqC/9zqyYJhQZGN9FS/Ii57KbEKEgueoTaF/P/TvcAPIa745zqlpFdRidbqQQ=="
},
"@polka/url": {
......@@ -13444,49 +13449,6 @@
"webpack-merge": "^5.7.3",
"webpack-virtual-modules": "^0.4.2",
"whatwg-fetch": "^3.6.2"
},
"dependencies": {
"@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.11.1",
"resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz",
"integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==",
"dev": true,
"requires": {
"@vue/component-compiler-utils": "^3.1.0",
"hash-sum": "^1.0.2",
"loader-utils": "^1.1.0",
"vue-hot-reload-api": "^2.3.0",
"vue-style-loader": "^4.1.0"
},
"dependencies": {
"hash-sum": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz",
"integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==",
"dev": true
}
}
},
"json5": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
"integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
"dev": true,
"requires": {
"minimist": "^1.2.0"
}
},
"loader-utils": {
"version": "1.4.2",
"resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz",
"integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==",
"dev": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^1.0.1"
}
}
}
},
"@vue/cli-shared-utils": {
......@@ -13652,6 +13614,7 @@
}
},
<<<<<<< HEAD
=======
"@vue/vue-loader-v15": {
"version": "npm:vue-loader@15.11.1",
"resolved": "https://registry.npmmirror.com/vue-loader/-/vue-loader-15.11.1.tgz",
......@@ -13673,8 +13636,7 @@
}
}
},
=======
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
>>>>>>> 95ade57cb437050dbbaeafd9b139c75ff59857d7
"@vue/web-component-wrapper": {
"version": "1.3.0",
"resolved": "https://registry.npmmirror.com/@vue/web-component-wrapper/-/web-component-wrapper-1.3.0.tgz",
......@@ -13841,11 +13803,7 @@
"version": "1.9.0",
"resolved": "https://registry.npmmirror.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz",
"integrity": "sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==",
<<<<<<< HEAD
"requires": {}
=======
"dev": true
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
},
"acorn-walk": {
"version": "8.3.0",
......@@ -13880,20 +13838,10 @@
}
},
"ajv-keywords": {
<<<<<<< HEAD
"version": "5.1.0",
"resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-5.1.0.tgz",
"integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==",
"dev": true,
"requires": {
"fast-deep-equal": "^3.1.3"
}
=======
"version": "3.5.2",
"resolved": "https://registry.npmmirror.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
"integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
"dev": true
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
},
"ansi-escapes": {
"version": "3.2.0",
......@@ -15954,8 +15902,17 @@
"follow-redirects": {
"version": "1.15.3",
"resolved": "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.3.tgz",
"integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q==",
"dev": true
"integrity": "sha512-1VzOtuEM8pC9SFU1E+8KfTjZyMztRsgEfwQl44z8A25uy13jSzTj6dyK2Df52iV0vgHCfBwLhDWevLn95w5v6Q=="
},
"form-data": {
"version": "4.0.0",
"resolved": "https://registry.npmmirror.com/form-data/-/form-data-4.0.0.tgz",
"integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
"requires": {
"asynckit": "^0.4.0",
"combined-stream": "^1.0.8",
"mime-types": "^2.1.12"
}
},
"forever-agent": {
"version": "0.6.1",
......@@ -18398,6 +18355,11 @@
}
}
},
"proxy-from-env": {
"version": "1.1.0",
"resolved": "https://registry.npmmirror.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
"integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
},
"pseudomap": {
"version": "1.0.2",
"resolved": "https://registry.npmmirror.com/pseudomap/-/pseudomap-1.0.2.tgz",
......@@ -19200,6 +19162,15 @@
"integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
"dev": true
},
"string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"dev": true,
"requires": {
"safe-buffer": "~5.2.0"
}
},
"string-width": {
"version": "4.2.3",
"resolved": "https://registry.npmmirror.com/string-width/-/string-width-4.2.3.tgz",
......@@ -19211,15 +19182,6 @@
"strip-ansi": "^6.0.1"
}
},
"string_decoder": {
"version": "1.3.0",
"resolved": "https://registry.npmmirror.com/string_decoder/-/string_decoder-1.3.0.tgz",
"integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
"dev": true,
"requires": {
"safe-buffer": "~5.2.0"
}
},
"strip-ansi": {
"version": "6.0.1",
"resolved": "https://registry.npmmirror.com/strip-ansi/-/strip-ansi-6.0.1.tgz",
......@@ -20295,15 +20257,12 @@
"ajv-formats": "^2.1.1",
"ajv-keywords": "^5.1.0"
}
<<<<<<< HEAD
=======
},
"ws": {
"version": "8.14.2",
"resolved": "https://registry.npmmirror.com/ws/-/ws-8.14.2.tgz",
"integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
"dev": true
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
}
}
},
......@@ -20433,18 +20392,10 @@
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
},
"ws": {
<<<<<<< HEAD
"version": "8.14.2",
"resolved": "https://registry.npmmirror.com/ws/-/ws-8.14.2.tgz",
"integrity": "sha512-wEBG1ftX4jcglPxgFCMJmZ2PLtSbJ2Peg6TmpJFTbe9GZYOQCDPdMYu/Tm0/bGZkw8paZnJY45J4K2PZrLYq8g==",
"dev": true,
"requires": {}
=======
"version": "7.5.9",
"resolved": "https://registry.npmmirror.com/ws/-/ws-7.5.9.tgz",
"integrity": "sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==",
"dev": true
>>>>>>> 8fd6ba0bfadeeb88d16f24e33aa478ce59f932a3
},
"xtend": {
"version": "4.0.2",
......
public/index.html
......@@ -12,7 +12,7 @@
<strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
</noscript>
<div id="app"></div>
<script src="./api.js"></script>
<!-- <script src="./api.js"></script> -->
<!-- <script type="text/javascript" src="http://192.168.0.187:9999/web-apps/apps/api/documents/api.js"></script> -->
<!-- built files will be auto injected -->
</body>
......
src/views/JiaGouYuanShuGuanLi/index.vue
<template>
<div class="JiaGouYuanShuGuanLi">
<div class="search_menu">
<div class="search_menu_item_container">
<div class="search_menu_item">
<span class="search_title">架构归属</span>
<el-select v-model="query_item1" placeholder="请选择" class="search_item">
......@@ -28,31 +29,66 @@
</el-select>
</div>
</div>
<div class="search_menu_btn_container">
<div class="query_btn">
<img class="btn_icon" src="@/assets/查询icon.png" alt="" />
<p>查询</p>
</div>
<div class="reset_btn">
<img class="btn_icon" src="@/assets/重置icon.png" alt="" />
<p>重置</p>
</div>
</div>
</div>
<div class="search_btn">
<el-button type="primary" style="float: left;" @click="add_dialog = true">新建</el-button>
<el-button type="info" style="float: right;">重置</el-button>
<el-button type="primary" style="float: right;">查询</el-button>
<div class="add_btn" @click="add_dialog = true">
<img class="btn_icon" src="@/assets/新建icon.png" alt="" />
<p>新建</p>
</div>
<div class="version_btn">
<img class="btn_icon" src="@/assets/版本发布icon.png" alt="" />
<p>版本发布</p>
</div>
<!-- <el-button type="info" style="float: right;">重置</el-button> -->
<!-- <el-button type="primary" style="float: right;">查询</el-button> -->
</div>
<div class="table_container">
<el-table :data="tableData" stripe border>
<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 prop="let1" label="元素名称" width="180" align="center"></el-table-column>
<el-table-column prop="let2" label="架构层次" width="180" align="center"></el-table-column>
<el-table-column prop="let3" label="架构归属" width="180" align="center"></el-table-column>
<el-table-column prop="let4" label="描述" width="180" align="center"></el-table-column>
<el-table-column label="图标" width="180" align="center">
<el-table-column label="图标" align="center">
<template>
<el-button type="text">预览</el-button>
<el-button type="text" style="color: #0D867F;">预览</el-button>
</template>
</el-table-column>
<el-table-column prop="let5" label="版本" width="180" align="center"></el-table-column>
<el-table-column prop="let6" label="状态" width="180" align="center"></el-table-column>
<el-table-column label="操作" width="200" align="center">
<el-table-column prop="let6" label="状态" align="center"></el-table-column>
<el-table-column label="操作" width="360" align="center">
<template>
<el-button type="text" icon="el-icon-edit" @click="add_dialog = true">编辑</el-button>
<el-button type="text" icon="el-icon-switch-button">停用</el-button>
<el-button type="text" icon="el-icon-circle-check">发布</el-button>
<div style="display: flex;align-items: center;justify-content: center;">
<div class="add_btn" @click="add_dialog = true" style="border: 0;margin-right: 8px;">
<img class="btn_icon" src="@/assets/编辑_icon_default.png" alt="" />
<p>编辑</p>
</div>
<!-- <el-button type="text" icon="el-icon-edit" @click="add_dialog = true">编辑</el-button> -->
<div class="reset_btn" style="border: 0;margin-right: 8px;">
<img class="btn_icon" src="@/assets/停用_icon_default.png" alt="" />
<p>停用</p>
</div>
<div class="add_btn" style="border: 0;">
<img class="btn_icon" src="@/assets/发布_icon_default.png" alt="" />
<p>发布</p>
</div>
<div class="reset_btn" style="border: 0;margin-right: 8px;">
<img class="btn_icon" src="@/assets/删除_icon_default.png" alt="" />
<p>删除</p>
</div>
</div>
</template>
</el-table-column>
</el-table>
......@@ -136,12 +172,21 @@ export default {
}
.search_menu{
display: flex;
justify-content: center;
/* justify-content: center; */
margin-left: 200px;
}
.search_menu_item_container{
display: flex;
align-items: center;
}
.search_menu_btn_container{
display: flex;
align-items: center;
}
.search_menu_item{
display: flex;
align-items: center;
width: 400px;
width: 344px;
}
.search_title{
/* width: 20%; */
......@@ -152,11 +197,70 @@ export default {
width: 60%;
}
.search_btn{
overflow: hidden;
display: flex;
margin-right: 200px;
margin-top: 50px;
margin-left: 200px;
}
.add_btn{
display: flex;
align-items: center;
justify-content: center;
width: 76px;
height: 32px;
background: rgba(13,134,127,0.1);
border-radius: 6px 6px 6px 6px;
border: 1px solid #0D867F;
font-size: 14px;
color: #0D867F;
cursor: pointer;
}
.version_btn{
display: flex;
align-items: center;
justify-content: center;
width: 104px;
height: 32px;
background: rgba(13,134,127,0.1);
border-radius: 6px 6px 6px 6px;
border: 1px solid #0D867F;
font-size: 14px;
color: #0D867F;
cursor: pointer;
margin-left: 15px;
}
.query_btn{
display: flex;
align-items: center;
justify-content: center;
width: 76px;
height: 32px;
background: rgba(13,134,127,1);
border-radius: 6px 6px 6px 6px;
border: 1px solid #0D867F;
font-size: 14px;
color: #fff;
margin-right: 10px;
cursor: pointer;
}
.reset_btn{
display: flex;
align-items: center;
justify-content: center;
width: 76px;
height: 32px;
background: rgba(244,244,244,1);
border-radius: 6px 6px 6px 6px;
border: 1px solid #0D867F;
font-size: 14px;
color: #666;
cursor: pointer;
}
.btn_icon{
margin-right: 10px;
}
.table_container{
margin-left: 200px;
margin-top: 20px;
......
src/views/Main/index.vue
......@@ -650,4 +650,7 @@
margin-bottom: 10px;
cursor: pointer;
}
.menu_1_item_subtitle:hover{
color: #0D867F;
}
</style>
src/views/YeWuZiChanGuanLi/index.vue
<template>
<div class="YeWuZiChanGuanLi">
<div class="left_container">
<el-input placeholder="请输入搜索内容" v-model="filterText" suffix-icon="el-icon-search"></el-input>
<el-tree
class="filter-tree"
:data="treeData"
:props="{ children: 'children', label: 'label' }"
default-expand-all
:filter-node-method="filterNode"
ref="tree">
</el-tree>
</div>
<div class="right_container">
<Drawio :initGraphId="2"></Drawio>
</div>
</div>
</template>
<script>
......@@ -11,6 +24,74 @@
name: 'YeWuZiChanGuanLi',
components: {
Drawio
},
watch: {
filterText(val) {
this.$refs.tree.filter(val);
}
},
data() {
return {
filterText: '',
treeData: [
{
id: '1',
label: '业务架构',
children: [
{
id: '1-1',
label: '业务域',
children: [
{
id: '1-1-1',
label: '生产检修',
children: [
{
id: '1-1-1-1',
label: '业务职能',
children: [
{ id: '1-1-1-1-1', label: '国际业务' },
{ id: '1-1-1-1-2', label: '科研业务' },
{ id: '1-1-1-1-3', label: '协同办公' },
{
id: '1-1-1-1-4',
label: '综合管理',
children: [
{
id: '1-1-1-1-4-1',
label: '业务流程',
children: [
{ id: '1-1-1-1-4-1-1', label: '综合审批' },
{ id: '1-1-1-1-4-1-2', label: '项目填报' },
]
},
]
},
]
}
]
}
]
},
{ id: '1-2', label: '财力资源' },
{ id: '1-3', label: '物力资源' },
{ id: '1-4', label: '规划计划' },
{ id: '1-5', label: '电网建设' },
{ id: '1-6', label: '电力营销' },
{ id: '1-7', label: '调度运行' },
{ id: '1-8', label: '电力交易' },
{ id: '1-9', label: '产业业务' },
{ id: '1-10', label: '金融业务' },
]
}
]
};
},
methods: {
filterNode(value, data) {
if (!value) return true;
return data.label.indexOf(value) !== -1;
}
}
}
</script>
......@@ -18,5 +99,15 @@
.YeWuZiChanGuanLi{
width: 100%;
height: 100%;
display: flex;
padding-right: 20px;
}
.left_container{
width: 20%;
margin-right: 20px;
}
.right_container{
width: 80%;
}
</style>
\ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!