Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
394d00d3 by weimo934
Options

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	src/views/systemZRZ/lpb/bjlp/index.vue
2 parents fe2d18f6 e49c2e10
Expand all
Inline Side-by-side
Showing 3 changed files with 38 additions and 33 deletions
...@@ -44,7 +44,8 @@ const store = new Vuex.Store({ ...@@ -44,7 +44,8 @@ const store = new Vuex.Store({
44 zjlxList: [], 44 zjlxList: [],
45 gyfsList: [], 45 gyfsList: [],
46 hbsm:'', 46 hbsm:'',
47 contentWidth:'' //内容区域宽度 47 contentWidth:'', //内容区域宽度
48 zrzh:'' //自然幢号
48 }, 49 },
49 modules: { 50 modules: {
50 user, 51 user,
......
...@@ -25,8 +25,7 @@ ...@@ -25,8 +25,7 @@
25 <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button> 25 <el-button class="radioBtn" label="4" border @click="plcVisible=true">批量层</el-button>
26 <el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button> 26 <el-button class="radioBtn" label="5" border @click="plShVisible=true">批量室号</el-button>
27 <el-button class="radioBtn" label="6" border @click="plzlVisible=true">批量坐落</el-button> 27 <el-button class="radioBtn" label="6" border @click="plzlVisible=true">批量坐落</el-button>
28 <el-button class="radioBtn" label="7" border>批量单元号</el-button> 28 <el-button class="radioBtn" label="7" border @click="addBdcdyh">批量单元号</el-button>
29 <el-button class="radioBtn" label="7" border @click="hcxlzVisible=true">户重新落宗</el-button>
30 </div> 29 </div>
31 </el-col> 30 </el-col>
32 </el-row> 31 </el-row>
...@@ -136,8 +135,7 @@ ...@@ -136,8 +135,7 @@
136 <el-button type="primary" @click="saveInfo">保存</el-button> 135 <el-button type="primary" @click="saveInfo">保存</el-button>
137 <el-button type="primary" @click="resetInfo">重置</el-button> 136 <el-button type="primary" @click="resetInfo">重置</el-button>
138 <el-button type="primary" @click="dialogVisible = false" 137 <el-button type="primary" @click="dialogVisible = false"
139 >取消 138 >取消</el-button
140 </el-button
141 > 139 >
142 </div> 140 </div>
143 </el-dialog> 141 </el-dialog>
...@@ -377,17 +375,17 @@ ...@@ -377,17 +375,17 @@
377 console.log(this.bsms); 375 console.log(this.bsms);
378 }, 376 },
379 //不动产单元号输入框事件 377 //不动产单元号输入框事件
380 inputFocus() { 378 inputFocus(){
381 this.inputWidth = 200 379 this.inputWidth = 200
382 }, 380 },
383 inputBlur() { 381 inputBlur(){
384 this.inputWidth = 74 382 this.inputWidth = 74
385 }, 383 },
386 inputChange() { 384 inputChange(){
387 if (this.bdcdyh != '') { 385 if (this.bdcdyh!='') {
388 console.log('查询' + this.bdcdyh); 386 console.log('查询'+this.bdcdyh);
389 this.$refs.lpbContent.lpbDataMap(this.bdcdyh); 387 this.$refs.lpbContent.lpbDataMap(this.bdcdyh);
390 } else { 388 }else{
391 this.$message({ 389 this.$message({
392 message: "请输入内容后查询", 390 message: "请输入内容后查询",
393 type: "warning", 391 type: "warning",
...@@ -395,40 +393,46 @@ ...@@ -395,40 +393,46 @@
395 } 393 }
396 }, 394 },
397 //户保存 395 //户保存
398 hbjSaveInfo() { 396 hbjSaveInfo(){
399 this.$refs.hbj.onSave(this.bsms[this.bsms.length - 1], this.tabPosition); 397 this.$refs.hbj.onSave(this.bsms[this.bsms.length-1],this.tabPosition);
400 }, 398 },
401 //户编辑表单重置 399 //户编辑表单重置
402 hbjResetInfo() { 400 hbjResetInfo(){
403 this.$refs.hbj.onReset(); 401 this.$refs.hbj.onReset();
404 }, 402 },
405 //调用楼盘表信息查询接口 403 //调用楼盘表信息查询接口
406 getlpbData() { 404 getlpbData(){
407 this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm); 405 this.$refs.lpbContent.getLpb(this.$store.state.zrzbsm);
408 //改变楼盘表子组件的key值，重新渲染 406 //改变楼盘表子组件的key值，重新渲染
409 this.time = new Date().getTime(); 407 this.time = new Date().getTime();
410 }, 408 },
411 //实预测装换 409 //实预测装换
412 plScYcChange() { 410 plScYcChange(){
413 let data = { 411 let data={
414 zrzbsm: this.$store.state.zrzbsm, 412 zrzbsm:this.$store.state.zrzbsm,
415 scyclx: "0" 413 scyclx:"0"
416 } 414 }
417 batchScYcChange(data).then((res) => { 415 batchScYcChange(data).then((res)=>{
418 if (res.code === 200) { 416 if(res.code===200){
419 this.$message.success("实预测转换成功") 417 this.$message.success("实预测转换成功")
420 } 418 }
421 }) 419 })
422 }, 420 },
423 //选中房屋状态 421 //选中房屋状态
424 handleChoosedH() { 422 handleChoosedH(){
425 //清除选中户 423 //清除选中户
426 this.$refs.lpbContent.clearChoosedH() 424 this.$refs.lpbContent.clearChoosedH()
427 //给hBsmList传值 425 //给hBsmList传值
428 // this.$refs.lpbContent.choosedList=["0a66bc775dcec26385f9124cc0fd8656", "58cafdbee129bb412527f674ef9267ae", "4bbca678fa56d5ab97b8a62c7cb54898", "ecfd72e9a31a03ba0ab4e46faba2b51b", "049033ea9d244b4b5ea75521b6862239", "013352d8a001a1d5f790296b6843627b", "ed8e3f0e2b2682cf76b4d58b9a74e49c", "37cc53acaf2c3bb92be4b9adf06d94c9", "f5a5e14ce08c26056aca5861f56e5cf6", "11eeaaa5c9f5f1231c69d3b958d05568", "421978023a36d4920dbb86300cc52dc9", "e97f2af2588cc0e41ffb6b203df617c9", "7210987d94350472dca10d4ad71fffc5", "6eb1b50edce538a4c63574e9e28fedce", "43c5fecd7623ceabc37844e8a4722603", "c361ccfcd3da9f7288110c6fa202cb96", "2321512f6f8d0ec9f570c6eec9a892fe", "ea08fb234cd908c89a0d21c085dadb2f", "be71f7f0ec926e1850d3baec8817cdbd", "6f695d6b7ecb97f7ff17f22dbe86b93c", "4ee1604b2629e6797d3096c20229223b"] 426 // this.$refs.lpbContent.choosedList=["0a66bc775dcec26385f9124cc0fd8656", "58cafdbee129bb412527f674ef9267ae", "4bbca678fa56d5ab97b8a62c7cb54898", "ecfd72e9a31a03ba0ab4e46faba2b51b", "049033ea9d244b4b5ea75521b6862239", "013352d8a001a1d5f790296b6843627b", "ed8e3f0e2b2682cf76b4d58b9a74e49c", "37cc53acaf2c3bb92be4b9adf06d94c9", "f5a5e14ce08c26056aca5861f56e5cf6", "11eeaaa5c9f5f1231c69d3b958d05568", "421978023a36d4920dbb86300cc52dc9", "e97f2af2588cc0e41ffb6b203df617c9", "7210987d94350472dca10d4ad71fffc5", "6eb1b50edce538a4c63574e9e28fedce", "43c5fecd7623ceabc37844e8a4722603", "c361ccfcd3da9f7288110c6fa202cb96", "2321512f6f8d0ec9f570c6eec9a892fe", "ea08fb234cd908c89a0d21c085dadb2f", "be71f7f0ec926e1850d3baec8817cdbd", "6f695d6b7ecb97f7ff17f22dbe86b93c", "4ee1604b2629e6797d3096c20229223b"]
427 },
428 //批量添加不动产单元号
429 addBdcdyh(){
430 // this.pd[0].bsm //自然幢标识码
431 console.log(this.$store.state.zrzh,'this.$store.state.zrzh');
429 } 432 }
430 }, 433 },
431 computed: {}, 434 computed: {
435 },
432 destroyed() { 436 destroyed() {
433 window.removeEventListener("resize", this.getHeight); 437 window.removeEventListener("resize", this.getHeight);
434 }, 438 },
...@@ -449,10 +453,10 @@ ...@@ -449,10 +453,10 @@
449 } 453 }
450 }, 454 },
451 }, 455 },
452 }; 456 };
453 </script> 457 </script>
454 <style scoped lang="less"> 458 <style scoped lang="less">
455 .edit { 459 .edit {
456 height: 100%; 460 height: 100%;
457 background-color: #eaedf5; 461 background-color: #eaedf5;
458 .tab-header { 462 .tab-header {
...@@ -465,17 +469,17 @@ ...@@ -465,17 +469,17 @@
465 .searchContent { 469 .searchContent {
466 box-sizing: border-box; 470 box-sizing: border-box;
467 padding: 0 20px; 471 padding: 0 20px;
468 /deep/ .el-radio-button__inner { 472 /deep/.el-radio-button__inner {
469 border: 1px solid #00CACD; 473 border: 1px solid #00CACD;
470 color: #00CACD; 474 color: #00CACD;
471 } 475 }
472 /deep/ .el-radio-button__inner:hover { 476 /deep/.el-radio-button__inner:hover{
473 color: #00CACD; 477 color: #00CACD;
474 } 478 }
475 /deep/ .is-active .el-radio-button__inner { 479 /deep/.is-active .el-radio-button__inner{
476 color: #fff; 480 color: #fff;
477 } 481 }
478 /deep/ .el-radio-button__orig-radio:checked + .el-radio-button__inner { 482 /deep/.el-radio-button__orig-radio:checked+.el-radio-button__inner{
479 background-color: #00CACD; 483 background-color: #00CACD;
480 border-color: #00CACD; 484 border-color: #00CACD;
481 } 485 }
...@@ -487,7 +491,7 @@ ...@@ -487,7 +491,7 @@
487 } 491 }
488 .radioBtn { 492 .radioBtn {
489 margin-left: 20px; 493 margin-left: 20px;
490 /deep/ .el-radio-button__inner { 494 /deep/.el-radio-button__inner {
491 border: 1px solid #dcdfe6; 495 border: 1px solid #dcdfe6;
492 border-radius: 4px; 496 border-radius: 4px;
493 box-shadow: 0 0 0 0 #409eff !important; 497 box-shadow: 0 0 0 0 #409eff !important;
...@@ -559,7 +563,7 @@ ...@@ -559,7 +563,7 @@
559 letter-spacing: 2px; 563 letter-spacing: 2px;
560 } 564 }
561 } 565 }
562 .selectedZt { 566 .selectedZt{
563 background-color: #0091FF; 567 background-color: #0091FF;
564 color: #fff; 568 color: #fff;
565 } 569 }
...@@ -595,12 +599,12 @@ ...@@ -595,12 +599,12 @@
595 } 599 }
596 } 600 }
597 } 601 }
598 .tab-content::-webkit-scrollbar { 602 .tab-content::-webkit-scrollbar{
599 width: 1px; 603 width: 1px;
600 } 604 }
601 .btnGroup { 605 .btnGroup {
602 margin: 20px auto 0; 606 margin: 20px auto 0;
603 width: 230px; 607 width: 230px;
604 } 608 }
605 } 609 }
606 </style> 610 </style>
......