898dbff4 by 杨威

代码优化

1 parent c859d372
......@@ -101,6 +101,7 @@ ol, ul { list-style:none; }
/deep/ .el-tabs--border-card{
border: 0;
}
//二级菜单样式
.tabs{
>.el-tabs__content{
......@@ -115,28 +116,24 @@ ol, ul { list-style:none; }
width: 100%;
margin-bottom: 0;
border-top: 1px solid #F4F9FF;
// >.is-top>.el-tabs__nav-scroll{
// height: 50px;
// background-color: #ffffff;
// box-sizing: border-box;
// padding-left: 20px;
// .el-tabs__active-bar{
// display: none;
// }
// >.el-tabs__nav{
// >.el-tabs__item{
// border: 1px solid #DEDEDE;
// height: 30px;
// line-height: 28px;
// padding: 0 20px;
// margin: 9px 10px 9px 0;
// }
// .is-active{
// color: #006CFF;
// background-color: #ffffff;
// }
// }
// }
}
}
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
position: unset;
/deep/.el-tab-pane{
height: 100%;
}
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
.el-tabs__item{
......
......@@ -55,6 +55,10 @@
<i class="iconfont icondiqiu" title="图形管理" v-if="!isMap" @click="goMap"></i>
<i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i>
</div>
<div class="user-info">
<span>admin</span>
<img src="https://himg.bdimg.com/sys/portraitn/item/a1b5badad3b61739" alt="">
</div>
</div>
<!-- <div class="header-bottom">
<Navigation ref="navigation"></Navigation>
......@@ -528,10 +532,38 @@ export default {
right: 18px;
top: 20px;
.tuOrShu{
float: left;
.iconfont{
cursor: pointer;
color:#ffffff;
font-size:30px
font-size:26px;
position: relative;
top: 2px;
}
}
.user-info{
float: left;
margin-left: 20px;
cursor: pointer;
span{
line-height: 30px;
vertical-align: middle;
color: #fff;
font-size: 14px;
}
img{
// padding: 2px;
width: 24px;
height: 24px;
margin-left: 6px;
border-radius: 50%;
border: 1px solid #fff;
vertical-align: middle;
}
}
.user-info:hover{
span{
color: #006CFF;
}
}
}
......
......@@ -189,64 +189,45 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
/deep/ .el-tabs__item {
height: 48px;
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
/deep/ .el-tabs__header{
background-color: #ffffff;
margin: 0;
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
}
.hbjDialog{
/deep/ .el-dialog{
margin-top: 10vh!important;
}
}
.btnGroup{
margin: 20px auto 0;
width: 230px;
}
}
.hbjDialog{
/deep/ .el-dialog{
margin-top: 10vh!important;
}
}
.btnGroup{
margin: 20px auto 0;
width: 230px;
}
}
</style>
......
......@@ -72,65 +72,44 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
/deep/ .el-tabs__item {
height: 48px;
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
/deep/ .el-tabs__header{
background-color: #ffffff;
margin: 0;
border-top: 1px solid #E4E7ED;
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
}
.hbjDialog{
/deep/ .el-dialog{
margin-top: 10vh!important;
}
}
.btnGroup{
margin: 20px auto 0;
width: 230px;
}
}
.hbjDialog{
/deep/ .el-dialog{
margin-top: 10vh!important;
}
}
.btnGroup{
margin: 20px auto 0;
width: 230px;
}
}
</style>
......
......@@ -63,22 +63,4 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -30,19 +30,4 @@
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
}
/deep/ .el-tabs__item {
height: 48px;
}
}
</style>
\ No newline at end of file
......
......@@ -162,54 +162,35 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
}
}
......
......@@ -69,23 +69,4 @@ export default {
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
position: unset;
/deep/.el-tab-pane{
height: calc(100% - 40px);
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -493,11 +493,14 @@ export default {
</script>
<style lang="less">
.eltabs {
height: 366px;
height: 366px!important;
width: 100%;
position: relative;
margin-left: 20px;
margin-top: 20px;
margin-top: 20px;
/deep/.el-tabs__content{
position: relative!important;
}
.eltabspane {
height: 100%;
width: 100%;
......
......@@ -243,53 +243,35 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
}
}
......
......@@ -193,63 +193,45 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
background-color: #1ad6e1;
border-color: #1ad6e1;
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
.moreSearchBtn:focus,
.moreSearchBtn:hover {
background-color: rgba(28, 200, 229, 0.6);
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
}
.hbjDialog{
/deep/ .el-dialog{
margin-top: 10vh!important;
}
}
.dataGrid {
flex: 1;
.pagination {
padding: 18px 0;
}
.btnGroup{
margin: 20px auto 0;
width: 230px;
}
.hbjDialog{
/deep/ .el-dialog{
margin-top: 10vh!important;
}
}
.btnGroup{
margin: 20px auto 0;
width: 230px;
}
}
</style>
......
......@@ -103,23 +103,4 @@ export default {
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -72,41 +72,5 @@ export default {
<style scoped lang="less">
.content_box{
padding: 0 0 6px;
// padding: 0 20px;
// .el-tabs{
// width: 100%;
// height: 100%;
// display: flex;
// flex-direction: column;
// }
// /deep/.el-tabs__content{
// width: 100%;
// height: 100%;
// flex:1;
// position: unset;
// }
// .el-tab-pane{
// width: 100%;
// height: 100%;
// }
.el-tabs{
height: calc(100% - 50px);
/deep/ .el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
}
</style>
......