Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
4b74d10b by 焦泽平
Options

Merge branch 'master' of http://yun.pashanhoo.com:9090/renchao/CadastralSystem

2 parents 27475568 d2295d3d
Inline Side-by-side
Showing 5 changed files with 24 additions and 4 deletions
...@@ -11,7 +11,7 @@ audio, video { ...@@ -11,7 +11,7 @@ audio, video {
11 } 11 }
12 body { 12 body {
13 line-height:1; 13 line-height:1;
14 font-family: Verdana, Arial, Helvetica, sans-serif; 14 font-family: "Microsoft YaHei","微软雅黑", Arial, Helvetica, sans-serif;
15 } 15 }
16 a{ 16 a{
17 margin:0; 17 margin:0;
......
...@@ -647,6 +647,7 @@ ...@@ -647,6 +647,7 @@
647 table-layout: fixed; 647 table-layout: fixed;
648 .qlrBtn{ 648 .qlrBtn{
649 border: 0; 649 border: 0;
650 font-size: 14px;
650 } 651 }
651 .qlrBtn:hover{ 652 .qlrBtn:hover{
652 background-color: none!important; 653 background-color: none!important;
......
...@@ -63,6 +63,7 @@ export default { ...@@ -63,6 +63,7 @@ export default {
63 height: 100%; 63 height: 100%;
64 /deep/.el-tab-pane{ 64 /deep/.el-tab-pane{
65 height: 100%; 65 height: 100%;
66 overflow-y: scroll;
66 } 67 }
67 background: #eaedf5; 68 background: #eaedf5;
68 padding: 0; 69 padding: 0;
......
1 <template> 1 <template>
2 <div class="">登记簿</div> 2 <div class="main">登记簿</div>
3 </template> 3 </template>
4 4
5 <script> 5 <script>
......
1 <template> 1 <template>
2 <div ref="lpb" class="content_box"> 2 <div ref="lpb" class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick"> 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="card" >
4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane> 4 <el-tab-pane label="自然幢信息" name="zrzxx"><zrzxx></zrzxx></el-tab-pane>
5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad"></yzgy></el-tab-pane> 5 <el-tab-pane label="业主共有" name="yzgy"><yzgy v-if="yzgyLoad"></yzgy></el-tab-pane>
6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane> 6 <el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
...@@ -51,7 +51,7 @@ export default { ...@@ -51,7 +51,7 @@ export default {
51 </script> 51 </script>
52 <style scoped lang="less"> 52 <style scoped lang="less">
53 .content_box{ 53 .content_box{
54 padding: 0 0 16px; 54 padding: 0 0 6px;
55 // padding: 0 20px; 55 // padding: 0 20px;
56 // .el-tabs{ 56 // .el-tabs{
57 // width: 100%; 57 // width: 100%;
...@@ -69,5 +69,23 @@ export default { ...@@ -69,5 +69,23 @@ export default {
69 // width: 100%; 69 // width: 100%;
70 // height: 100%; 70 // height: 100%;
71 // } 71 // }
72
73 .el-tabs{
74 height: calc(100% - 50px);
75 /deep/ .el-tabs__content{
76 //height: 100%;
77 /deep/.el-tab-pane{
78 height: 100%;
79 }
80 background: #eaedf5;
81 padding: 0;
82 }
83 /deep/ .el-tabs__item {
84 height: 48px;
85 }
86 /deep/ .el-tabs__header{
87 background-color: #ffffff;
88 }
89 }
72 } 90 }
73 </style> 91 </style>
......