Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
fd8e2f3f by 杨威
Options

整体布局调整，样式修改

1 parent 898dbff4
Inline Side-by-side
Showing 14 changed files with 76 additions and 24 deletions
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
11 width: 100%; 11 width: 100%;
12 height: 100%; 12 height: 100%;
13 box-sizing: border-box; 13 box-sizing: border-box;
14 padding: 18px 10px 0!important; 14 padding: 18px 18px 0!important;
15 } 15 }
16 .pagination { 16 .pagination {
17 padding: 18px; 17 padding: 18px;
...@@ -77,6 +77,9 @@ ol, ul { list-style:none; } ...@@ -77,6 +77,9 @@ ol, ul { list-style:none; }
77 .top20{ 77 .top20{
78 top: 20px; 78 top: 20px;
79 } 79 }
80 .top40{
81 top: 40px;
82 }
80 // 滚动条样式 83 // 滚动条样式
81 ::-webkit-scrollbar { 84 ::-webkit-scrollbar {
82 width: 6px; 85 width: 6px;
...@@ -118,6 +121,7 @@ ol, ul { list-style:none; } ...@@ -118,6 +121,7 @@ ol, ul { list-style:none; }
118 border-top: 1px solid #F4F9FF; 121 border-top: 1px solid #F4F9FF;
119 } 122 }
120 } 123 }
124
121 .el-tabs{ 125 .el-tabs{
122 height: calc(100% - 50px); 126 height: calc(100% - 50px);
123 /deep/.el-tabs__content{ 127 /deep/.el-tabs__content{
...@@ -130,15 +134,63 @@ ol, ul { list-style:none; } ...@@ -130,15 +134,63 @@ ol, ul { list-style:none; }
130 padding: 0; 134 padding: 0;
131 } 135 }
132 /deep/ .el-tabs__item { 136 /deep/ .el-tabs__item {
133 height: 48px; 137 height: 44px;
138 font-size: 16px;
134 } 139 }
135 /deep/ .el-tabs__header{ 140 /deep/ .el-tabs__header{
136 background-color: #ffffff; 141 background-color: #ffffff;
142 margin-bottom: 0;
143 }
144 .el-tabs__header{
145 background-color: #ffffff;
146 }
147 /deep/ .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2), .el-tabs--bottom .el-tabs__item.is-top:nth-child(2), .el-tabs--top .el-tabs__item.is-bottom:nth-child(2), .el-tabs--top .el-tabs__item.is-top:nth-child(2){
148 padding: 0 20px;
149 }
150 /deep/.el-tabs__active-bar{
151 position: absolute;
152 bottom: 5px;
153 left: 0;
154 height: 2px;
155 background-color: #0091FF;
156 z-index: 1;
157 }
158 /deep/.el-tabs__nav-wrap{
159 background: #FFFFFF;
160 box-shadow: 0px 1px 2px 1px rgba(49, 132, 245, 0.1);
161 }
162 /deep/.el-tabs__nav .is-active{
163 background: #FFFFFF;
164 color: #0091FF;
165 }
166 /deep/.el-tabs__nav-wrap::after{
167 height: 0;
168 }
169 /deep/ .el-tabs__nav{
170 margin-left: 20px;
137 } 171 }
138 } 172 }
139 .el-tabs__item{ 173 // .el-tabs__header{
140 font-size: 16px; 174 // background-color: #ffffff;
141 } 175 // }
176 // .el-tabs--bottom .el-tabs__item.is-bottom:nth-child(2), .el-tabs--bottom .el-tabs__item.is-top:nth-child(2), .el-tabs--top .el-tabs__item.is-bottom:nth-child(2), .el-tabs--top .el-tabs__item.is-top:nth-child(2){
177 // padding: 0 20px;
178 // }
179 // .el-tabs__active-bar{
180 // position: absolute;
181 // bottom: 3px;
182 // left: 0;
183 // height: 2px;
184 // background-color: #409EFF;
185 // z-index: 1;
186 // }
187 // .el-tabs__nav-wrap{
188 // background: #FFFFFF;
189 // box-shadow: 0px 1px 2px 1px rgba(49, 132, 245, 0.1);
190 // }
191 // .el-tabs__nav .is-active{
192 // background: #FFFFFF;
193 // }
142 //弹框遮罩层样式 194 //弹框遮罩层样式
143 .v-modal{ 195 .v-modal{
144 opacity: .2; 196 opacity: .2;
......
1 <template> 1 <template>
2 <div class="hb-tabs top20"> 2 <div class="hb-tabs top40">
3 <div class="hbq"> 3 <div class="hbq">
4 <span class="tips" style="margin-left:0;">合并前幢信息(已选择幢{{dzhbqData.length}}个)</span> 4 <span class="tips" style="margin-left:0;">合并前幢信息(已选择幢{{dzhbqData.length}}个)</span>
5 5
......
1 <template> 1 <template>
2 <div class="content_box"> 2 <div class="content_box">
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane> 4 <el-tab-pane label="多幢基本信息" name="dzxx"><dzxx v-if="dzJbxxVisble"></dzxx></el-tab-pane>
5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane> 5 <el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible" ref="fjcl" :is-disabled="isDisabled"></fjcl></el-tab-pane>
6 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane> 6 <el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible" :type="type" :bsm="$route.query.bsm"></lshs></el-tab-pane>
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" type="border-card" @tab-click="handleClick"> 2 <el-tabs v-model="activeName" @tab-click="handleClick">
3 <el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane> 3 <el-tab-pane label="日志管理" name="log"><log></log></el-tab-pane>
4 <el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane> 4 <el-tab-pane label="字典管理" name="dictionary"><dictionary></dictionary></el-tab-pane>
5 </el-tabs> 5 </el-tabs>
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" type="border-card"> 2 <el-tabs v-model="activeName" >
3 <el-tab-pane label="添加" name="tj"> 3 <el-tab-pane label="添加" name="tj">
4 <div class="main"> 4 <div class="main">
5 <!-- <p class="tips">查询条件</p> --> 5 <!-- <p class="tips">查询条件</p> -->
......
...@@ -567,7 +567,7 @@ export default { ...@@ -567,7 +567,7 @@ export default {
567 height: 100%; 567 height: 100%;
568 -webkit-box-sizing: border-box; 568 -webkit-box-sizing: border-box;
569 box-sizing: border-box; 569 box-sizing: border-box;
570 padding: 20px; 570 padding: 25px 20px;
571 } 571 }
572 .search{ 572 .search{
573 573
...@@ -668,7 +668,7 @@ table:hover { ...@@ -668,7 +668,7 @@ table:hover {
668 668
669 .page { 669 .page {
670 position: fixed; 670 position: fixed;
671 bottom: 20px; 671 bottom: 15px;
672 width: auto; 672 width: auto;
673 height: auto; 673 height: auto;
674 } 674 }
......
...@@ -907,7 +907,6 @@ ...@@ -907,7 +907,6 @@
907 </script> 907 </script>
908 <style scoped lang="less"> 908 <style scoped lang="less">
909 .fg { 909 .fg {
910
911 .menu { 910 .menu {
912 /deep/ .el-tabs__content { 911 /deep/ .el-tabs__content {
913 position: unset; 912 position: unset;
...@@ -932,12 +931,13 @@ ...@@ -932,12 +931,13 @@
932 } 931 }
933 > .el-tabs__nav { 932 > .el-tabs__nav {
934 border: 0; 933 border: 0;
934 margin-left: 0!important;
935 > .el-tabs__item { 935 > .el-tabs__item {
936 border: 1px solid #DEDEDE; 936 border: 1px solid #DEDEDE;
937 height: 36px; 937 height: 36px;
938 line-height: 32px; 938 line-height: 32px;
939 padding: 0 20px; 939 padding: 0 20px;
940 margin: 9px 10px 9px 0; 940 margin:7px 10px 9px 0;
941 background-color: #ffffff; 941 background-color: #ffffff;
942 } 942 }
943 .is-active { 943 .is-active {
......
...@@ -71,7 +71,7 @@ export default { ...@@ -71,7 +71,7 @@ export default {
71 height: 100%; 71 height: 100%;
72 /deep/ .el-tabs__content { 72 /deep/ .el-tabs__content {
73 position: unset; 73 position: unset;
74 margin-top: 40px; 74 margin-top: 45px;
75 overflow: visible; 75 overflow: visible;
76 /deep/.el-tab-pane{ 76 /deep/.el-tab-pane{
77 height: calc(100% - 0px); 77 height: calc(100% - 0px);
...@@ -95,12 +95,13 @@ export default { ...@@ -95,12 +95,13 @@ export default {
95 } 95 }
96 > .el-tabs__nav { 96 > .el-tabs__nav {
97 border: 0; 97 border: 0;
98 margin-left: 0!important;
98 > .el-tabs__item { 99 > .el-tabs__item {
99 border: 1px solid #DEDEDE; 100 border: 1px solid #DEDEDE;
100 height: 36px; 101 height: 36px;
101 line-height: 32px; 102 line-height: 32px;
102 padding: 0 20px; 103 padding: 0 20px;
103 margin: 9px 10px 9px 0; 104 margin:7px 10px 9px 0;
104 background-color: #ffffff; 105 background-color: #ffffff;
105 } 106 }
106 .is-active { 107 .is-active {
......
...@@ -187,6 +187,7 @@ ...@@ -187,6 +187,7 @@
187 </div> 187 </div>
188 </el-tab-pane> 188 </el-tab-pane>
189 <el-tab-pane label="户合并" name="h"> 189 <el-tab-pane label="户合并" name="h">
190 <div style="width:100%;height:15px"></div>
190 <div class="hb-tabs psn" v-if="hhbtabs"> 191 <div class="hb-tabs psn" v-if="hhbtabs">
191 <hfghb></hfghb> 192 <hfghb></hfghb>
192 </div> 193 </div>
...@@ -583,9 +584,6 @@ ...@@ -583,9 +584,6 @@
583 height: 100%; 584 height: 100%;
584 .menu { 585 .menu {
585 height: 100%; 586 height: 100%;
586 .top40{
587 top: 40px;
588 }
589 /deep/ .el-tabs__content { 587 /deep/ .el-tabs__content {
590 position: unset; 588 position: unset;
591 margin-top: 40px; 589 margin-top: 40px;
...@@ -609,12 +607,13 @@ ...@@ -609,12 +607,13 @@
609 } 607 }
610 > .el-tabs__nav { 608 > .el-tabs__nav {
611 border: 0; 609 border: 0;
610 margin-left: 0!important;
612 > .el-tabs__item { 611 > .el-tabs__item {
613 border: 1px solid #DEDEDE; 612 border: 1px solid #DEDEDE;
614 height: 36px; 613 height: 36px;
615 line-height: 32px; 614 line-height: 32px;
616 padding: 0 20px; 615 padding: 0 20px;
617 margin: 9px 10px 9px 0; 616 margin:7px 10px 9px 0;
618 background-color: #ffffff; 617 background-color: #ffffff;
619 } 618 }
620 .is-active { 619 .is-active {
......
...@@ -556,7 +556,7 @@ export default { ...@@ -556,7 +556,7 @@ export default {
556 height: 100%; 556 height: 100%;
557 -webkit-box-sizing: border-box; 557 -webkit-box-sizing: border-box;
558 box-sizing: border-box; 558 box-sizing: border-box;
559 padding: 20px; 559 padding: 25px 20px;
560 .el-row{ 560 .el-row{
561 box-sizing: border-box; 561 box-sizing: border-box;
562 padding-left: 2px; 562 padding-left: 2px;
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" @tab-click="handleClick" type="border-card"> 2 <el-tabs v-model="activeName" @tab-click="handleClick" >
3 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane> 3 <el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
4 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane> 4 <el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
5 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane> 5 <el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" type="border-card"> 2 <el-tabs v-model="activeName" >
3 <el-tab-pane label="更正" name="gz"> 3 <el-tab-pane label="更正" name="gz">
4 <div class="main"> 4 <div class="main">
5 <!-- <p class="tips">查询条件</p> --> 5 <!-- <p class="tips">查询条件</p> -->
......
1 <template> 1 <template>
2 <el-tabs v-model="activeName" type="border-card"> 2 <el-tabs v-model="activeName" >
3 <el-tab-pane label="综合查询" name="zhcx"> 3 <el-tab-pane label="综合查询" name="zhcx">
4 <div class="main"> 4 <div class="main">
5 <!-- <p class="tips">查询条件</p> --> 5 <!-- <p class="tips">查询条件</p> -->
......
1 <template> 1 <template>
2 <!-- <div class="content_box"> --> 2 <!-- <div class="content_box"> -->
3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" > 3 <el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" >
4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane> 4 <el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
5 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane> 5 <el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
6 <el-tab-pane label="界址点" name="jzd"> 6 <el-tab-pane label="界址点" name="jzd">
......