Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
47cd4455 by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/systemZRZ/lpb/bjlp/index.vue
2 parents 4fdf960f 0fa2bed3
Inline Side-by-side
Showing 5 changed files with 470 additions and 24 deletions
...@@ -49,7 +49,8 @@ export function getLpb (data) { ...@@ -49,7 +49,8 @@ export function getLpb (data) {
49 url: 'fw/lpb/getLpb', 49 url: 'fw/lpb/getLpb',
50 method: 'get', 50 method: 'get',
51 params: { 51 params: {
52 zrzbsm:data 52 zrzbsm:data,
53 syclx:0,
53 }, 54 },
54 }) 55 })
55 } 56 }
...\ No newline at end of file ...\ No newline at end of file
......
1 <template>
2 <div class="temp">
3 <el-row
4 class="qlxzModule"
5 v-for="(items, index) in countList"
6 :key="items.id"
7 >
8 <template v-for="(childItem,childIndex) in items.list" >
9 <el-col :span="2" class="btnCol" :key="childIndex+'1'" :class="childIndex>0 ? 'childYT noTopBorder':''">
10 <el-button
11 v-show="childIndex<1"
12 type="primary"
13 class="changeBtn"
14 @click="handleClick( index, 'add')"
15 >+</el-button
16 >
17 <el-button
18 v-show="childIndex<1"
19 type="primary"
20 class="changeBtn"
21 @click="handleClick( index, 'minus')"
22 >-</el-button
23 >
24 <div
25 :class="items.hasNotBorder ? 'itemShow whiteItem' : 'whiteItem'"
26 v-if="items.isInside"
27 ></div>
28 </el-col>
29 <el-col :span="2" class="btnCol" :key="childIndex+'8'" :class="childIndex>0 ? 'childYT':''">
30 <!-- <template v-if="childIndex>0"> -->
31 <span class="qlxz" v-show="childIndex<1">权利性质</span><br>
32 <el-button
33 type="primary"
34 class="changeBtn"
35 @click="handleInClick(index, childIndex, 'add')"
36 >+</el-button
37 >
38 <el-button
39 type="primary"
40 class="changeBtn"
41 @click="handleInClick(index, childIndex, 'minus')"
42 >-</el-button
43 >
44 <!-- </template> -->
45 </el-col>
46 <el-col :span="5" :key="childIndex+'7'" :class="childIndex>0 ? 'childYT':''">
47 <ul>
48 <li>批准用途</li>
49 <li>实际用途</li>
50 <li>土地使用起始时间<i class="requisite">*</i></li>
51 </ul>
52 </el-col>
53 <el-col :span="5" :key="childIndex+'6'" :class="childIndex>0 ? 'childYT':''">
54 <ul>
55 <li>
56 <el-select class="formSelect percent30" v-model="childItem.pzytdm">
57 <el-option
58 v-for="item in $store.state.tdytList"
59 :key="item.dm"
60 :label="item.mc"
61 :value="item.dm"
62 >
63 </el-option>
64 </el-select>
65 </li>
66 <li>
67 <el-select class="formSelect percent30" v-model="childItem.sjytdm">
68 <el-option
69 v-for="item in $store.state.tdytList"
70 :key="item.dm"
71 :label="item.mc"
72 :value="item.dm"
73 >
74 </el-option>
75 </el-select>
76 </li>
77 <li>
78 <el-date-picker
79 v-model="childItem.tdsyqssj"
80 type="date"
81 value-format="yyyy-MM-dd"
82 placeholder="选择日期"
83 >
84 </el-date-picker>
85 </li>
86 </ul>
87 </el-col>
88 <el-col :span="5" :key="childIndex+'5'" :class="childIndex>0 ? 'childYT':''">
89 <ul>
90 <li>地类编码</li>
91 <li>地类编码</li>
92 <li>土地使用结束时间<i class="requisite">*</i></li>
93 </ul>
94 </el-col>
95 <el-col :span="5" :key="childIndex+'4'" :class="childIndex>0 ? 'childYT':''">
96 <ul>
97 <li>
98 <input type="text" placeholder="请输入" v-model="childItem.pzytdm" class="formInput" />
99 </li>
100 <li>
101 <input type="text" placeholder="请输入" v-model="childItem.sjytdm" class="formInput" />
102 </li>
103 <li>
104 <el-date-picker
105 v-model="childItem.tdsyjssj"
106 type="date"
107 value-format="yyyy-MM-dd"
108 placeholder="选择日期"
109 >
110 </el-date-picker>
111 </li>
112 </ul>
113 </el-col>
114 </template>
115
116 <div class="title">
117 <el-select class="formSelect" v-model="items.qlxzdm">
118 <el-option
119 v-for="item in $store.state.qlxzList"
120 :key="item.dm"
121 :label="item.mc"
122 :value="item.dm"
123 >
124 </el-option>
125 </el-select>
126 </div>
127 </el-row>
128 </div>
129 </template>
130
131 <script>
132 import { getDdicByMC } from "../../api/common";
133 export default {
134 props: {
135 // widtd: {
136 // type: String,
137 // default: "70%",
138 // },
139 },
140 data() {
141 return {
142 countList: [
143 {
144 id: Math.random(),
145 isInside: false,
146 hasNotBorder: false,
147 "bsm": "",//权利性质标识码
148 "glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
149 "qlxzdm": "",
150 "zhqlxzlx": "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
151 list:[
152 {
153 "pzdjbsm": "",
154 "pzdjmc": "",
155 "pzytdm": "",
156 "pzytmc": "",
157 "pzytmj": 0,
158 "qlxzbsm": "",
159 "sjdjbsm": "",
160 "sjdjmc": "",
161 "sjytdm": "",
162 "sjytmc": "",
163 "sjytmj": 0,
164 "syqx": "",
165 "tdsyjssj": "",
166 "tdsyqssj": "",
167 "tdzh": ""
168 }
169 ]
170 },
171 ],
172 outNum:0
173 };
174 },
175 created(){
176 },
177 methods: {
178 //外层操作
179 handleClick( ind, type) {
180 let outsideObj = {
181 id: Math.random(),
182 isInside: false,
183 hasNotBorder: false,
184 "bsm": "",//权利性质标识码
185 "glbsm": "",//宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
186 "qlxzdm": "",
187 "zhqlxzlx": "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
188 list:[
189 {
190 "pzdjbsm": "",
191 "pzdjmc": "",
192 "pzytdm": "",
193 "pzytmc": "",
194 "pzytmj": 0,
195 "qlxzbsm": "",
196 "sjdjbsm": "",
197 "sjdjmc": "",
198 "sjytdm": "",
199 "sjytmc": "",
200 "sjytmj": 0,
201 "syqx": "",
202 "tdsyjssj": "",
203 "tdsyqssj": "",
204 "tdzh": ""
205 }
206 ]
207 };
208 if (type === "add") {
209 this.countList.push(outsideObj);
210 this.outNum++
211 } else {
212 this.countList.forEach((item, index) => {
213 if (index == ind && this.countList.length > 1) {
214 this.countList.splice(index, 1);
215 }
216 });
217 this.outNum--
218 }
219 },
220 //内层操作
221 handleInClick(index, childIndex, type) {
222 let insideObj = {
223 "pzdjbsm": "",
224 "pzdjmc": "",
225 "pzytdm": "",
226 "pzytmc": "",
227 "pzytmj": 0,
228 "qlxzbsm": "",
229 "sjdjbsm": "",
230 "sjdjmc": "",
231 "sjytdm": "",
232 "sjytmc": "",
233 "sjytmj": 0,
234 "syqx": "",
235 "tdsyjssj": "",
236 "tdsyqssj": "",
237 "tdzh": ""
238 };
239 if (type === "add") {
240 this.countList[index].list.splice(childIndex + 1, 0, insideObj);
241 } else {
242 this.countList[index].list.forEach((item, childInd) => {
243 if (childIndex == childInd && this.countList[index].list.length > 1) {
244 this.countList[index].list.splice(childIndex, 1);
245 }
246 });
247 }
248 this.hasBorderOrNot();
249 },
250 //判断是否显示边框
251 hasBorderOrNot() {
252 this.countList.forEach((item, index) => {
253 if (index == this.countList.length - 1) {
254 item.hasNotBorder = true;
255 } else {
256 item.hasNotBorder = item.isInside && !this.countList[index + 1].isInside ? true : false;
257 }
258 });
259 },
260 getQlxzDataList() {
261 return this.countList;
262 },
263 },
264 };
265 </script>
266 <style lang="less">
267 .temp {
268 width: 100%;
269 .qlxzModule {
270 height: auto;
271 position: relative;
272 border-bottom: 1px solid grey;
273 .el-col {
274 // height: 100%;
275 border-right: 1px solid grey;
276 position: relative;
277 .qlxz {
278 line-height: 34px;
279 }
280 ul {
281 margin-top: 34px;
282 li {
283 height: 37px;
284 line-height: 37px;
285 text-decoration: none;
286 border-bottom: 1px solid #E6E6E6;
287 .el-select{
288 width: 100%;
289 }
290 .el-input{
291 width: 100%;
292 }
293 .el-input__inner {
294 height: 34px;
295 }
296 }
297 li:last-child {
298 border-bottom: none;
299 }
300 }
301 .whiteItem {
302 background-color: #fff;
303 position: absolute;
304 width: 100%;
305 height: 2px;
306 bottom: -1px;
307 left: 0;
308 }
309 .itemShow {
310 bottom: 2px;
311 }
312 }
313 .childYT{
314 height: 114px;
315 border-top: 1px solid grey;
316 ul {
317 margin-top: 0;
318 li{
319 .el-input__inner {
320 height: 29px;
321 }
322 }
323 }
324 .changeBtn {
325 margin-top: -48px;
326 }
327 .el-button + .el-button {
328 margin-top: 4px;
329 }
330 }
331 .noTopBorder{
332 border-top: 0;
333 }
334 .noRightBorder{
335 border-right: 0;
336 }
337 .el-col:nth-last-child(2) {
338 border-right: none;
339 }
340 .title {
341 width: 83.33333%;
342 height: 34px;
343 line-height: 34px;
344 background-color: #fff;
345 border-bottom: 1px solid grey;
346 position: absolute;
347 right: 0;
348 top: 0;
349 .formSelect {
350 top: -1px;
351 width: 100%;
352 .el-input__inner {
353 height: 32px;
354 }
355 }
356 }
357 }
358 .btnCol {
359 position: relative;
360 height: 146px;
361 .changeBtn {
362 width: 46px;
363 height: 46px;
364 font-size: 30px;
365 padding: 4px 6px;
366 position: absolute;
367 top: 50%;
368 left: 50%;
369 margin-top: -38px;
370 margin-left: -23px;
371 }
372 .el-button + .el-button {
373 margin-left: -23px;
374 margin-top: 16px;
375 }
376 }
377 .el-row:nth-last-child(1) {
378 border-bottom: none;
379 }
380 }
381 </style>
...@@ -375,7 +375,7 @@ ...@@ -375,7 +375,7 @@
375 375
376 <script> 376 <script>
377 import Qlr from "../../../components/formMenu/qlr"; 377 import Qlr from "../../../components/formMenu/qlr";
378 import Qlxz from "../../../components/formMenu/qlxz"; 378 import Qlxz from "../../../components/formMenu/qlxz_simple";
379 export default { 379 export default {
380 name:'zrz', 380 name:'zrz',
381 components:{ 381 components:{
......
...@@ -2,25 +2,40 @@ ...@@ -2,25 +2,40 @@
2 <div class="edit"> 2 <div class="edit">
3 <div class="tab-header"> 3 <div class="tab-header">
4 <el-row class="searchContent"> 4 <el-row class="searchContent">
5 <el-col :span="10"> 5 <el-col :span="8">
6 <el-radio-group v-model="tabPosition"> 6 <el-radio-group v-model="tabPosition">
7 <el-radio-button label="sc">实测</el-radio-button> 7 <el-radio-button label="sc">实测</el-radio-button>
8 <el-radio-button label="yc">预测</el-radio-button> 8 <el-radio-button label="yc">预测</el-radio-button>
9 </el-radio-group> 9 </el-radio-group>
10 <el-input 10 <el-input
11 v-model="bdcdyh" 11 v-model="bdcdyh"
12 :style="{'width':inputWidth+'px'}"
13 @focus="inputFocus"
14 @blur="inputBlur"
15 @change="inputChange"
12 class="searchInput" 16 class="searchInput"
13 placeholder="输入不动产单元号" 17 placeholder="输入不动产单元号"
14 ></el-input> 18 ><i slot="suffix" class="el-input__icon el-icon-search" @click="inputChange"></i></el-input>
19 <!-- <el-autocomplete
20 v-model="bdcdyh"
21 :style="{'width':inputWidth+'px'}"
22 placeholder="输入不动产单元号">
23 <i
24 class="el-icon-search el-input__icon"
25 slot="suffix">
26 </i>
27 </el-autocomplete> -->
15 </el-col> 28 </el-col>
16 <el-col :span="14"> 29 <el-col :span="16">
17 <el-button class="radioBtn" label="1" @click="create" border>创建楼盘</el-button> 30 <div class="fr">
18 <el-button class="radioBtn" label="2" border>实预测转换</el-button> 31 <el-button class="radioBtn" label="1" border @click="create">创建楼盘</el-button>
19 <el-button class="radioBtn" label="3" border @click="plhVisible=true">批量户</el-button> 32 <el-button class="radioBtn" label="2" border>实预测转换</el-button>
20 <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button> 33 <el-button class="radioBtn" label="3" border @click="plhVisible=true">批量户</el-button>
21 <el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button> 34 <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button>
22 <el-button class="radioBtn" label="6" border @click="plzlVisible=true">批量坐落</el-button> 35 <el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button>
23 <el-button class="radioBtn" label="7" border>批量单元号</el-button> 36 <el-button class="radioBtn" label="6" border>批量坐落</el-button>
37 <el-button class="radioBtn" label="7" border>批量单元号</el-button>
38 </div>
24 </el-col> 39 </el-col>
25 </el-row> 40 </el-row>
26 </div> 41 </div>
...@@ -143,6 +158,7 @@ export default { ...@@ -143,6 +158,7 @@ export default {
143 dialogVisible: false, 158 dialogVisible: false,
144 menuType: "", 159 menuType: "",
145 treeData: {}, 160 treeData: {},
161 inputWidth:74,
146 legendList: [ 162 legendList: [
147 { 163 {
148 name: "未确权", 164 name: "未确权",
...@@ -297,6 +313,22 @@ export default { ...@@ -297,6 +313,22 @@ export default {
297 legendToggle() { 313 legendToggle() {
298 this.legendToggleFlag = !this.legendToggleFlag; 314 this.legendToggleFlag = !this.legendToggleFlag;
299 }, 315 },
316 //获取选中户bsm
317 getHbsm(data){
318 this.bsms = data;
319 // console.log(this.bsms);
320 },
321 inputFocus(){
322 this.inputWidth = 200
323 },
324 inputBlur(){
325 this.inputWidth = 74
326 },
327 inputChange(){
328 if (this.bdcdyh!='') {
329 console.log('查询'+this.bdcdyh);
330 }
331 }
300 }, 332 },
301 computed: { 333 computed: {
302 }, 334 },
...@@ -335,7 +367,7 @@ export default { ...@@ -335,7 +367,7 @@ export default {
335 margin-bottom: 20px; 367 margin-bottom: 20px;
336 .searchContent { 368 .searchContent {
337 box-sizing: border-box; 369 box-sizing: border-box;
338 padding-left: 20px; 370 padding: 0 20px;
339 /deep/.el-radio-button__inner { 371 /deep/.el-radio-button__inner {
340 border: 1px solid #00CACD; 372 border: 1px solid #00CACD;
341 color: #00CACD; 373 color: #00CACD;
...@@ -351,7 +383,7 @@ export default { ...@@ -351,7 +383,7 @@ export default {
351 border-color: #00CACD; 383 border-color: #00CACD;
352 } 384 }
353 .searchInput { 385 .searchInput {
354 width: 300px; 386 transition: .5s;
355 margin-left: 20px; 387 margin-left: 20px;
356 display: inline-block; 388 display: inline-block;
357 } 389 }
...@@ -399,13 +431,13 @@ export default { ...@@ -399,13 +431,13 @@ export default {
399 width: 34px; 431 width: 34px;
400 float: right; 432 float: right;
401 height: 100%; 433 height: 100%;
402 background-color: #0091FF;
403 color: #fff;
404 .btn { 434 .btn {
405 cursor: pointer; 435 cursor: pointer;
406 height: 40px; 436 height: 40px;
407 line-height: 40px; 437 line-height: 40px;
408 text-align: center; 438 text-align: center;
439 background-color: #0091FF;
440 color: #fff;
409 border-bottom: 1px solid #e6e6e6; 441 border-bottom: 1px solid #e6e6e6;
410 } 442 }
411 .dyzt { 443 .dyzt {
...@@ -419,6 +451,8 @@ export default { ...@@ -419,6 +451,8 @@ export default {
419 .dyzt, 451 .dyzt,
420 .fwxz, 452 .fwxz,
421 .fwyt { 453 .fwyt {
454 background-color: #0091FF;
455 color: #fff;
422 border-bottom: 1px solid #e6e6e6; 456 border-bottom: 1px solid #e6e6e6;
423 span { 457 span {
424 text-align: center; 458 text-align: center;
......
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
13 <!-- 显示层数 --> 13 <!-- 显示层数 -->
14 <td class="floor">{{cs.sjc}}层</td> 14 <td class="floor">{{cs.sjc}}层</td>
15 <!-- 显示户 --> 15 <!-- 显示户 -->
16 <td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex">{{hs.hh}}</td> 16 <td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)">{{hs.hh}}</td>
17 </tr> 17 </tr>
18 </table> 18 </table>
19 <!-- 幢单元名称 --> 19 <!-- 幢单元名称 -->
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
37 <!-- 显示层数 --> 37 <!-- 显示层数 -->
38 <td class="floor">{{cs.sjc}}层</td> 38 <td class="floor">{{cs.sjc}}层</td>
39 <!-- 显示户 --> 39 <!-- 显示户 -->
40 <td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex">{{hs.hh}}</td> 40 <td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)">{{hs.hh}}</td>
41 </tr> 41 </tr>
42 </table> 42 </table>
43 <!-- 幢单元名称 --> 43 <!-- 幢单元名称 -->
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
53 <!-- 显示层数 --> 53 <!-- 显示层数 -->
54 <td class="floor">{{cs.sjc}}层</td> 54 <td class="floor">{{cs.sjc}}层</td>
55 <!-- 显示户 --> 55 <!-- 显示户 -->
56 <td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex">{{hs.hh}}</td> 56 <td v-for="(hs,hsIndex) in cs.hs" :key="hsIndex" @click="handleTdClick($event,hs.bsm)">{{hs.hh}}</td>
57 </tr> 57 </tr>
58 </table> 58 </table>
59 </div> 59 </div>
...@@ -376,7 +376,8 @@ export default { ...@@ -376,7 +376,8 @@ export default {
376 ljzWidth:10000, 376 ljzWidth:10000,
377 zdyWidth:2000, 377 zdyWidth:2000,
378 cHeight:0, 378 cHeight:0,
379 loading:true 379 loading:true,
380 hbsmList:[]
380 }; 381 };
381 }, 382 },
382 created() { 383 created() {
...@@ -396,10 +397,7 @@ export default { ...@@ -396,10 +397,7 @@ export default {
396 getLpb(zrzbsm) 397 getLpb(zrzbsm)
397 .then((res => { 398 .then((res => {
398 if (res.code == 200) { 399 if (res.code == 200) {
399 // console.log(this.lpbData,'前');
400 this.lpbData = res.result; 400 this.lpbData = res.result;
401 // this.lpbData.zdys.push(this.lpbData.zdys)
402 // console.log(this.lpbData,'后');
403 setTimeout(() => { 401 setTimeout(() => {
404 //计算逻辑幢宽度 20为marginRight值 402 //计算逻辑幢宽度 20为marginRight值
405 this.ljzWidth -= 9980; 403 this.ljzWidth -= 9980;
...@@ -422,7 +420,29 @@ export default { ...@@ -422,7 +420,29 @@ export default {
422 }); 420 });
423 } 421 }
424 })) 422 }))
425 } 423 },
424 //td点击事件
425 handleTdClick(e,bsm){
426 //判断点击的户是否选中
427 if(e.target.className.indexOf('tdSelect') == -1){
428 //未选中
429 e.target.className = 'tdSelect'; //加边框
430 this.hbsmList.push(bsm) // 将户bsm放进hbsmList
431 }else{
432 //选中
433 e.target.className = '';
434 this.deleteArrOption(this.hbsmList,bsm);
435 }
436 this.$parent.getHbsm(this.hbsmList);
437 },
438 //删除多重数组中的某一项
439 deleteArrOption(arr, item) {
440 for (var i = arr.length; i > 0; i--) {
441 if (arr[i - 1] == item) {
442 arr.splice(i - 1, 1);
443 }
444 }
445 },
426 }, 446 },
427 computed: { 447 computed: {
428 createFlagChange() { 448 createFlagChange() {
...@@ -457,9 +477,14 @@ export default { ...@@ -457,9 +477,14 @@ export default {
457 height: 100%; 477 height: 100%;
458 position: relative; 478 position: relative;
459 overflow: scroll; 479 overflow: scroll;
480 -webkit-user-select:none;
481 -moz-user-select:none;
482 -ms-user-select:none;
483 user-select:none;
460 .ljz-wrap { 484 .ljz-wrap {
461 height: auto; 485 height: auto;
462 overflow: hidden; 486 overflow: hidden;
487 margin-bottom: 20px;
463 .ljz{ 488 .ljz{
464 float: left; 489 float: left;
465 margin-right: 20px; 490 margin-right: 20px;
...@@ -535,6 +560,11 @@ export default { ...@@ -535,6 +560,11 @@ export default {
535 height: 64px; 560 height: 64px;
536 line-height: 64px; 561 line-height: 64px;
537 text-align: center; 562 text-align: center;
563 cursor: pointer;
564
565 }
566 .tdSelect{
567 border: 1px solid #0091FF!important;
538 } 568 }
539 } 569 }
540 } 570 }
......