Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5f9ec4ef by 焦泽平
Options

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

2 parents a2311813 7595b603
Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 <div 10 <div
11 :class=" 11 :class="
12 lpbData.cs.length == 0 && lpbData.zdys.length == 0 12 lpbData.cs.length == 0 && lpbData.zdys.length == 0
13 ? 'bottom40 ljz-wrap' 13 ? 'ljz-wrap'
14 : 'ljz-wrap' 14 : 'ljz-wrap'
15 " 15 "
16 v-show="lpbData.ljzs.length > 0" 16 v-show="lpbData.ljzs.length > 0"
...@@ -21,13 +21,13 @@ ...@@ -21,13 +21,13 @@
21 ref="ljz" 21 ref="ljz"
22 v-for="(ljzs, ljzIndex) in lpbData.ljzs" 22 v-for="(ljzs, ljzIndex) in lpbData.ljzs"
23 :key="ljzIndex" 23 :key="ljzIndex"
24 :style="{'marginTop':ljzs.zdys.length > 0 ? '-30px':0}" 24 :style="{'marginTop':'30px'}"
25 > 25 >
26 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> --> 26 <!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
27 <!-- 循环逻辑幢下的幢单元 --> 27 <!-- 循环逻辑幢下的幢单元 -->
28 <div 28 <div
29 class="ljz-zdy" 29 class="ljz-zdy"
30 :style="{ 'min-height': ljzzdyHeight + 40 + 'px' }" 30 :style="{ 'min-height': ljzzdyHeight + 40 + 'px','marginRight':zdyIndex<(ljzs.zdys.length-1)?'20px':'0'}"
31 ref="ljzzdy" 31 ref="ljzzdy"
32 v-show="ljzs.zdys.length > 0" 32 v-show="ljzs.zdys.length > 0"
33 v-for="(zdys, zdyIndex) in ljzs.zdys" 33 v-for="(zdys, zdyIndex) in ljzs.zdys"
...@@ -724,7 +724,7 @@ export default { ...@@ -724,7 +724,7 @@ export default {
724 height: auto; 724 height: auto;
725 overflow: hidden; 725 overflow: hidden;
726 .ljz { 726 .ljz {
727 margin-bottom: 20px; 727 // margin-bottom: 20px;
728 display: table; 728 display: table;
729 // position: relative; 729 // position: relative;
730 // .ljz-zdy-wrap { 730 // .ljz-zdy-wrap {
...@@ -732,7 +732,6 @@ export default { ...@@ -732,7 +732,6 @@ export default {
732 // display: table; 732 // display: table;
733 .ljz-zdy { 733 .ljz-zdy {
734 height: auto; 734 height: auto;
735 margin-right: 20px;
736 float: left; 735 float: left;
737 position: relative; 736 position: relative;
738 .zdy-name { 737 .zdy-name {
...@@ -779,6 +778,7 @@ export default { ...@@ -779,6 +778,7 @@ export default {
779 height: auto; 778 height: auto;
780 overflow: hidden; 779 overflow: hidden;
781 margin-bottom: 60px; 780 margin-bottom: 60px;
781 margin-top: 30px;
782 .zdy { 782 .zdy {
783 float: left; 783 float: left;
784 margin-right: 20px; 784 margin-right: 20px;
......