Skip to content

liangzhen / framework-tools-web

Go to a project
Commit 15f7c5d0 by Thews
Options

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

2 parents 58d9df52 bb32d98f
Inline Side-by-side
Showing with 37 additions and 26 deletions
src/views/JiaGouYuanShuGuanLi/index.vue
...@@ -40,6 +40,7 @@ ...@@ -40,6 +40,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="table_container">
<div class="search_btn"> <div class="search_btn">
<div class="add_btn" @click="add_dialog = true"> <div class="add_btn" @click="add_dialog = true">
<img class="btn_icon" src="@/assets/新建icon.png" alt="" /> <img class="btn_icon" src="@/assets/新建icon.png" alt="" />
...@@ -49,11 +50,7 @@ ...@@ -49,11 +50,7 @@
<img class="btn_icon" src="@/assets/版本发布icon.png" alt="" /> <img class="btn_icon" src="@/assets/版本发布icon.png" alt="" />
<p>版本发布</p> <p>版本发布</p>
</div> </div>
<!-- <el-button type="info" style="float: right;">重置</el-button> -->
<!-- <el-button type="primary" style="float: right;">查询</el-button> -->
</div> </div>
<div class="table_container">
<el-table :data="tableData" stripe border> <el-table :data="tableData" stripe border>
<el-table-column type="selection" width="55"></el-table-column> <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 type="index" label="序号" width="80" align="center"></el-table-column>
...@@ -94,10 +91,10 @@ ...@@ -94,10 +91,10 @@
</el-table> </el-table>
<el-pagination <el-pagination
:current-page="1" :current-page="1"
:page-sizes="[100, 200, 300, 400]" :page-sizes="[5, 20, 50, 100]"
:page-size="100" :page-size="30"
layout="total, sizes, prev, pager, next, jumper" layout="total, sizes, prev, pager, next, jumper"
:total="400"> :total="5">
</el-pagination> </el-pagination>
</div> </div>
...@@ -109,15 +106,15 @@ ...@@ -109,15 +106,15 @@
<div class="add_dialog_content"> <div class="add_dialog_content">
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">元素名称</div> <div class="dialog_form_item_title">元素名称</div>
<el-input placeholder="请输入内容" class="dialog_form_item_content"></el-input> <el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="let1"></el-input>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">架构层次</div> <div class="dialog_form_item_title">架构层次</div>
<el-input placeholder="请输入内容" class="dialog_form_item_content"></el-input> <el-input placeholder="请输入内容" class="dialog_form_item_content" v-model="let2"></el-input>
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">架构归属</div> <div class="dialog_form_item_title">架构归属</div>
<el-select placeholder="请选择" class="search_item"> <el-select placeholder="请选择" class="search_item" v-model="let3">
<el-option label="业务架构" value="业务架构"></el-option> <el-option label="业务架构" value="业务架构"></el-option>
<el-option label="应用架构" value="应用架构"></el-option> <el-option label="应用架构" value="应用架构"></el-option>
<el-option label="内容架构" value="内容架构"></el-option> <el-option label="内容架构" value="内容架构"></el-option>
...@@ -127,7 +124,7 @@ ...@@ -127,7 +124,7 @@
</div> </div>
<div class="dialog_form_item"> <div class="dialog_form_item">
<div class="dialog_form_item_title">描述</div> <div class="dialog_form_item_title">描述</div>
<el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content"></el-input> <el-input type="textarea" :rows="2" placeholder="请输入内容" class="dialog_form_item_content" v-model="let4"></el-input>
</div> </div>
</div> </div>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
...@@ -160,6 +157,10 @@ export default { ...@@ -160,6 +157,10 @@ export default {
query_item2: null, query_item2: null,
query_item3: null, query_item3: null,
query_item4: null, query_item4: null,
let1: '',
let2: '',
let3: '',
let4: '',
}; };
}, },
...@@ -168,12 +169,17 @@ export default { ...@@ -168,12 +169,17 @@ export default {
<style scoped> <style scoped>
.JiaGouYuanShuGuanLi{ .JiaGouYuanShuGuanLi{
width: 100%; width: 100%;
height: 100%; height: calc(100% - 20px);
padding-right: 20px;
padding-left: 20px;
padding-bottom: 20px;
display: flex;
flex-direction: column;
justify-content: flex-start;
align-items: center;
} }
.search_menu{ .search_menu{
display: flex; display: flex;
/* justify-content: center; */
margin-left: 200px;
} }
.search_menu_item_container{ .search_menu_item_container{
display: flex; display: flex;
...@@ -197,10 +203,10 @@ export default { ...@@ -197,10 +203,10 @@ export default {
width: 60%; width: 60%;
} }
.search_btn{ .search_btn{
width: 100%;
display: flex; display: flex;
margin-right: 200px;
margin-top: 50px; margin-top: 50px;
margin-left: 200px; margin-bottom: 20px;
} }
.add_btn{ .add_btn{
display: flex; display: flex;
...@@ -262,11 +268,9 @@ export default { ...@@ -262,11 +268,9 @@ export default {
margin-right: 10px; margin-right: 10px;
} }
.table_container{ .table_container{
margin-left: 200px;
margin-top: 20px; margin-top: 20px;
} }
.el-pagination{ .el-pagination{
margin-left: 200px;
margin-top: 50px; margin-top: 50px;
} }
.dialog_form_item{ .dialog_form_item{
......
src/views/Main/index.vue
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="line"></div> <div class="line"></div>
<div class="operate_menu_item"> <div class="operate_menu_item">
<img src="@/assets/管理员icon.png" alt=""> <img src="@/assets/管理员icon.png" alt="">
<p class="operate_title">管理层</p> <p class="operate_title">管理员</p>
</div> </div>
<div class="line"></div> <div class="line"></div>
<div class="operate_menu_item"> <div class="operate_menu_item">
...@@ -488,7 +488,6 @@ ...@@ -488,7 +488,6 @@
}; };
}, },
mounted(){ mounted(){
console.log(this.$router)
$(".menu_item").hover(function() { $(".menu_item").hover(function() {
$(this).find(".menu_title").css('color', '#0D867F'); $(this).find(".menu_title").css('color', '#0D867F');
$(this).find(".menu_icon").css('display', 'none'); $(this).find(".menu_icon").css('display', 'none');
...@@ -510,16 +509,17 @@ ...@@ -510,16 +509,17 @@
jumpPage(data) { jumpPage(data) {
switch(data){ switch(data){
case '架构元素管理': case '架构元素管理':
this.$router.push({ path: '/main/JiaGouYuanShuGuanLi' }); this.$router.push( '/main/JiaGouYuanShuGuanLi', () => {}, () => {} );
break; break;
case '元模型管理': case '元模型管理':
this.$router.push({ path: '/main/YuanMoXingGuanLi' }); this.$router.push( '/main/YuanMoXingGuanLi', () => {}, () => {} );
break; break;
case '总体架构资产管理': case '总体架构资产管理':
this.$router.push({ path: '/main/YeWuZiChanGuanLi' }); this.$router.push( '/main/YeWuZiChanGuanLi', () => {}, () => {} );
break; break;
case '在线文档编制': case '在线文档编制':
this.$router.push({ path: '/main/wenDangDemo' }); this.$router.push( '/main/wenDangDemo', () => {}, () => {} );
break; break;
} }
} }
...@@ -567,7 +567,7 @@ ...@@ -567,7 +567,7 @@
} }
.operate_menu{ .operate_menu{
width: 350px; width: 350px;
height: 28px; height: 35px;
font-size: 14px; font-size: 14px;
font-weight: 500; font-weight: 500;
display: flex; display: flex;
......
src/views/YeWuZiChanGuanLi/index.vue
...@@ -98,9 +98,12 @@ ...@@ -98,9 +98,12 @@
<style scoped> <style scoped>
.YeWuZiChanGuanLi{ .YeWuZiChanGuanLi{
width: 100%; width: 100%;
/* height: calc(100% - 20px); */
height: 100%; height: 100%;
display: flex; display: flex;
padding-right: 20px; /* padding-right: 20px;
padding-left: 20px;
padding-bottom: 20px; */
} }
.left_container{ .left_container{
width: 20%; width: 20%;
......
src/views/YuanMoXingGuanLi/index.vue
...@@ -17,6 +17,10 @@ ...@@ -17,6 +17,10 @@
<style scoped> <style scoped>
.YuanMoXingGuanLi{ .YuanMoXingGuanLi{
width: 100%; width: 100%;
/* height: calc(100% - 20px); */
height: 100%; height: 100%;
/* padding-right: 20px;
padding-left: 20px;
padding-bottom: 20px; */
} }
</style> </style>
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!