Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
1688935d by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 22f172be fbd9ef23
Inline Side-by-side
Showing 11 changed files with 67 additions and 59 deletions
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#666666" d="M904.533333 311.466667c-17.066667-17.066667-42.666667-17.066667-59.733333 0L512 644.266667 179.2 311.466667c-17.066667-17.066667-42.666667-17.066667-59.733333 0-17.066667 17.066667-17.066667 42.666667 0 59.733333l362.666666 362.666667c8.533333 8.533333 19.2 12.8 29.866667 12.8s21.333333-4.266667 29.866667-12.8l362.666666-362.666667c17.066667-17.066667 17.066667-42.666667 0-59.733333z" /></svg>
...\ No newline at end of file ...\ No newline at end of file
1 <?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg class="icon" width="200px" height="200.00px" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg"><path fill="#666666" d="M904.533333 674.133333l-362.666666-362.666666c-17.066667-17.066667-42.666667-17.066667-59.733334 0l-362.666666 362.666666c-17.066667 17.066667-17.066667 42.666667 0 59.733334 17.066667 17.066667 42.666667 17.066667 59.733333 0L512 401.066667l332.8 332.8c8.533333 8.533333 19.2 12.8 29.866667 12.8s21.333333-4.266667 29.866666-12.8c17.066667-17.066667 17.066667-42.666667 0-59.733334z" /></svg>
...\ No newline at end of file ...\ No newline at end of file
...@@ -103,7 +103,7 @@ ol, ul { list-style:none; } ...@@ -103,7 +103,7 @@ ol, ul { list-style:none; }
103 >.is-top{ 103 >.is-top{
104 position: -webkit-fixed; 104 position: -webkit-fixed;
105 position: fixed; 105 position: fixed;
106 top: 72px; 106 top: 66px;
107 z-index: 999; 107 z-index: 999;
108 width: 100%; 108 width: 100%;
109 margin-bottom: 0; 109 margin-bottom: 0;
...@@ -149,7 +149,7 @@ ol, ul { list-style:none; } ...@@ -149,7 +149,7 @@ ol, ul { list-style:none; }
149 } 149 }
150 .el-dialog__header{ 150 .el-dialog__header{
151 border-bottom: 1px solid #F1F1F1; 151 border-bottom: 1px solid #F1F1F1;
152 background: #6f94f5; 152 background: #3FA2E1;
153 } 153 }
154 .el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{ 154 .el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{
155 color: #fff; 155 color: #fff;
......
...@@ -21,29 +21,6 @@ ...@@ -21,29 +21,6 @@
21 }" 21 }"
22 > 22 >
23 <div 23 <div
24 v-if="item.children"
25 class="reTree_icon"
26 :style="{
27 height: (size || 16 * 1.2) + 'px',
28 width: (size || 16 * 1.2) + 'px',
29 }"
30 :class="{
31 reTree_default_icon: item.children.length === 0,
32 reTree_collapse_icon: !islpb && item.expand && item.children.length > 0,
33 reTree_expand_icon: !islpb && !item.expand && item.children.length > 0,
34 lpbTree_collapse_icon: islpb && item.expand && item.children.length > 0,
35 lpbTree_expand_icon: islpb && !item.expand && item.children.length > 0,
36 }"
37 ></div>
38 <div
39 v-if="item.children==null"
40 class="reTree_icon reTree_expand_icon"
41 :style="{
42 height: (size || 16 * 1.2) + 'px',
43 width: (size || 16 * 1.2) + 'px',
44 }"
45 ></div>
46 <div
47 class="layer_text nowrap" 24 class="layer_text nowrap"
48 @contextmenu.prevent="openMenu($event, item,list)" 25 @contextmenu.prevent="openMenu($event, item,list)"
49 :class="{ 26 :class="{
...@@ -54,8 +31,8 @@ ...@@ -54,8 +31,8 @@
54 :data-zdbsm="item.zdbsm" 31 :data-zdbsm="item.zdbsm"
55 :title=item.mc 32 :title=item.mc
56 > 33 >
57 <span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)" style="background: #9e9b9b"> 34 <span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)">
58 <span class="qsztFont">变</span> 35 <span class="qsztFont" style="color: #9e9b9b">变</span>
59 </span> 36 </span>
60 <template v-else> 37 <template v-else>
61 <span class="qsztImg" v-if="item.qszt=='0'" > 38 <span class="qsztImg" v-if="item.qszt=='0'" >
...@@ -80,9 +57,32 @@ ...@@ -80,9 +57,32 @@
80 </span> 57 </span>
81 58
82 59
83 {{ item.mc }} 60 <span class="project-name">{{ item.mc }}</span>
84 61
85 </div> 62 </div>
63 <div
64 v-if="item.children"
65 class="reTree_icon"
66 :style="{
67 height: (size || 16 * 1.2) + 'px',
68 width: (size || 16 * 1.2) + 'px',
69 }"
70 :class="{
71 reTree_default_icon: item.children.length === 0,
72 reTree_collapse_icon: !islpb && item.expand && item.children.length > 0,
73 reTree_expand_icon: !islpb && !item.expand && item.children.length > 0,
74 lpbTree_collapse_icon: islpb && item.expand && item.children.length > 0,
75 lpbTree_expand_icon: islpb && !item.expand && item.children.length > 0,
76 }"
77 ></div>
78 <div
79 v-if="item.children==null"
80 class="reTree_icon reTree_expand_icon"
81 :style="{
82 height: (size || 16 * 1.2) + 'px',
83 width: (size || 16 * 1.2) + 'px',
84 }"
85 ></div>
86 </div> 86 </div>
87 <line-item 87 <line-item
88 :list="item.children" 88 :list="item.children"
...@@ -331,6 +331,7 @@ export default { ...@@ -331,6 +331,7 @@ export default {
331 cursor: pointer; 331 cursor: pointer;
332 .layer_text { 332 .layer_text {
333 flex: 1; 333 flex: 1;
334 line-height: 16px;
334 } 335 }
335 } 336 }
336 .first_vertical_line { 337 .first_vertical_line {
...@@ -348,15 +349,15 @@ export default { ...@@ -348,15 +349,15 @@ export default {
348 } 349 }
349 .second_layer { 350 .second_layer {
350 position: relative; 351 position: relative;
351 width: 100%; 352 width: calc(100% - 20px);
352 cursor: pointer; 353 cursor: pointer;
353 padding-left: 25px; 354 padding-left: 20px;
354 } 355 }
355 .third_layer { 356 .third_layer {
356 position: relative; 357 position: relative;
357 // padding-bottom: 15px; 358 width: calc(100% - 20px);
358 width: 100%; 359 cursor: pointer;
359 padding-left: 25px; 360 padding-left: 20px;
360 } 361 }
361 .white_layer { 362 .white_layer {
362 color: black!important; 363 color: black!important;
...@@ -441,13 +442,13 @@ export default { ...@@ -441,13 +442,13 @@ export default {
441 442
442 .reTree_collapse_icon { 443 .reTree_collapse_icon {
443 // opacity: .5; 444 // opacity: .5;
444 background: url("../../assets/images/reTree_collapse_.svg") no-repeat center 445 background: url("../../assets/images/arrow-up-bold.svg") no-repeat center
445 center; 446 center;
446 background-size: contain; 447 background-size: contain;
447 } 448 }
448 .reTree_expand_icon { 449 .reTree_expand_icon {
449 // opacity: .5; 450 // opacity: .5;
450 background: url("../../assets/images/reTree_expand_.svg") no-repeat center 451 background: url("../../assets/images/arrow-down-bold.svg") no-repeat center
451 center; 452 center;
452 background-size: contain; 453 background-size: contain;
453 } 454 }
...@@ -474,9 +475,11 @@ export default { ...@@ -474,9 +475,11 @@ export default {
474 } 475 }
475 .qsztImg{ 476 .qsztImg{
476 width: 16px; 477 width: 16px;
478 border-radius: 50%; height: 20px; width: 20px; display: inline-block;
479 }
480 .project-name{
477 position: relative; 481 position: relative;
478 top: 1px; 482 top: 1px;
479 border-radius: 50%; height: 20px; width: 20px; display: inline-block;
480 } 483 }
481 .curPage{ 484 .curPage{
482 color: orange; 485 color: orange;
......
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 || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'374') + 'px' }" 4 :style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'270') + 'px' }"
5 > 5 >
6 <div 6 <div
7 class="column-start-center basic_layer" 7 class="column-start-center basic_layer"
...@@ -16,7 +16,8 @@ ...@@ -16,7 +16,8 @@
16 }" 16 }"
17 @click="itemClick(item)" 17 @click="itemClick(item)"
18 > 18 >
19 <div 19
20 <div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)">{{ item.mc }}</div><div
20 class="reTree_icon" 21 class="reTree_icon"
21 :style="{ 22 :style="{
22 height: (size || 16 * 1.2) + 'px', 23 height: (size || 16 * 1.2) + 'px',
...@@ -30,7 +31,6 @@ ...@@ -30,7 +31,6 @@
30 lpbTree_expand_icon: islpb && !item.expand && item.children.length > 0, 31 lpbTree_expand_icon: islpb && !item.expand && item.children.length > 0,
31 }" 32 }"
32 ></div> 33 ></div>
33 <div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)">{{ item.mc }}</div>
34 </div> 34 </div>
35 35
36 <lineItem 36 <lineItem
...@@ -115,9 +115,9 @@ ...@@ -115,9 +115,9 @@
115 </ul> 115 </ul>
116 116
117 <!--@close="closeImportDialog"--> 117 <!--@close="closeImportDialog"-->
118 <el-dialog v-dialogDrag :close-on-click-modal="false" title="导入图形" :modal="false" custom-class="importDialog" :visible.sync="improtDialog" width="30%" @close="closeImportDialog"> 118 <el-dialog v-dialogDrag :close-on-click-modal="false" title="导入图形" :modal="false" custom-class="importDialog" :visible.sync="improtDialog" width="30%" @close="closeImportDialog">
119 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> 119 <import-geo :property-info="zdData" :timeLine="new Date().getTime()" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo>
120 </el-dialog> 120 </el-dialog>
121 <!-- 添加定着物弹框 --> 121 <!-- 添加定着物弹框 -->
122 <el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :visible.sync="dialogVisible" width="48%"> 122 <el-dialog v-dialogDrag :close-on-click-modal="false" title="新建" :visible.sync="dialogVisible" width="48%">
123 <Create @closeDialog="closeDialog" :auth="true" :createZrz="createZrz" ></Create> 123 <Create @closeDialog="closeDialog" :auth="true" :createZrz="createZrz" ></Create>
...@@ -801,7 +801,7 @@ export default { ...@@ -801,7 +801,7 @@ export default {
801 background: #c3c5c8; 801 background: #c3c5c8;
802 } 802 }
803 .reTree_collapse_icon { 803 .reTree_collapse_icon {
804 background: url("../../assets/images/reTree_collapse_.svg") no-repeat center 804 background: url("../../assets/images/arrow-up-bold.svg") no-repeat center
805 center; 805 center;
806 background-size: contain; 806 background-size: contain;
807 } 807 }
...@@ -813,7 +813,7 @@ export default { ...@@ -813,7 +813,7 @@ export default {
813 } 813 }
814 814
815 .reTree_expand_icon { 815 .reTree_expand_icon {
816 background: url("../../assets/images/reTree_expand_.svg") no-repeat center 816 background: url("../../assets/images/arrow-down-bold.svg") no-repeat center
817 center; 817 center;
818 background-size: contain; 818 background-size: contain;
819 } 819 }
...@@ -836,8 +836,8 @@ export default { ...@@ -836,8 +836,8 @@ export default {
836 center; 836 center;
837 background-size: contain; 837 background-size: contain;
838 } 838 }
839 /deep/ .importDialog{ 839 /deep/ .importDialog{
840 margin-top: 120px!important; 840 margin-top: 120px!important;
841 margin-left: 291px; 841 margin-left: 291px;
842 } 842 }
843 </style> 843 </style>
......
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 </el-main> 66 </el-main>
67 </el-container> 67 </el-container>
68 </el-container> 68 </el-container>
69 <div class="treeModule-show" :class="{ 'w0': isActive }"></div> 69 <!-- <div class="treeModule-show" :class="{ 'w0': isActive }"></div> -->
70 </div> 70 </div>
71 </template> 71 </template>
72 <script> 72 <script>
...@@ -576,6 +576,7 @@ export default { ...@@ -576,6 +576,7 @@ export default {
576 .treeModule { 576 .treeModule {
577 box-sizing: border-box; 577 box-sizing: border-box;
578 padding: 20px 20px; 578 padding: 20px 20px;
579 border-right: 1px solid #dedede;
579 } 580 }
580 .logo-box-show { 581 .logo-box-show {
581 width: 64px; 582 width: 64px;
......
...@@ -896,6 +896,7 @@ ...@@ -896,6 +896,7 @@
896 width: 100%; 896 width: 100%;
897 margin-bottom: 0; 897 margin-bottom: 0;
898 border: 0; 898 border: 0;
899 border-bottom: 1px solid #E4E7ED;
899 /deep/ .el-tabs__nav-scroll { 900 /deep/ .el-tabs__nav-scroll {
900 height: 50px; 901 height: 50px;
901 box-sizing: border-box; 902 box-sizing: border-box;
......
...@@ -85,6 +85,7 @@ export default { ...@@ -85,6 +85,7 @@ export default {
85 width: 100%; 85 width: 100%;
86 margin-bottom: 0; 86 margin-bottom: 0;
87 border: 0; 87 border: 0;
88 border-bottom: 1px solid #E4E7ED;
88 /deep/ .el-tabs__nav-scroll { 89 /deep/ .el-tabs__nav-scroll {
89 height: 50px; 90 height: 50px;
90 box-sizing: border-box; 91 box-sizing: border-box;
......
...@@ -589,6 +589,7 @@ ...@@ -589,6 +589,7 @@
589 width: 100%; 589 width: 100%;
590 margin-bottom: 0; 590 margin-bottom: 0;
591 border: 0; 591 border: 0;
592 border-bottom: 1px solid #E4E7ED;
592 /deep/ .el-tabs__nav-scroll { 593 /deep/ .el-tabs__nav-scroll {
593 height: 50px; 594 height: 50px;
594 box-sizing: border-box; 595 box-sizing: border-box;
......
...@@ -174,6 +174,14 @@ ...@@ -174,6 +174,14 @@
174 </td> 174 </td>
175 </tr> 175 </tr>
176 <tr> 176 <tr>
177 <td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
178 <td colspan="10">
179 <input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
180 class="formInput" v-model="formData.zl"/>
181 </td>
182 </tr>
183
184 <tr>
177 <td colspan="2" class="tdright">容积率</td> 185 <td colspan="2" class="tdright">容积率</td>
178 <td colspan="2"> 186 <td colspan="2">
179 <el-select class="formSelect" :disabled="disabled" v-model="formData.jyrjl"> 187 <el-select class="formSelect" :disabled="disabled" v-model="formData.jyrjl">
...@@ -282,15 +290,6 @@ ...@@ -282,15 +290,6 @@
282 <input type="text" :disabled="disabled" class="formInput" v-model="formData.tfh"/> 290 <input type="text" :disabled="disabled" class="formInput" v-model="formData.tfh"/>
283 </td> 291 </td>
284 </tr> 292 </tr>
285
286 <tr>
287 <td colspan="2" class="tdright"><i class="requisite">*</i>坐落</td>
288 <td colspan="10">
289 <input type="text" :disabled="disabled" @blur="inputBlur($event)" ref="zl"
290 class="formInput" v-model="formData.zl"/>
291 </td>
292 </tr>
293
294 <tr> 293 <tr>
295 <td colspan="2" rowspan="4" class="tdright">宗地四至</td> 294 <td colspan="2" rowspan="4" class="tdright">宗地四至</td>
296 <td colspan="2" class="tdright"><i class="requisite">*</i>北至</td> 295 <td colspan="2" class="tdright"><i class="requisite">*</i>北至</td>
......
...@@ -835,7 +835,6 @@ export default { ...@@ -835,7 +835,6 @@ export default {
835 background-color: rgb(245, 250, 254); 835 background-color: rgb(245, 250, 254);
836 .tab-header { 836 .tab-header {
837 border: 1px solid #dedede; 837 border: 1px solid #dedede;
838 border-top: 0;
839 box-sizing: border-box; 838 box-sizing: border-box;
840 padding: 20px 0; 839 padding: 20px 0;
841 background-color: #ffffff; 840 background-color: #ffffff;
...@@ -897,6 +896,7 @@ export default { ...@@ -897,6 +896,7 @@ export default {
897 } 896 }
898 } 897 }
899 .tab-content { 898 .tab-content {
899 border: 1px solid #dedede;
900 background-color: #ffffff; 900 background-color: #ffffff;
901 display: flex; 901 display: flex;
902 overflow-y: scroll; 902 overflow-y: scroll;
......