Skip to content

任超 / js.CadastralSystem

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

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

2 parents 396da2e3 94b418da
Inline Side-by-side
Showing 6 changed files with 24 additions and 21 deletions
...@@ -116,7 +116,7 @@ ol, ul { list-style:none; } ...@@ -116,7 +116,7 @@ ol, ul { list-style:none; }
116 >.el-tabs__item{ 116 >.el-tabs__item{
117 border: 1px solid #DEDEDE; 117 border: 1px solid #DEDEDE;
118 height: 30px; 118 height: 30px;
119 line-height: 30px; 119 line-height: 28px;
120 padding: 0 20px; 120 padding: 0 20px;
121 margin: 9px 10px 9px 0; 121 margin: 9px 10px 9px 0;
122 } 122 }
...@@ -128,6 +128,9 @@ ol, ul { list-style:none; } ...@@ -128,6 +128,9 @@ ol, ul { list-style:none; }
128 } 128 }
129 } 129 }
130 } 130 }
131 .el-tabs__item{
132 font-size: 16px;
133 }
131 //弹框遮罩层样式 134 //弹框遮罩层样式
132 .v-modal{ 135 .v-modal{
133 opacity: .2; 136 opacity: .2;
......
...@@ -24,8 +24,8 @@ ...@@ -24,8 +24,8 @@
24 v-if="item.children" 24 v-if="item.children"
25 class="reTree_icon" 25 class="reTree_icon"
26 :style="{ 26 :style="{
27 height: (size || 14 * 1.2) + 'px', 27 height: (size || 16 * 1.2) + 'px',
28 width: (size || 14 * 1.2) + 'px', 28 width: (size || 16 * 1.2) + 'px',
29 }" 29 }"
30 :class="{ 30 :class="{
31 reTree_default_icon: item.children.length === 0, 31 reTree_default_icon: item.children.length === 0,
...@@ -37,8 +37,8 @@ ...@@ -37,8 +37,8 @@
37 v-if="item.children==null" 37 v-if="item.children==null"
38 class="reTree_icon reTree_expand_icon" 38 class="reTree_icon reTree_expand_icon"
39 :style="{ 39 :style="{
40 height: (size || 14 * 1.2) + 'px', 40 height: (size || 16 * 1.2) + 'px',
41 width: (size || 14 * 1.2) + 'px', 41 width: (size || 16 * 1.2) + 'px',
42 }" 42 }"
43 ></div> 43 ></div>
44 <div 44 <div
...@@ -83,7 +83,7 @@ export default { ...@@ -83,7 +83,7 @@ export default {
83 }, 83 },
84 size: { 84 size: {
85 type: Number, 85 type: Number,
86 default: 14, 86 default: 16,
87 }, 87 },
88 visible: { 88 visible: {
89 type: Boolean, 89 type: Boolean,
...@@ -174,7 +174,7 @@ export default { ...@@ -174,7 +174,7 @@ export default {
174 } 174 }
175 }, 175 },
176 // 左键双击事件 176 // 左键双击事件
177 dbclick(item) { 177 dbclick(item,) {
178 clearTimeout(this.time); 178 clearTimeout(this.time);
179 //此处不要将$router移到if的外面，因为可能是双击行政区，就不知道去哪儿了 179 //此处不要将$router移到if的外面，因为可能是双击行政区，就不知道去哪儿了
180 if (item.type == 'zd') { 180 if (item.type == 'zd') {
...@@ -342,8 +342,8 @@ export default { ...@@ -342,8 +342,8 @@ export default {
342 content: ""; 342 content: "";
343 position: absolute; 343 position: absolute;
344 /* 为了触顶 */ 344 /* 为了触顶 */
345 top: -14px; 345 top: -16px;
346 height: calc(100% + 14px); 346 height: calc(100% + 16px);
347 width: 1px; 347 width: 1px;
348 left: 7px; 348 left: 7px;
349 opacity: .5; 349 opacity: .5;
...@@ -355,7 +355,7 @@ export default { ...@@ -355,7 +355,7 @@ export default {
355 content: ""; 355 content: "";
356 position: absolute; 356 position: absolute;
357 height: 23px; 357 height: 23px;
358 top: -14px; 358 top: -16px;
359 width: 1px; 359 width: 1px;
360 left: 7px; 360 left: 7px;
361 opacity: .5; 361 opacity: .5;
...@@ -401,7 +401,7 @@ export default { ...@@ -401,7 +401,7 @@ export default {
401 background-size: contain; 401 background-size: contain;
402 } 402 }
403 .qsztImg{ 403 .qsztImg{
404 width: 14px; 404 width: 16px;
405 position: relative; 405 position: relative;
406 top: 1px; 406 top: 1px;
407 } 407 }
......
1 <template> 1 <template>
2 <div 2 <div
3 class="content column-start-center reTree_box" 3 class="content column-start-center reTree_box"
4 :style="{ fontSize: (size || 14) + 'px', lineHeight: (size || 14) + 'px', width: (islpb ? '200':'374') + 'px' }" 4 :style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'374') + 'px' }"
5 > 5 >
6 <div 6 <div
7 class="column-start-center basic_layer" 7 class="column-start-center basic_layer"
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
19 <div 19 <div
20 class="reTree_icon" 20 class="reTree_icon"
21 :style="{ 21 :style="{
22 height: (size || 14 * 1.2) + 'px', 22 height: (size || 16 * 1.2) + 'px',
23 width: (size || 14 * 1.2) + 'px', 23 width: (size || 16 * 1.2) + 'px',
24 }" 24 }"
25 :class="{ 25 :class="{
26 reTree_default_icon: item.children.length === 0, 26 reTree_default_icon: item.children.length === 0,
...@@ -129,7 +129,7 @@ export default { ...@@ -129,7 +129,7 @@ export default {
129 pd: {}, 129 pd: {},
130 size: { 130 size: {
131 type: Number, 131 type: Number,
132 default: 14, 132 default: 16,
133 }, 133 },
134 islpb:{ 134 islpb:{
135 type: Boolean, 135 type: Boolean,
...@@ -730,8 +730,8 @@ export default { ...@@ -730,8 +730,8 @@ export default {
730 content: ""; 730 content: "";
731 position: absolute; 731 position: absolute;
732 /* 为了触顶 */ 732 /* 为了触顶 */
733 top: -14px; 733 top: -16px;
734 height: calc(100% + 14px); 734 height: calc(100% + 16px);
735 width: 1px; 735 width: 1px;
736 left: 9px; 736 left: 9px;
737 background: #c3c5c8; 737 background: #c3c5c8;
...@@ -741,7 +741,7 @@ export default { ...@@ -741,7 +741,7 @@ export default {
741 content: ""; 741 content: "";
742 position: absolute; 742 position: absolute;
743 height: 23px; 743 height: 23px;
744 top: -14px; 744 top: -16px;
745 width: 1px; 745 width: 1px;
746 left: 9px; 746 left: 9px;
747 background: #c3c5c8; 747 background: #c3c5c8;
......
...@@ -468,7 +468,7 @@ export default { ...@@ -468,7 +468,7 @@ export default {
468 cursor: pointer; 468 cursor: pointer;
469 height: 60px; 469 height: 60px;
470 padding: 0 30px; 470 padding: 0 30px;
471 font-size: 16px; 471 font-size: 18px;
472 line-height: 60px; 472 line-height: 60px;
473 float: left; 473 float: left;
474 position: relative; 474 position: relative;
......
...@@ -900,7 +900,7 @@ ...@@ -900,7 +900,7 @@
900 > .el-tabs__item { 900 > .el-tabs__item {
901 border: 1px solid #DEDEDE; 901 border: 1px solid #DEDEDE;
902 height: 36px; 902 height: 36px;
903 line-height: 36px; 903 line-height: 32px;
904 padding: 0 20px; 904 padding: 0 20px;
905 margin: 9px 10px 9px 0; 905 margin: 9px 10px 9px 0;
906 background-color: #ffffff; 906 background-color: #ffffff;
......
...@@ -496,7 +496,7 @@ ...@@ -496,7 +496,7 @@
496 > .el-tabs__item { 496 > .el-tabs__item {
497 border: 1px solid #DEDEDE; 497 border: 1px solid #DEDEDE;
498 height: 36px; 498 height: 36px;
499 line-height: 36px; 499 line-height: 32px;
500 padding: 0 20px; 500 padding: 0 20px;
501 margin: 9px 10px 9px 0; 501 margin: 9px 10px 9px 0;
502 background-color: #ffffff; 502 background-color: #ffffff;
......