Skip to content

任超 / js.CadastralSystem

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

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

2 parents 8015c2a7 ed87cd67
Expand all
Inline Side-by-side
Showing 11 changed files with 79 additions and 58 deletions
...@@ -43,12 +43,12 @@ export default { ...@@ -43,12 +43,12 @@ export default {
43 margin-bottom: 10px; 43 margin-bottom: 10px;
44 li{ 44 li{
45 cursor: pointer; 45 cursor: pointer;
46 padding: 4px 16px; 46 padding: 8px 16px;
47 position: relative; 47 position: relative;
48 i{ 48 i{
49 position: absolute; 49 position: absolute;
50 right: 20px; 50 right: 20px;
51 top: 6px; 51 top: 11px;
52 color: #4EB2FF; 52 color: #4EB2FF;
53 display: none; 53 display: none;
54 } 54 }
......
...@@ -31,6 +31,18 @@ ...@@ -31,6 +31,18 @@
31 <ul class="icon_lists dib-box"> 31 <ul class="icon_lists dib-box">
32 32
33 <li class="dib"> 33 <li class="dib">
34 <span class="icon iconfont">&#xe779;</span>
35 <div class="name">多幢</div>
36 <div class="code-name">&amp;#xe779;</div>
37 </li>
38
39 <li class="dib">
40 <span class="icon iconfont">&#xe77a;</span>
41 <div class="name">自然幢</div>
42 <div class="code-name">&amp;#xe77a;</div>
43 </li>
44
45 <li class="dib">
34 <span class="icon iconfont">&#xe778;</span> 46 <span class="icon iconfont">&#xe778;</span>
35 <div class="name">户重新落宗</div> 47 <div class="name">户重新落宗</div>
36 <div class="code-name">&amp;#xe778;</div> 48 <div class="code-name">&amp;#xe778;</div>
...@@ -285,6 +297,24 @@ ...@@ -285,6 +297,24 @@
285 <ul class="icon_lists dib-box"> 297 <ul class="icon_lists dib-box">
286 298
287 <li class="dib"> 299 <li class="dib">
300 <span class="icon iconfont iconduochuang"></span>
301 <div class="name">
302 多幢
303 </div>
304 <div class="code-name">.iconduochuang
305 </div>
306 </li>
307
308 <li class="dib">
309 <span class="icon iconfont iconziranchuang"></span>
310 <div class="name">
311 自然幢
312 </div>
313 <div class="code-name">.iconziranchuang
314 </div>
315 </li>
316
317 <li class="dib">
288 <span class="icon iconfont iconhuzhongxinlazong"></span> 318 <span class="icon iconfont iconhuzhongxinlazong"></span>
289 <div class="name"> 319 <div class="name">
290 户重新落宗 320 户重新落宗
...@@ -621,6 +651,22 @@ ...@@ -621,6 +651,22 @@
621 651
622 <li class="dib"> 652 <li class="dib">
623 <svg class="icon svg-icon" aria-hidden="true"> 653 <svg class="icon svg-icon" aria-hidden="true">
654 <use xlink:href="#iconduochuang"></use>
655 </svg>
656 <div class="name">多幢</div>
657 <div class="code-name">#iconduochuang</div>
658 </li>
659
660 <li class="dib">
661 <svg class="icon svg-icon" aria-hidden="true">
662 <use xlink:href="#iconziranchuang"></use>
663 </svg>
664 <div class="name">自然幢</div>
665 <div class="code-name">#iconziranchuang</div>
666 </li>
667
668 <li class="dib">
669 <svg class="icon svg-icon" aria-hidden="true">
624 <use xlink:href="#iconhuzhongxinlazong"></use> 670 <use xlink:href="#iconhuzhongxinlazong"></use>
625 </svg> 671 </svg>
626 <div class="name">户重新落宗</div> 672 <div class="name">户重新落宗</div>
......
...@@ -6,6 +6,20 @@ ...@@ -6,6 +6,20 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
9 "icon_id": "18727148",
10 "name": "多幢",
11 "font_class": "duochuang",
12 "unicode": "e779",
13 "unicode_decimal": 59257
14 },
15 {
16 "icon_id": "18727149",
17 "name": "自然幢",
18 "font_class": "ziranchuang",
19 "unicode": "e77a",
20 "unicode_decimal": 59258
21 },
22 {
9 "icon_id": "18623953", 23 "icon_id": "18623953",
10 "name": "户重新落宗", 24 "name": "户重新落宗",
11 "font_class": "huzhongxinlazong", 25 "font_class": "huzhongxinlazong",
......
...@@ -20,6 +20,12 @@ Created by iconfont ...@@ -20,6 +20,12 @@ Created by iconfont
20 /> 20 />
21 <missing-glyph /> 21 <missing-glyph />
22 22
23 <glyph glyph-name="duochuang" unicode="&#59257;" d="M68.266667 793.6h546.133333v-819.2H68.266667v819.2z m68.266666-68.266667v-682.666666h409.6v682.666666H136.533333zM238.933333 622.933333h68.266667v-68.266666h-68.266667V622.933333z m136.533334 0h68.266666v-68.266666h-68.266666V622.933333zM238.933333 486.4h68.266667v-68.266667h-68.266667V486.4z m136.533334 0h68.266666v-68.266667h-68.266666V486.4zM238.933333 349.866667h68.266667v-68.266667h-68.266667V349.866667z m136.533334 0h68.266666v-68.266667h-68.266666V349.866667zM238.933333 213.333333h68.266667v-68.266666h-68.266667v68.266666z m136.533334 0h68.266666v-68.266666h-68.266666v68.266666zM546.133333 588.8h409.6v-614.4H546.133333v614.4z m68.266667-68.266667v-477.866666h273.066667v477.866666H614.4zM716.8 486.4h68.266667v-68.266667h-68.266667zM716.8 349.866667h68.266667v-68.266667h-68.266667zM716.8 213.333333h68.266667v-68.266666h-68.266667z" horiz-adv-x="1024" />
24
25
26 <glyph glyph-name="ziranchuang" unicode="&#59258;" d="M170.666667 793.6h682.666666v-819.2h-682.666666v819.2z m68.266666-68.266667v-682.666666h546.133334v682.666666h-546.133334zM341.333333 622.933333h68.266667v-68.266666H341.333333V622.933333z m136.533334 0h68.266666v-68.266666H477.866667V622.933333z m136.533333 0h68.266667v-68.266666H614.4V622.933333zM341.333333 486.4h68.266667v-68.266667H341.333333V486.4z m136.533334 0h68.266666v-68.266667H477.866667V486.4z m136.533333 0h68.266667v-68.266667H614.4V486.4zM341.333333 349.866667h68.266667v-68.266667H341.333333V349.866667z m136.533334 0h68.266666v-68.266667H477.866667V349.866667z m136.533333 0h68.266667v-68.266667H614.4V349.866667zM341.333333 213.333333h68.266667v-68.266666H341.333333v68.266666z m136.533334 0h68.266666v-68.266666H477.866667v68.266666z m136.533333 0h68.266667v-68.266666H614.4v68.266666z" horiz-adv-x="1024" />
27
28
23 <glyph glyph-name="huzhongxinlazong" unicode="&#59256;" d="M146.285714 896h731.428572a146.285714 146.285714 0 0 0 146.285714-146.285714v-731.428572a146.285714 146.285714 0 0 0-146.285714-146.285714H146.285714a146.285714 146.285714 0 0 0-146.285714 146.285714V749.714286a146.285714 146.285714 0 0 0 146.285714 146.285714z m0-73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857v-731.428572a73.142857 73.142857 0 0 1 73.142857-73.142857h731.428572a73.142857 73.142857 0 0 1 73.142857 73.142857V749.714286a73.142857 73.142857 0 0 1-73.142857 73.142857H146.285714zM512 214.674286l-152.137143-98.084572a36.571429 36.571429 0 0 0-55.222857 40.082286l46.299429 175.030857L210.651429 446.098286a36.571429 36.571429 0 0 0 21.065142 64.804571l180.736 10.093714 65.462858 168.813715a36.571429 36.571429 0 0 0 68.169142 0l65.462858-168.813715 180.736-10.093714a36.571429 36.571429 0 0 0 21.065142-64.804571L673.060571 331.702857l46.299429-175.030857a36.571429 36.571429 0 0 0-55.222857-40.082286L512 214.674286zM492.178286 288.914286a36.571429 36.571429 0 0 0 39.643428 0l92.672-59.757715-28.233143 106.642286a36.571429 36.571429 0 0 0 12.288 37.668572l85.430858 69.705142-110.08 6.070858a36.571429 36.571429 0 0 0-32.036572 23.332571L512 575.341714l-39.862857-102.765714a36.571429 36.571429 0 0 0-32.036572-23.332571l-110.08-6.070858 85.430858-69.705142a36.571429 36.571429 0 0 0 12.288-37.668572l-28.233143-106.642286L492.251429 288.914286z" horiz-adv-x="1024" /> 29 <glyph glyph-name="huzhongxinlazong" unicode="&#59256;" d="M146.285714 896h731.428572a146.285714 146.285714 0 0 0 146.285714-146.285714v-731.428572a146.285714 146.285714 0 0 0-146.285714-146.285714H146.285714a146.285714 146.285714 0 0 0-146.285714 146.285714V749.714286a146.285714 146.285714 0 0 0 146.285714 146.285714z m0-73.142857a73.142857 73.142857 0 0 1-73.142857-73.142857v-731.428572a73.142857 73.142857 0 0 1 73.142857-73.142857h731.428572a73.142857 73.142857 0 0 1 73.142857 73.142857V749.714286a73.142857 73.142857 0 0 1-73.142857 73.142857H146.285714zM512 214.674286l-152.137143-98.084572a36.571429 36.571429 0 0 0-55.222857 40.082286l46.299429 175.030857L210.651429 446.098286a36.571429 36.571429 0 0 0 21.065142 64.804571l180.736 10.093714 65.462858 168.813715a36.571429 36.571429 0 0 0 68.169142 0l65.462858-168.813715 180.736-10.093714a36.571429 36.571429 0 0 0 21.065142-64.804571L673.060571 331.702857l46.299429-175.030857a36.571429 36.571429 0 0 0-55.222857-40.082286L512 214.674286zM492.178286 288.914286a36.571429 36.571429 0 0 0 39.643428 0l92.672-59.757715-28.233143 106.642286a36.571429 36.571429 0 0 0 12.288 37.668572l85.430858 69.705142-110.08 6.070858a36.571429 36.571429 0 0 0-32.036572 23.332571L512 575.341714l-39.862857-102.765714a36.571429 36.571429 0 0 0-32.036572-23.332571l-110.08-6.070858 85.430858-69.705142a36.571429 36.571429 0 0 0 12.288-37.668572l-28.233143-106.642286L492.251429 288.914286z" horiz-adv-x="1024" />
24 30
25 31
......
...@@ -25,8 +25,9 @@ ...@@ -25,8 +25,9 @@
25 <div class="zxx"> 25 <div class="zxx">
26 <el-card class="zrz"> 26 <el-card class="zrz">
27 <div slot="header" class="clearfix"> 27 <div slot="header" class="clearfix">
28 <span>多幢信息({{zdZxx.dzList.length}}个)</span>， 28 <span style="margin-right:10px">幢信息</span>
29 <span>自然幢信息({{zdZxx.zrzList.length}}个)</span> 29 <span style="margin-right:10px"><i class="iconfont iconduochuang"></i>多幢<span style="color:red">{{zdZxx.dzList.length}}</span>幢</span>
30 <span><i class="iconfont iconziranchuang"></i>自然幢<span style="color:red">{{zdZxx.zrzList.length}}</span>幢</span>
30 </div> 31 </div>
31 <ul> 32 <ul>
32 <li v-for="(item,index) in zdZxx.dzList" :key="index+item.xmmc" 33 <li v-for="(item,index) in zdZxx.dzList" :key="index+item.xmmc"
...@@ -125,64 +126,18 @@ ...@@ -125,64 +126,18 @@
125 <td class="xmmc"> 126 <td class="xmmc">
126 <input type="text" v-model="item.xmmc" class="formInput"/> 127 <input type="text" v-model="item.xmmc" class="formInput"/>
127 </td> 128 </td>
128 <!-- <td class="xzzxx">
129 <span>多幢:</span>
130 <ul>
131 <li v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex"
132 @mouseenter="mouseenter($event,index,dzIndex,'dz')"
133 @mouseleave="mouseleave($event)">{{dzItem.xmmc}}
134 <span v-if="dzIndex<item.dz.length-1">,</span>
135 </li>
136 </ul>
137 <span>自然幢:</span>
138 <ul>
139 <li v-for="(zrzItem,zrzIndex) in item.zrz" :key="zrzIndex"
140 @mouseenter="mouseenter($event,index,zrzIndex,'zrz')"
141 @mouseleave="mouseleave($event)"
142 >{{zrzItem.xmmc}}
143 <span v-if="zrzIndex<item.zrz.length-1">,</span>
144 </li>
145 </ul>
146 <span class="zxx">自然幢1 <i class="fa fa-times"></i></span>
147 <span class="zxx">自然幢2 <i class="fa fa-times"></i></span>
148 <span class="zxx">自然幢3 <i class="fa fa-times"></i></span>
149 <span class="zxx">多幢1 <i class="fa fa-times"></i></span>
150 <span class="choose">选择</span>
151 </td> -->
152 <!-- <td class="">
153 <el-dropdown @command="dzHandleCommand($event,index)">
154 <span class="el-dropdown-link">
155 选择多幢<i class="el-icon-arrow-down el-icon--right"></i>
156 </span>
157 <el-dropdown-menu slot="dropdown">
158 <el-dropdown-item v-for="(childItem,childIndex) in zdDzList"
159 :key="childIndex" :command="childItem.bsm">
160 {{childItem.xmmc}}
161 </el-dropdown-item>
162 </el-dropdown-menu>
163 </el-dropdown>
164 <el-dropdown @command="zrzHandleCommand($event,index)">
165 <span class="el-dropdown-link">
166 选择自然幢<i class="el-icon-arrow-down el-icon--right"></i>
167 </span>
168 <el-dropdown-menu slot="dropdown">
169 <el-dropdown-item v-for="(childItem,childIndex) in zdZrzList"
170 :key="childIndex" :command="childItem.bsm">
171 {{childItem.xmmc}}
172 </el-dropdown-item>
173 </el-dropdown-menu>
174 </el-dropdown>
175 </td> -->
176 </tr> 129 </tr>
177 <tr :key="index"> 130 <tr :key="index">
178 <td colspan="6"> 131 <td colspan="6">
179 <div class="fghzxx"> 132 <div class="fghzxx">
180 <div class="choosedZxx"> 133 <div class="choosedZxx">
181 <span v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex+dzItem.xmmc" class="zxx"> 134 <span v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex+dzItem.xmmc" class="zxx">
182 {{dzItem.xmmc}} <i class="fa fa-times" @click="delZxx(index,dzIndex,'dz')"></i> 135 {{dzItem.xmmc}}<span v-if="dzIndex<(item.dz.length-1) || item.zrz.length>0">、</span>
136 <!-- <i class="fa fa-times" @click="delZxx(index,dzIndex,'dz')"></i> -->
183 </span> 137 </span>
184 <span v-for="(zrzItem,zrzIndex) in item.zrz" :key="zrzIndex+zrzItem.xmmc" class="zxx"> 138 <span v-for="(zrzItem,zrzIndex) in item.zrz" :key="zrzIndex+zrzItem.xmmc" class="zxx">
185 {{zrzItem.xmmc}} <i class="fa fa-times" @click="delZxx(index,zrzIndex,'zrz')"></i> 139 {{zrzItem.xmmc}}<span v-if="zrzIndex<(item.zrz.length-1)">、</span>
140 <!-- <i class="fa fa-times" @click="delZxx(index,zrzIndex,'zrz')"></i> -->
186 </span> 141 </span>
187 </div> 142 </div>
188 <p class="choose"> 143 <p class="choose">
...@@ -371,7 +326,7 @@ ...@@ -371,7 +326,7 @@
371 <ul> 326 <ul>
372 <li><span>宗地代码:</span>{{hFgqData.zddm}}</li> 327 <li><span>宗地代码:</span>{{hFgqData.zddm}}</li>
373 <li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li> 328 <li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li>
374 <li><span>项目名称:</span>{{hFgqData.xmmc}}</li> 329 <li><span>项目名称:</span>{{hFgqData.xmmc}}</li>s's's's's's's's's's's's's's's's's's's
375 <li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li> 330 <li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li>
376 <li><span>权利人:</span>{{hFgqData.qlr}}</li> 331 <li><span>权利人:</span>{{hFgqData.qlr}}</li>
377 <li><span>坐落:</span>{{hFgqData.zl}}</li> 332 <li><span>坐落:</span>{{hFgqData.zl}}</li>
...@@ -1008,8 +963,8 @@ ...@@ -1008,8 +963,8 @@
1008 963
1009 /deep/ .el-card__header{ 964 /deep/ .el-card__header{
1010 padding: 16px 20px; 965 padding: 16px 20px;
1011 background-color: #F2F2F2; 966 background-color: #FAFAFA;
1012 border: 1px solid #DBDBDB; 967 border-bottom: 1px solid #E6E6E6;
1013 -webkit-box-sizing: border-box; 968 -webkit-box-sizing: border-box;
1014 box-sizing: border-box; 969 box-sizing: border-box;
1015 } 970 }
...@@ -1216,7 +1171,7 @@ ...@@ -1216,7 +1171,7 @@
1216 text-align: left; 1171 text-align: left;
1217 text-indent: 20px; 1172 text-indent: 20px;
1218 .zxx{ 1173 .zxx{
1219 padding-right: 10px; 1174 // padding-right: 10px;
1220 position: relative; 1175 position: relative;
1221 i{ 1176 i{
1222 display: none; 1177 display: none;
......