Merge remote-tracking branch 'origin/master'
Showing
14 changed files
with
313 additions
and
194 deletions
| ... | @@ -42,7 +42,7 @@ export default { | ... | @@ -42,7 +42,7 @@ export default { |
| 42 | this.isShow = true; | 42 | this.isShow = true; |
| 43 | this.tips = tips+'...'; | 43 | this.tips = tips+'...'; |
| 44 | }, | 44 | }, |
| 45 | loadingHide(tips){ | 45 | loadingHide(){ |
| 46 | this.isShow = false; | 46 | this.isShow = false; |
| 47 | } | 47 | } |
| 48 | }, | 48 | }, | ... | ... |
| ... | @@ -126,3 +126,13 @@ export function cxlzZrzList(data) { | ... | @@ -126,3 +126,13 @@ export function cxlzZrzList(data) { |
| 126 | }) | 126 | }) |
| 127 | } | 127 | } |
| 128 | 128 | ||
| 129 | /** | ||
| 130 | * 查询权籍_建筑物区分所有权业主共有部分调查表 | ||
| 131 | */ | ||
| 132 | export function getHCountByZrzbsm(id) { | ||
| 133 | return request({ | ||
| 134 | url: '/fw/qjZrz/getHCountByZrzbsm', | ||
| 135 | method: 'get', | ||
| 136 | params: {id} | ||
| 137 | }) | ||
| 138 | } | ... | ... |
| ... | @@ -98,6 +98,9 @@ ol, ul { list-style:none; } | ... | @@ -98,6 +98,9 @@ ol, ul { list-style:none; } |
| 98 | ::-webkit-scrollbar-track { | 98 | ::-webkit-scrollbar-track { |
| 99 | border-radius: 0; | 99 | border-radius: 0; |
| 100 | } | 100 | } |
| 101 | /deep/ .el-tabs--border-card{ | ||
| 102 | border: 0; | ||
| 103 | } | ||
| 101 | //二级菜单样式 | 104 | //二级菜单样式 |
| 102 | .tabs{ | 105 | .tabs{ |
| 103 | >.el-tabs__content{ | 106 | >.el-tabs__content{ |
| ... | @@ -153,7 +156,7 @@ ol, ul { list-style:none; } | ... | @@ -153,7 +156,7 @@ ol, ul { list-style:none; } |
| 153 | } | 156 | } |
| 154 | .el-dialog__header{ | 157 | .el-dialog__header{ |
| 155 | border-bottom: 1px solid #F1F1F1; | 158 | border-bottom: 1px solid #F1F1F1; |
| 156 | background: #3FA2E1; | 159 | background: #0091FF; |
| 157 | } | 160 | } |
| 158 | .el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{ | 161 | .el-dialog__headerbtn:focus .el-dialog__close, .el-dialog__headerbtn:hover .el-dialog__close{ |
| 159 | color: #fff; | 162 | color: #fff; |
| ... | @@ -305,16 +308,16 @@ ol, ul { list-style:none; } | ... | @@ -305,16 +308,16 @@ ol, ul { list-style:none; } |
| 305 | } | 308 | } |
| 306 | //实预测转换按钮样式 | 309 | //实预测转换按钮样式 |
| 307 | /deep/.el-radio-button__inner { | 310 | /deep/.el-radio-button__inner { |
| 308 | border: 1px solid #3fa2e1!important; | 311 | border: 1px solid #00cacd!important; |
| 309 | color: #3fa2e1; | 312 | color: #00cacd; |
| 310 | } | 313 | } |
| 311 | /deep/.el-radio-button__inner:hover { | 314 | /deep/.el-radio-button__inner:hover { |
| 312 | color: #3fa2e1; | 315 | color: #00cacd; |
| 313 | } | 316 | } |
| 314 | /deep/.is-active .el-radio-button__inner { | 317 | /deep/.is-active .el-radio-button__inner { |
| 315 | color: #fff; | 318 | color: #fff; |
| 316 | } | 319 | } |
| 317 | /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner { | 320 | /deep/.el-radio-button__orig-radio:checked + .el-radio-button__inner { |
| 318 | background-color: #3fa2e1; | 321 | background-color: #00cacd; |
| 319 | border-color: #3fa2e1; | 322 | border-color: #00cacd; |
| 320 | } | 323 | } |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -608,7 +608,7 @@ export default { | ... | @@ -608,7 +608,7 @@ export default { |
| 608 | exportText(){ | 608 | exportText(){ |
| 609 | var self = this; | 609 | var self = this; |
| 610 | var type = this.zdData.type; | 610 | var type = this.zdData.type; |
| 611 | var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm; | 611 | var BSM = type == 'zd'? this.zdData.zdbsm : this.zdData.bsm; |
| 612 | this.queryGeoByBsm(BSM,type,function (features){ | 612 | this.queryGeoByBsm(BSM,type,function (features){ |
| 613 | if(features && features.length > 0 && features[0].geometry.rings.length > 0){ | 613 | if(features && features.length > 0 && features[0].geometry.rings.length > 0){ |
| 614 | var data = features[0]; | 614 | var data = features[0]; |
| ... | @@ -637,7 +637,7 @@ export default { | ... | @@ -637,7 +637,7 @@ export default { |
| 637 | exportToShp(){ | 637 | exportToShp(){ |
| 638 | var self = this; | 638 | var self = this; |
| 639 | var type = this.zdData.type; | 639 | var type = this.zdData.type; |
| 640 | var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm; | 640 | var BSM = type == 'zd'? this.zdData.zdbsm : this.zdData.bsm; |
| 641 | this.queryGeoByBsm(BSM,type,function (features){ | 641 | this.queryGeoByBsm(BSM,type,function (features){ |
| 642 | if(features && features.length > 0 && features[0].geometry.rings.length > 0) { | 642 | if(features && features.length > 0 && features[0].geometry.rings.length > 0) { |
| 643 | var data = JSON.stringify(features[0]); | 643 | var data = JSON.stringify(features[0]); |
| ... | @@ -656,7 +656,7 @@ export default { | ... | @@ -656,7 +656,7 @@ export default { |
| 656 | exportExcel(){ | 656 | exportExcel(){ |
| 657 | var self = this; | 657 | var self = this; |
| 658 | var type = this.zdData.type; | 658 | var type = this.zdData.type; |
| 659 | var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm; | 659 | var BSM = type == 'zd'? this.zdData.zdbsm : this.zdData.bsm; |
| 660 | this.queryGeoByBsm(BSM,type,function (features) { | 660 | this.queryGeoByBsm(BSM,type,function (features) { |
| 661 | if (features && features.length > 0 && features[0].geometry.rings.length > 0) { | 661 | if (features && features.length > 0 && features[0].geometry.rings.length > 0) { |
| 662 | var data = features[0]; | 662 | var data = features[0]; |
| ... | @@ -696,7 +696,7 @@ export default { | ... | @@ -696,7 +696,7 @@ export default { |
| 696 | //图形定位 | 696 | //图形定位 |
| 697 | postionToMap(){ | 697 | postionToMap(){ |
| 698 | var type = this.zdData.type; | 698 | var type = this.zdData.type; |
| 699 | var BSM = type == 'zdt'? this.zdData.zdbsm : this.zdData.bsm; | 699 | var BSM = type == 'zd'? this.zdData.zdbsm : this.zdData.bsm; |
| 700 | if(this.$route.path == "/viewMap"){ | 700 | if(this.$route.path == "/viewMap"){ |
| 701 | //定位到当前空间位置 | 701 | //定位到当前空间位置 |
| 702 | // TODO 这个方法只是为了支撑功能 | 702 | // TODO 这个方法只是为了支撑功能 | ... | ... |
| ... | @@ -223,7 +223,7 @@ export default { | ... | @@ -223,7 +223,7 @@ export default { |
| 223 | }) | 223 | }) |
| 224 | }, | 224 | }, |
| 225 | //保存或者编辑属性信息 | 225 | //保存或者编辑属性信息 |
| 226 | updAttributes(bsm,type,attributes,callBackFunction){ | 226 | updAttributes(bsm,type,attributes,callBackFunction,ydybsm){ |
| 227 | var layer = null; | 227 | var layer = null; |
| 228 | if(type == 'zd'){ | 228 | if(type == 'zd'){ |
| 229 | layer = this.getLayerByName("ZDJBXX"); | 229 | layer = this.getLayerByName("ZDJBXX"); |
| ... | @@ -232,7 +232,7 @@ export default { | ... | @@ -232,7 +232,7 @@ export default { |
| 232 | } | 232 | } |
| 233 | var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer"); | 233 | var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer"); |
| 234 | featureUrl += "/"+layer.id; | 234 | featureUrl += "/"+layer.id; |
| 235 | this.queryGeoByBsm(bsm,type,function (features) { | 235 | this.queryGeoByBsm(ydybsm ? ydybsm:bsm,type,function (features) { |
| 236 | if(features && features.length > 0){ | 236 | if(features && features.length > 0){ |
| 237 | attributes.OBJECTID = features[0].attributes.OBJECTID; | 237 | attributes.OBJECTID = features[0].attributes.OBJECTID; |
| 238 | features[0].attributes = attributes; | 238 | features[0].attributes = attributes; |
| ... | @@ -240,6 +240,9 @@ export default { | ... | @@ -240,6 +240,9 @@ export default { |
| 240 | features[0].geometry.spatialReference = { | 240 | features[0].geometry.spatialReference = { |
| 241 | wkt:wkt | 241 | wkt:wkt |
| 242 | }*/ | 242 | }*/ |
| 243 | if(ydybsm){ | ||
| 244 | features[0].attributes.BSM = ydybsm; | ||
| 245 | } | ||
| 243 | featureUpdate.methods.updateGraphic(featureUrl,features[0],callBackFunction); | 246 | featureUpdate.methods.updateGraphic(featureUrl,features[0],callBackFunction); |
| 244 | }else{ | 247 | }else{ |
| 245 | var graphic = { | 248 | var graphic = { | ... | ... |
| ... | @@ -21,9 +21,8 @@ function errorLog() { | ... | @@ -21,9 +21,8 @@ function errorLog() { |
| 21 | // this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 | 21 | // this.$nextTick(() => { // 以服务的方式调用的 Loading 需要异步关闭 |
| 22 | // loadingInstance.close(); | 22 | // loadingInstance.close(); |
| 23 | // }); | 23 | // }); |
| 24 | MessageBox.alert('报错了请联系管理员', '消息提示', { | 24 | Message.error({ |
| 25 | confirmButtonText: '确定', | 25 | message: "出现错误,请稍后再试" |
| 26 | type: 'warning' | ||
| 27 | }) | 26 | }) |
| 28 | } | 27 | } |
| 29 | //定义loading | 28 | //定义loading | ... | ... |
| ... | @@ -12,36 +12,37 @@ | ... | @@ -12,36 +12,37 @@ |
| 12 | <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> | 12 | <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> |
| 13 | </div> | 13 | </div> |
| 14 | 14 | ||
| 15 | <div class="search-box"> | 15 | <div class="wrap"> |
| 16 | <el-input | 16 | <div class="search-box"> |
| 17 | maxlength="28" | 17 | <el-input |
| 18 | v-model="treeKey" | 18 | maxlength="28" |
| 19 | class="searchInput" | 19 | v-model="treeKey" |
| 20 | placeholder="请输入关键字" | 20 | class="searchInput" |
| 21 | ><i | 21 | placeholder="请输入关键字" |
| 22 | slot="suffix" | 22 | ><i |
| 23 | class="el-input__icon el-icon-search" | 23 | slot="suffix" |
| 24 | @click="inputChange" | 24 | class="el-input__icon el-icon-search" |
| 25 | ></i | 25 | @click="inputChange" |
| 26 | ></el-input> | 26 | ></i |
| 27 | </div> | 27 | ></el-input> |
| 28 | <div class="treeModule" :style="{height:treeHeight+'px'}"> | 28 | </div> |
| 29 | <LineTree :pd="pd" v-if="lineTreeVisible" @itemClick="itemClick"></LineTree> | 29 | <div class="treeModule" :style="{height:treeHeight+'px'}"> |
| 30 | <LineTree :pd="pd" v-if="lineTreeVisible" @itemClick="itemClick"></LineTree> | ||
| 31 | </div> | ||
| 30 | </div> | 32 | </div> |
| 31 | </el-aside> | 33 | </el-aside> |
| 32 | <el-container class="calcWidth"> | 34 | <el-container class="calcWidth"> |
| 33 | <el-header> | 35 | <el-header> |
| 34 | <div class="header-top"> | 36 | <div class="header-top"> |
| 35 | <!-- <div class="top-items" @click="toggleClick"> | 37 | <div class="top-items" @click="toggleClick"> |
| 36 | <i class="iconfont iconsuojin" v-show="!isActive"></i> | 38 | <i class="iconfont iconsuojin" v-show="!isActive"></i> |
| 37 | <i class="iconfont iconzhankai" v-show="isActive"></i> | 39 | <i class="iconfont iconzhankai" v-show="isActive"></i> |
| 38 | </div> --> | 40 | </div> |
| 39 | <div | 41 | <div |
| 40 | class="top-items" | 42 | class="top-items" |
| 41 | v-for="(item, index) in headTop" | 43 | v-for="(item, index) in headTop" |
| 42 | :key="index + '1'" | 44 | :key="index + '1'" |
| 43 | :class="{ 'is-active': item.select }" | 45 | :class="{ 'is-active': item.select }" |
| 44 | :style="{'height':item.name == '首页' && item.select ? '64'+'px' : '65'+'px'}" | ||
| 45 | @click="selectTopItems(index)" | 46 | @click="selectTopItems(index)" |
| 46 | > | 47 | > |
| 47 | <i :class="item.icon"></i> | 48 | <i :class="item.icon"></i> |
| ... | @@ -475,11 +476,13 @@ export default { | ... | @@ -475,11 +476,13 @@ export default { |
| 475 | height: 66px; | 476 | height: 66px; |
| 476 | // border-bottom: 1px solid#EAEAEA; | 477 | // border-bottom: 1px solid#EAEAEA; |
| 477 | box-sizing: border-box; | 478 | box-sizing: border-box; |
| 478 | background-image: url('../assets/images/banner.png'); | 479 | // background-image: url('../assets/images/banner.png'); |
| 480 | background-color: #006CFF; | ||
| 479 | display: flex; | 481 | display: flex; |
| 480 | flex-grow: 1; | 482 | flex-grow: 1; |
| 481 | justify-content: center; | 483 | border-left: 1px solid #3E9FFF; |
| 482 | align-items: center; | 484 | // justify-content: center; |
| 485 | // align-items: center; | ||
| 483 | .top-items { | 486 | .top-items { |
| 484 | cursor: pointer; | 487 | cursor: pointer; |
| 485 | height: 66px; | 488 | height: 66px; |
| ... | @@ -504,10 +507,10 @@ export default { | ... | @@ -504,10 +507,10 @@ export default { |
| 504 | } | 507 | } |
| 505 | } | 508 | } |
| 506 | .top-items:hover{ | 509 | .top-items:hover{ |
| 507 | background: hsla(0,0%,100%,.2); | 510 | background: #0091FF; |
| 508 | } | 511 | } |
| 509 | .top-items.is-active { | 512 | .top-items.is-active { |
| 510 | background: hsla(0,0%,100%,.2); | 513 | background: #0091FF; |
| 511 | } | 514 | } |
| 512 | } | 515 | } |
| 513 | .header-bottom { | 516 | .header-bottom { |
| ... | @@ -536,8 +539,11 @@ export default { | ... | @@ -536,8 +539,11 @@ export default { |
| 536 | background-color: #ffffff; | 539 | background-color: #ffffff; |
| 537 | color: #333; | 540 | color: #333; |
| 538 | // text-align: center; | 541 | // text-align: center; |
| 539 | overflow: hidden; | 542 | overflow: overlay; |
| 540 | transition: width 0.3s; | 543 | transition: width 0.3s; |
| 544 | box-shadow: 1px 0px 2px 1px rgba(49, 132, 245, 0.1); | ||
| 545 | position: relative; | ||
| 546 | z-index: 1000; | ||
| 541 | .logo-box { | 547 | .logo-box { |
| 542 | width: 100%; | 548 | width: 100%; |
| 543 | height: 66px; | 549 | height: 66px; |
| ... | @@ -545,7 +551,7 @@ export default { | ... | @@ -545,7 +551,7 @@ export default { |
| 545 | box-sizing: border-box; | 551 | box-sizing: border-box; |
| 546 | padding: 10px 20px; | 552 | padding: 10px 20px; |
| 547 | transition: width 0.3s; | 553 | transition: width 0.3s; |
| 548 | background-color: #287CC5; | 554 | background-color: #006CFF; |
| 549 | .logo-img { | 555 | .logo-img { |
| 550 | width: 44px; | 556 | width: 44px; |
| 551 | float: left; | 557 | float: left; |
| ... | @@ -557,27 +563,29 @@ export default { | ... | @@ -557,27 +563,29 @@ export default { |
| 557 | font-size: 20px; | 563 | font-size: 20px; |
| 558 | } | 564 | } |
| 559 | } | 565 | } |
| 560 | .search-box{ | 566 | .wrap{ |
| 561 | height: 65px; | 567 | height: calc(100% - 66px); |
| 562 | box-sizing: border-box; | 568 | overflow-x: hidden; |
| 563 | padding: 18px 20px; | 569 | .search-box{ |
| 564 | border-right: 1px solid #dedede; | 570 | height: 65px; |
| 565 | .searchInput{ | 571 | box-sizing: border-box; |
| 566 | /deep/ .el-input__inner{ | 572 | padding: 18px 20px; |
| 567 | width: 240px; | 573 | .searchInput{ |
| 568 | height: 38px; | 574 | /deep/ .el-input__inner{ |
| 569 | background: #FFFFFF; | 575 | width: 240px; |
| 570 | border-radius: 4px; | 576 | height: 38px; |
| 571 | border: 1px solid #DEDEDE; | 577 | background: #FFFFFF; |
| 572 | } | 578 | border-radius: 4px; |
| 573 | /deep/ .el-input__suffix{ | 579 | border: 1px solid #DEDEDE; |
| 574 | top: 0!important; | 580 | } |
| 581 | /deep/ .el-input__suffix{ | ||
| 582 | top: 0!important; | ||
| 583 | } | ||
| 575 | } | 584 | } |
| 576 | } | 585 | } |
| 577 | } | 586 | .treeModule { |
| 578 | .treeModule { | 587 | box-sizing: border-box; |
| 579 | box-sizing: border-box; | 588 | } |
| 580 | border-right: 1px solid #dedede; | ||
| 581 | } | 589 | } |
| 582 | .logo-box-show { | 590 | .logo-box-show { |
| 583 | width: 64px; | 591 | width: 64px; | ... | ... |
| ... | @@ -625,9 +625,9 @@ | ... | @@ -625,9 +625,9 @@ |
| 625 | } else { | 625 | } else { |
| 626 | Message.error("保存失败") | 626 | Message.error("保存失败") |
| 627 | } | 627 | } |
| 628 | }).catch((err)=>{ | 628 | }).catch((error)=>{ |
| 629 | vm.loadingHide() | 629 | vm.loadingHide(); |
| 630 | Message.error(err) | 630 | console.log(error); |
| 631 | }) | 631 | }) |
| 632 | }else{ | 632 | }else{ |
| 633 | Message.warning("请完善分割后的宗地项目名称后重试") | 633 | Message.warning("请完善分割后的宗地项目名称后重试") | ... | ... |
| ... | @@ -347,14 +347,12 @@ export default { | ... | @@ -347,14 +347,12 @@ export default { |
| 347 | float: left; | 347 | float: left; |
| 348 | margin-right: 20px; | 348 | margin-right: 20px; |
| 349 | flex: 1; | 349 | flex: 1; |
| 350 | border: 1px solid #E6E6E6; | ||
| 351 | /deep/ .el-card__body{ | 350 | /deep/ .el-card__body{ |
| 352 | padding: 0; | 351 | padding: 0; |
| 353 | } | 352 | } |
| 354 | } | 353 | } |
| 355 | .download { | 354 | .download { |
| 356 | width: 50%; | 355 | width: 50%; |
| 357 | border: 1px solid #E6E6E6; | ||
| 358 | /deep/ .el-card__body{ | 356 | /deep/ .el-card__body{ |
| 359 | padding: 0; | 357 | padding: 0; |
| 360 | } | 358 | } |
| ... | @@ -379,7 +377,6 @@ export default { | ... | @@ -379,7 +377,6 @@ export default { |
| 379 | height: 100%; | 377 | height: 100%; |
| 380 | margin-right: 20px; | 378 | margin-right: 20px; |
| 381 | background: #fff; | 379 | background: #fff; |
| 382 | border: 1px solid #E6E6E6; | ||
| 383 | box-shadow: 0 0 8px 0 rgba(232, 237, 250, 0.6), 0 2px 4px 0 rgba(232, 237, 250, 0.5); | 380 | box-shadow: 0 0 8px 0 rgba(232, 237, 250, 0.6), 0 2px 4px 0 rgba(232, 237, 250, 0.5); |
| 384 | /deep/ .el-card__body{ | 381 | /deep/ .el-card__body{ |
| 385 | height: calc(100% - 93px); | 382 | height: calc(100% - 93px); | ... | ... |
| ... | @@ -183,25 +183,25 @@ | ... | @@ -183,25 +183,25 @@ |
| 183 | switch (row.dylx) { | 183 | switch (row.dylx) { |
| 184 | case "zd": | 184 | case "zd": |
| 185 | this.$store.state.zdbsm = row.glbsm; | 185 | this.$store.state.zdbsm = row.glbsm; |
| 186 | this.getRightTree(row.glbsm,'1'); | 186 | this.getRightTree(row.glbsm,'0,1,2'); |
| 187 | break; | 187 | break; |
| 188 | case "zrz": | 188 | case "zrz": |
| 189 | this.$store.state.zrzbsm = row.glbsm; | 189 | this.$store.state.zrzbsm = row.glbsm; |
| 190 | this.getTreeByBsm(row.glbsm,row.dylx,'1'); | 190 | this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); |
| 191 | break; | 191 | break; |
| 192 | case "h": | 192 | case "h": |
| 193 | case "h0": | 193 | case "h0": |
| 194 | case "h1": | 194 | case "h1": |
| 195 | this.$store.state.hbsm = row.glbsm; | 195 | this.$store.state.hbsm = row.glbsm; |
| 196 | this.getTreeByBsm(row.glbsm,'h','1'); | 196 | this.getTreeByBsm(row.glbsm,'h','0,1,2'); |
| 197 | break; | 197 | break; |
| 198 | case "dz": | 198 | case "dz": |
| 199 | this.$store.state.dzbsm = row.glbsm; | 199 | this.$store.state.dzbsm = row.glbsm; |
| 200 | this.getTreeByBsm(row.glbsm,row.dylx,'1'); | 200 | this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); |
| 201 | break; | 201 | break; |
| 202 | case "gzw": | 202 | case "gzw": |
| 203 | this.$store.state.dzbsm = row.glbsm; | 203 | this.$store.state.dzbsm = row.glbsm; |
| 204 | this.getTreeByBsm(row.glbsm,row.dylx,'1'); | 204 | this.getTreeByBsm(row.glbsm,row.dylx,'0,1,2'); |
| 205 | break; | 205 | break; |
| 206 | 206 | ||
| 207 | default: | 207 | default: | ... | ... |
| ... | @@ -556,6 +556,9 @@ | ... | @@ -556,6 +556,9 @@ |
| 556 | //权利性质数据传给子组件 | 556 | //权利性质数据传给子组件 |
| 557 | this.$refs.qlxzModule.countList = res.result.list; | 557 | this.$refs.qlxzModule.countList = res.result.list; |
| 558 | }) | 558 | }) |
| 559 | if(res.result.ydybsm){ | ||
| 560 | this.saveZdGraphicAtrributes(res.result.ydybsm); | ||
| 561 | } | ||
| 559 | } else { | 562 | } else { |
| 560 | this.$nextTick(() => { | 563 | this.$nextTick(() => { |
| 561 | //权利性质数据传给子组件 | 564 | //权利性质数据传给子组件 |
| ... | @@ -788,41 +791,9 @@ | ... | @@ -788,41 +791,9 @@ |
| 788 | }) | 791 | }) |
| 789 | .catch((error) => { | 792 | .catch((error) => { |
| 790 | vm.loadingHide(); | 793 | vm.loadingHide(); |
| 791 | this.$message({ | 794 | console.log(error); |
| 792 | message: error.message+",查看日志,联系管理员", | ||
| 793 | type: "error", | ||
| 794 | }); | ||
| 795 | }); | 795 | }); |
| 796 | //保存到空间库里面 | 796 | this.saveZdGraphicAtrributes(); |
| 797 | var self = this; | ||
| 798 | for (var key in this.geoAttributes) { | ||
| 799 | if (key == "BSM") { | ||
| 800 | self.geoAttributes[key] = this.$store.state.zdbsm | ||
| 801 | } else if (key == 'QLSDFS') { | ||
| 802 | var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs; | ||
| 803 | var qlsdfs = qlsdfsList.filter(item => { | ||
| 804 | return item.bsm == value; | ||
| 805 | }) | ||
| 806 | self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : ""; | ||
| 807 | } else if(key == 'QLR'){ | ||
| 808 | var qlrTableData = this.$refs.qlrxxModule.tableData; | ||
| 809 | if(qlrTableData.length > 0){ | ||
| 810 | for(var i = 0;i < qlrTableData.length;i++){ | ||
| 811 | if(i = 0){ | ||
| 812 | self.geoAttributes[key] = qlrTableData[i].qlrmc; | ||
| 813 | }else{ | ||
| 814 | self.geoAttributes[key] += ','+ qlrTableData[i].qlrmc; | ||
| 815 | } | ||
| 816 | } | ||
| 817 | } | ||
| 818 | } else { | ||
| 819 | var formKay = key.toLowerCase(); | ||
| 820 | self.geoAttributes[key] = self.formData[formKay]; | ||
| 821 | } | ||
| 822 | } | ||
| 823 | self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) { | ||
| 824 | |||
| 825 | }); | ||
| 826 | } | 797 | } |
| 827 | } | 798 | } |
| 828 | } else { | 799 | } else { |
| ... | @@ -835,6 +806,43 @@ | ... | @@ -835,6 +806,43 @@ |
| 835 | }) | 806 | }) |
| 836 | 807 | ||
| 837 | }, | 808 | }, |
| 809 | //保存空间图形 | ||
| 810 | saveZdGraphicAtrributes(ybsm){ | ||
| 811 | //保存到空间库里面 | ||
| 812 | var self = this; | ||
| 813 | /* var ybsm = null; | ||
| 814 | if(this.ydybsm){ | ||
| 815 | ybsm = this.ydybsm; | ||
| 816 | } */ | ||
| 817 | for (var key in this.geoAttributes) { | ||
| 818 | if (key == "BSM") { | ||
| 819 | self.geoAttributes[key] = this.$store.state.zdbsm | ||
| 820 | } else if (key == 'QLSDFS') { | ||
| 821 | var qlsdfsList = self.$store.state.qlsdfsList, value = self.formData.qlsdfs; | ||
| 822 | var qlsdfs = qlsdfsList.filter(item => { | ||
| 823 | return item.bsm == value; | ||
| 824 | }) | ||
| 825 | self.geoAttributes[key] = qlsdfs[0] ? qlsdfs[0].mc : ""; | ||
| 826 | } else if(key == 'QLR'){ | ||
| 827 | var qlrTableData = this.$refs.qlrxxModule.tableData; | ||
| 828 | if(qlrTableData.length > 0){ | ||
| 829 | for(var i = 0;i < qlrTableData.length;i++){ | ||
| 830 | if(i = 0){ | ||
| 831 | self.geoAttributes[key] = qlrTableData[i].qlrmc; | ||
| 832 | }else{ | ||
| 833 | self.geoAttributes[key] += ','+ qlrTableData[i].qlrmc; | ||
| 834 | } | ||
| 835 | } | ||
| 836 | } | ||
| 837 | } else { | ||
| 838 | var formKay = key.toLowerCase(); | ||
| 839 | self.geoAttributes[key] = self.formData[formKay]; | ||
| 840 | } | ||
| 841 | } | ||
| 842 | self.updAttributes(this.$store.state.zdbsm, 'zd', this.geoAttributes, function (res) { | ||
| 843 | |||
| 844 | },ybsm); | ||
| 845 | }, | ||
| 838 | inputBlur(e) { | 846 | inputBlur(e) { |
| 839 | if (e.target.value != '') { | 847 | if (e.target.value != '') { |
| 840 | e.target.style.border = "" | 848 | e.target.style.border = "" | ... | ... |
| ... | @@ -28,45 +28,67 @@ | ... | @@ -28,45 +28,67 @@ |
| 28 | <!-- <td colspan="4" >--> | 28 | <!-- <td colspan="4" >--> |
| 29 | <!-- <el-input v-model="form.ydybsm" disabled></el-input>--> | 29 | <!-- <el-input v-model="form.ydybsm" disabled></el-input>--> |
| 30 | <!-- </td>--> | 30 | <!-- </td>--> |
| 31 | <td colspan="2" align="center" > | 31 | <td colspan="2" align="center" >逻辑幢号</td> |
| 32 | <span>坐落<i class="requisite">*</i></span> | 32 | <td colspan="4" > |
| 33 | </td> | 33 | <el-input v-model="form.ljzh" disabled></el-input> |
| 34 | <td colspan="4" > | ||
| 35 | <input class="formInput" v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag" /> | ||
| 36 | </td> | 34 | </td> |
| 35 | |||
| 37 | </tr> | 36 | </tr> |
| 38 | 37 | ||
| 39 | <tr height="30"> | 38 | <tr height="30"> |
| 40 | <td colspan="2" align="center" >逻辑幢号</td> | 39 | <td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td> |
| 41 | <td colspan="4" > | 40 | <td colspan="4" > |
| 42 | <el-input v-model="form.ljzh" disabled></el-input> | 41 | <el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag" ref="fwxzbsm"> |
| 42 | <el-option | ||
| 43 | v-for="item in $store.state.fwxzOptions" | ||
| 44 | :key="item.bsm" | ||
| 45 | :label="item.mc" | ||
| 46 | :value="item.bsm"> | ||
| 47 | </el-option> | ||
| 48 | </el-select> | ||
| 43 | </td> | 49 | </td> |
| 44 | <td colspan="2" align="center" >层号</td> | 50 | |
| 51 | <td colspan="2" align="center" >所在单元</td> | ||
| 45 | <td colspan="4" > | 52 | <td colspan="4" > |
| 46 | <el-input v-model="form.ch" :disabled="disableFlag"></el-input> | 53 | <el-input v-model="form.zdymc" disabled></el-input> |
| 47 | </td> | 54 | </td> |
| 55 | |||
| 48 | </tr> | 56 | </tr> |
| 49 | 57 | ||
| 50 | <tr height="30"> | 58 | <tr height="30"> |
| 51 | <td colspan="2" align="center" >实际层数</td> | 59 | <td colspan="2" align="center" >层号</td> |
| 52 | <td colspan="4" > | 60 | <td colspan="4" > |
| 53 | <el-input v-model="form.sjcs" :disabled="disableFlag"></el-input> | 61 | <el-input v-model="form.ch" :disabled="disableFlag"></el-input> |
| 54 | </td> | 62 | </td> |
| 63 | |||
| 55 | <td colspan="2" align="center" >实际层</td> | 64 | <td colspan="2" align="center" >实际层</td> |
| 56 | <td colspan="4" > | 65 | <td colspan="4" > |
| 57 | <el-input v-model="form.sjc" :disabled="disableFlag"></el-input> | 66 | <el-input v-model="form.sjc" disabled></el-input> |
| 58 | </td> | 67 | </td> |
| 68 | |||
| 59 | </tr> | 69 | </tr> |
| 60 | 70 | ||
| 61 | <tr height="30"> | 71 | <tr height="30"> |
| 62 | <td colspan="2" align="center" >所在单元</td> | ||
| 63 | <td colspan="4" > | ||
| 64 | <el-input v-model="form.zdymc" :disabled="disableFlag"></el-input> | ||
| 65 | </td> | ||
| 66 | <td colspan="2" align="center" >房屋编号</td> | 72 | <td colspan="2" align="center" >房屋编号</td> |
| 67 | <td colspan="4" > | 73 | <td colspan="4" > |
| 68 | <el-input v-model="form.fwbh" :disabled="disableFlag"></el-input> | 74 | <el-input v-model="form.fwbh" :disabled="disableFlag"></el-input> |
| 69 | </td> | 75 | </td> |
| 76 | <td colspan="2" align="center" >实际层数</td> | ||
| 77 | <td colspan="4" > | ||
| 78 | <el-input v-model="form.sjcs" disabled></el-input> | ||
| 79 | </td> | ||
| 80 | |||
| 81 | </tr> | ||
| 82 | <tr height="30"> | ||
| 83 | <td colspan="2" align="center" >室号</td> | ||
| 84 | <td colspan="4" > | ||
| 85 | <el-input v-model="form.shbw" :disabled="disableFlag"></el-input> | ||
| 86 | </td> | ||
| 87 | <td colspan="2" align="center" >户号</td> | ||
| 88 | <td colspan="4" > | ||
| 89 | <el-input v-model="form.hh" disabled></el-input> | ||
| 90 | </td> | ||
| 91 | |||
| 70 | </tr> | 92 | </tr> |
| 71 | 93 | ||
| 72 | <tr height="30"> | 94 | <tr height="30"> |
| ... | @@ -81,30 +103,16 @@ | ... | @@ -81,30 +103,16 @@ |
| 81 | </el-option> | 103 | </el-option> |
| 82 | </el-select> | 104 | </el-select> |
| 83 | </td> | 105 | </td> |
| 84 | <td colspan="2" align="center" >房屋性质<i class="requisite">*</i></td> | ||
| 85 | <td colspan="4" > | ||
| 86 | <el-select v-model="form.fwxzbsm" placeholder="请选择" :disabled="disableFlag" ref="fwxzbsm"> | ||
| 87 | <el-option | ||
| 88 | v-for="item in $store.state.fwxzOptions" | ||
| 89 | :key="item.bsm" | ||
| 90 | :label="item.mc" | ||
| 91 | :value="item.bsm"> | ||
| 92 | </el-option> | ||
| 93 | </el-select> | ||
| 94 | </td> | ||
| 95 | </tr> | ||
| 96 | 106 | ||
| 97 | <tr height="30"> | 107 | <td colspan="2" align="center" >名义层</td> |
| 98 | <td colspan="2" align="center" >户号</td> | ||
| 99 | <td colspan="4" > | ||
| 100 | <el-input v-model="form.hh" :disabled="disableFlag"></el-input> | ||
| 101 | </td> | ||
| 102 | <td colspan="2" align="center" >室号</td> | ||
| 103 | <td colspan="4" > | 108 | <td colspan="4" > |
| 104 | <el-input v-model="form.shbw" :disabled="disableFlag"></el-input> | 109 | <el-input v-model="form.myc" disabled></el-input> |
| 105 | </td> | 110 | </td> |
| 111 | |||
| 112 | |||
| 106 | </tr> | 113 | </tr> |
| 107 | 114 | ||
| 115 | |||
| 108 | <tr height="30"> | 116 | <tr height="30"> |
| 109 | <td colspan="2" align="center" >户型</td> | 117 | <td colspan="2" align="center" >户型</td> |
| 110 | <td colspan="4" > | 118 | <td colspan="4" > |
| ... | @@ -157,52 +165,52 @@ | ... | @@ -157,52 +165,52 @@ |
| 157 | 165 | ||
| 158 | <tr height="30"> | 166 | <tr height="30"> |
| 159 | <td colspan="2" rowspan="6" align="center" >预测</td> | 167 | <td colspan="2" rowspan="6" align="center" >预测</td> |
| 160 | <td colspan="2" align="center" >建筑面积(㎡) </td> | 168 | <td colspan="2" align="center" >建筑面积(㎡)</td> |
| 161 | <td colspan="2" align="center" > | 169 | <td colspan="2" align="center" > |
| 162 | <el-input v-model="form.ycjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> | 170 | <el-input v-model="form.ycjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 163 | </td> | 171 | </td> |
| 164 | <td colspan="2" rowspan="6" align="center" >实测</td> | 172 | <td colspan="2" rowspan="6" align="center" >实测</td> |
| 165 | <td colspan="2" align="center" >建筑面积(㎡)</td> | 173 | <td colspan="2" align="center" >建筑面积(㎡)</td> |
| 166 | <td colspan="2" align="center" > | 174 | <td colspan="2" align="center" > |
| 167 | <el-input v-model="form.scjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> | 175 | <el-input v-model="form.scjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 168 | </td> | 176 | </td> |
| 169 | </tr> | 177 | </tr> |
| 170 | <tr height="30"> | 178 | <tr height="30"> |
| 171 | <td colspan="2" align="center" >套内建筑面积(㎡))</td> | 179 | <td colspan="2" align="center" >套内建筑面积(㎡)</td> |
| 172 | <td colspan="2" align="center" > | 180 | <td colspan="2" align="center" > |
| 173 | <el-input v-model="form.yctnjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> | 181 | <el-input v-model="form.yctnjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 174 | </td> | 182 | </td> |
| 175 | <td colspan="2" align="center" >套内建筑面积(㎡)</td> | 183 | <td colspan="2" align="center" >套内建筑面积(㎡)</td> |
| 176 | <td colspan="2" align="center" > | 184 | <td colspan="2" align="center" > |
| 177 | <el-input v-model="form.sctnjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> | 185 | <el-input v-model="form.sctnjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 178 | </td> | 186 | </td> |
| 179 | </tr> | 187 | </tr> |
| 180 | <tr height="30"> | 188 | <tr height="30"> |
| 181 | <td colspan="2" align="center" >分摊建筑面积(㎡)</td> | 189 | <td colspan="2" align="center" >分摊建筑面积(㎡)</td> |
| 182 | <td colspan="2" align="center" > | 190 | <td colspan="2" align="center" > |
| 183 | <el-input v-model="form.ycftjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> | 191 | <el-input v-model="form.ycftjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 184 | </td> | 192 | </td> |
| 185 | <td colspan="2" align="center" >分摊建筑面积(㎡)</td> | 193 | <td colspan="2" align="center" >分摊建筑面积(㎡)</td> |
| 186 | <td colspan="2" align="center" > | 194 | <td colspan="2" align="center" > |
| 187 | <el-input v-model="form.scftjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> | 195 | <el-input v-model="form.scftjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 188 | </td> | 196 | </td> |
| 189 | </tr> | 197 | </tr> |
| 190 | <tr height="30"> | 198 | <tr height="30"> |
| 191 | <td colspan="2" align="center" >地下部分建筑面积(㎡)</td> | 199 | <td colspan="2" align="center" >地下部分建筑面积(㎡)</td> |
| 192 | <td colspan="2" align="center" > | 200 | <td colspan="2" align="center" > |
| 193 | <el-input v-model="form.ycdxbfjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> | 201 | <el-input v-model="form.ycdxbfjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 194 | </td> | 202 | </td> |
| 195 | <td colspan="2" align="center" >地下部分建筑面积(㎡)</td> | 203 | <td colspan="2" align="center" >地下部分建筑面积(㎡)</td> |
| 196 | <td colspan="2" align="center" > | 204 | <td colspan="2" align="center" > |
| 197 | <el-input v-model="form.scdxbfjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> | 205 | <el-input v-model="form.scdxbfjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 198 | </td> | 206 | </td> |
| 199 | </tr> | 207 | </tr> |
| 200 | <tr height="30"> | 208 | <tr height="30"> |
| 201 | <td colspan="2" align="center" >其它建筑面积(㎡)</td> | 209 | <td colspan="2" align="center" >其它建筑面积(㎡)</td> |
| 202 | <td colspan="2" align="center" > | 210 | <td colspan="2" align="center" > |
| 203 | <el-input v-model="form.ycqtjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> | 211 | <el-input v-model="form.ycqtjzmj" type="number" :disabled="form.scyclx==='1'||disableFlag"></el-input> |
| 204 | </td> | 212 | </td> |
| 205 | <td colspan="2" align="center" >其它建筑面积(㎡)</td> | 213 | <td colspan="2" align="center" >其它建筑面积(㎡)</td> |
| 206 | <td colspan="2" align="center" > | 214 | <td colspan="2" align="center" > |
| 207 | <el-input v-model="form.scqtjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> | 215 | <el-input v-model="form.scqtjzmj" type="number" :disabled="form.scyclx==='0'||disableFlag"></el-input> |
| 208 | </td> | 216 | </td> |
| ... | @@ -217,7 +225,29 @@ | ... | @@ -217,7 +225,29 @@ |
| 217 | <input class="formInput" v-model="form.scftxs" type="number" :disabled="form.scyclx==='0'||disableFlag" @blur="inputFtxsBlur($event)" ref="scftxs" /> | 225 | <input class="formInput" v-model="form.scftxs" type="number" :disabled="form.scyclx==='0'||disableFlag" @blur="inputFtxsBlur($event)" ref="scftxs" /> |
| 218 | </td> | 226 | </td> |
| 219 | </tr> | 227 | </tr> |
| 228 | <tr height="30"> | ||
| 229 | <td colspan="2" align="center" >共有土地面积(㎡)</td> | ||
| 230 | <td colspan="2" > | ||
| 231 | <el-input v-model="form.gytdmj" type="number" :disabled="disableFlag"></el-input> | ||
| 232 | </td> | ||
| 233 | <td colspan="2" align="center" >分摊土地面积(㎡)</td> | ||
| 234 | <td colspan="2" > | ||
| 235 | <el-input v-model="form.fttdmj" type="number" :disabled="disableFlag"></el-input> | ||
| 236 | </td> | ||
| 237 | <td colspan="2" align="center" >多幢独用土地面积(㎡)</td> | ||
| 238 | <td colspan="2" > | ||
| 239 | <el-input v-model="form.dytdmj" type="number" :disabled="disableFlag"></el-input> | ||
| 240 | </td> | ||
| 241 | </tr> | ||
| 220 | 242 | ||
| 243 | <tr> | ||
| 244 | <td colspan="2" align="center" > | ||
| 245 | <span>坐落<i class="requisite">*</i></span> | ||
| 246 | </td> | ||
| 247 | <td colspan="10" > | ||
| 248 | <input class="formInput" v-model="form.zl" ref="zl" @blur="inputBlur($event)" :disabled="disableFlag" /> | ||
| 249 | </td> | ||
| 250 | </tr> | ||
| 221 | 251 | ||
| 222 | <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> | 252 | <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> |
| 223 | <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> | 253 | <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> |
| ... | @@ -228,10 +258,10 @@ | ... | @@ -228,10 +258,10 @@ |
| 228 | @click="addYtInfo" | 258 | @click="addYtInfo" |
| 229 | >+</el-button | 259 | >+</el-button |
| 230 | > | 260 | > |
| 231 | <span>用途<i class="requisite">*</i></span> | 261 | <span>房屋用途<i class="requisite">*</i></span> |
| 232 | </td> | 262 | </td> |
| 233 | 263 | ||
| 234 | <td width="30" colspan="1" align="center" > | 264 | <td width="30" colspan="2" align="center" > |
| 235 | <el-button | 265 | <el-button |
| 236 | type="primary" | 266 | type="primary" |
| 237 | class="changeBtn addMinus inMinus" | 267 | class="changeBtn addMinus inMinus" |
| ... | @@ -240,7 +270,7 @@ | ... | @@ -240,7 +270,7 @@ |
| 240 | > | 270 | > |
| 241 | 规划用途 | 271 | 规划用途 |
| 242 | </td> | 272 | </td> |
| 243 | <td width="30" colspan="4" align="center" > | 273 | <td width="30" colspan="2" align="center" > |
| 244 | <el-select-tree | 274 | <el-select-tree |
| 245 | ref="ghyt" | 275 | ref="ghyt" |
| 246 | v-if="show" | 276 | v-if="show" |
| ... | @@ -256,7 +286,7 @@ | ... | @@ -256,7 +286,7 @@ |
| 256 | v-model="item1.fwytzdbsm" | 286 | v-model="item1.fwytzdbsm" |
| 257 | ></el-select-tree> | 287 | ></el-select-tree> |
| 258 | </td> | 288 | </td> |
| 259 | <td width="30" colspan="1" align="center" >用途</td> | 289 | <td width="30" colspan="2" align="center" >用途</td> |
| 260 | <td width="30" colspan="4" align="center" > | 290 | <td width="30" colspan="4" align="center" > |
| 261 | <el-select-tree | 291 | <el-select-tree |
| 262 | ref="yt" | 292 | ref="yt" |
| ... | @@ -286,10 +316,17 @@ | ... | @@ -286,10 +316,17 @@ |
| 286 | > | 316 | > |
| 287 | <span>房屋结构<i class="requisite">*</i></span> | 317 | <span>房屋结构<i class="requisite">*</i></span> |
| 288 | </td> | 318 | </td> |
| 289 | <td colspan="1" align="center" > | 319 | <td colspan="2" align="center" > |
| 290 | <span @click="deleteFwjgInfo(index)">删除</span> | 320 | <el-button |
| 321 | type="primary" | ||
| 322 | style="margin-right: 5px" | ||
| 323 | class="changeBtn addMinus inMinus" | ||
| 324 | @click="deleteFwjgInfo(index)" | ||
| 325 | >-</el-button | ||
| 326 | > | ||
| 327 | <span @click="deleteFwjgInfo(index)">房屋结构</span> | ||
| 291 | </td> | 328 | </td> |
| 292 | <td colspan="9" > | 329 | <td colspan="8" > |
| 293 | <el-select v-model="item1.fwjgzdbsm" ref="fwjg" placeholder="请选择" :disabled="disableFlag"> | 330 | <el-select v-model="item1.fwjgzdbsm" ref="fwjg" placeholder="请选择" :disabled="disableFlag"> |
| 294 | <el-option | 331 | <el-option |
| 295 | v-for="item in $store.state.jgOptions" | 332 | v-for="item in $store.state.jgOptions" |
| ... | @@ -301,20 +338,6 @@ | ... | @@ -301,20 +338,6 @@ |
| 301 | </td> | 338 | </td> |
| 302 | </tr> | 339 | </tr> |
| 303 | 340 | ||
| 304 | <tr height="30"> | ||
| 305 | <td colspan="2" align="center" >共有土地面积(㎡)</td> | ||
| 306 | <td colspan="2" > | ||
| 307 | <el-input v-model="form.gytdmj" type="number" :disabled="disableFlag"></el-input> | ||
| 308 | </td> | ||
| 309 | <td colspan="2" align="center" >分摊土地面积(㎡)</td> | ||
| 310 | <td colspan="2" > | ||
| 311 | <el-input v-model="form.fttdmj" type="number" :disabled="disableFlag"></el-input> | ||
| 312 | </td> | ||
| 313 | <td colspan="2" align="center" >多幢独用土地面积(㎡)</td> | ||
| 314 | <td colspan="2" > | ||
| 315 | <el-input v-model="form.dytdmj" type="number" :disabled="disableFlag"></el-input> | ||
| 316 | </td> | ||
| 317 | </tr> | ||
| 318 | 341 | ||
| 319 | 342 | ||
| 320 | <tr> | 343 | <tr> | ... | ... |
| ... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
| 14 | </td> | 14 | </td> |
| 15 | <td colspan="2" class="tdright"><i class="requisite">*</i>自然幢号</td> | 15 | <td colspan="2" class="tdright"><i class="requisite">*</i>自然幢号</td> |
| 16 | <td colspan="4" class="psr"> | 16 | <td colspan="4" class="psr"> |
| 17 | <input class="formInput percent80" ref="zrzh" @blur="inputBlur($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh"> | 17 | <input class="formInput percent80" ref="zrzh" @blur="inputBlurZrzh($event)" :disabled="disabled" maxlength="24" v-model="form.zrzh"> |
| 18 | <el-button @click.prevent="generatorCode" type="warning" :disabled="disabled" class="createBtn" size="mini">生成</el-button> | 18 | <el-button @click.prevent="generatorCode" type="warning" :disabled="disabled" class="createBtn" size="mini">生成</el-button> |
| 19 | </td> | 19 | </td> |
| 20 | </tr> | 20 | </tr> |
| ... | @@ -25,7 +25,7 @@ | ... | @@ -25,7 +25,7 @@ |
| 25 | </td> | 25 | </td> |
| 26 | <td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td> | 26 | <td colspan="2" class="tdright"><i class="requisite">*</i>不动产单元号</td> |
| 27 | <td colspan="4"> | 27 | <td colspan="4"> |
| 28 | <input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" :disabled="disabled" maxlength="28" v-model="form.bdcdyh"> | 28 | <input class="formInput " ref="bdcdyh" @blur="inputBlur($event)" disabled maxlength="28" v-model="form.bdcdyh"> |
| 29 | </td> | 29 | </td> |
| 30 | </tr> | 30 | </tr> |
| 31 | 31 | ||
| ... | @@ -285,7 +285,7 @@ | ... | @@ -285,7 +285,7 @@ |
| 285 | <script> | 285 | <script> |
| 286 | import Qlr from "@components/formMenu/qlr"; | 286 | import Qlr from "@components/formMenu/qlr"; |
| 287 | import Qlxz from "@components/formMenu/qlxz"; | 287 | import Qlxz from "@components/formMenu/qlxz"; |
| 288 | import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "@api/zrz" | 288 | import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm,getHCountByZrzbsm} from "@api/zrz" |
| 289 | import {getQjZdjbxxDetailById} from "@api/zd" | 289 | import {getQjZdjbxxDetailById} from "@api/zd" |
| 290 | import {submit,registerCall} from "@api/common" | 290 | import {submit,registerCall} from "@api/common" |
| 291 | import geoUtils from "@components/lineTree/tx/js/geoUtils"; | 291 | import geoUtils from "@components/lineTree/tx/js/geoUtils"; |
| ... | @@ -315,6 +315,12 @@ | ... | @@ -315,6 +315,12 @@ |
| 315 | 315 | ||
| 316 | lx:"zrz", | 316 | lx:"zrz", |
| 317 | bsm:'', | 317 | bsm:'', |
| 318 | |||
| 319 | initZrzh:'', | ||
| 320 | finishZrzh:'', | ||
| 321 | hcount:0, | ||
| 322 | booleanUpdateH:false, | ||
| 323 | |||
| 318 | form:{ | 324 | form:{ |
| 319 | zrzbsm:'', //自然幢标识码 | 325 | zrzbsm:'', //自然幢标识码 |
| 320 | zdbsm:'', //宗地标识码 | 326 | zdbsm:'', //宗地标识码 |
| ... | @@ -360,6 +366,7 @@ | ... | @@ -360,6 +366,7 @@ |
| 360 | glbsm:'', //关联标识码 | 366 | glbsm:'', //关联标识码 |
| 361 | sx:'', //顺序 | 367 | sx:'', //顺序 |
| 362 | }], | 368 | }], |
| 369 | booleanUpdateH:false, | ||
| 363 | }, | 370 | }, |
| 364 | value: '', | 371 | value: '', |
| 365 | ytTitleRowspan:1, //用途的单元格垂直合并数量 | 372 | ytTitleRowspan:1, //用途的单元格垂直合并数量 |
| ... | @@ -467,6 +474,10 @@ | ... | @@ -467,6 +474,10 @@ |
| 467 | } | 474 | } |
| 468 | }, | 475 | }, |
| 469 | onSave(){ | 476 | onSave(){ |
| 477 | |||
| 478 | //保存之前的自然幢号,用于判断该自然幢的不动产单元号是否更改,是否更改其下户的不动产单元号 | ||
| 479 | this.finishZrzh = this.form.zrzh; | ||
| 480 | this.form.booleanUpdateH =this.booleanUpdateH; | ||
| 470 | //判断自然幢号和不动产单元号是否手动修改过(自然幢号和不动产单元号的前19位是否和宗地代码一致) | 481 | //判断自然幢号和不动产单元号是否手动修改过(自然幢号和不动产单元号的前19位是否和宗地代码一致) |
| 471 | console.log(this.form,'this.form'); | 482 | console.log(this.form,'this.form'); |
| 472 | //给校验项赋值 | 483 | //给校验项赋值 |
| ... | @@ -567,24 +578,7 @@ | ... | @@ -567,24 +578,7 @@ |
| 567 | this.loading=false; | 578 | this.loading=false; |
| 568 | }) | 579 | }) |
| 569 | this.loading=false; | 580 | this.loading=false; |
| 570 | 581 | this.saveGraphicAttributes(); } | |
| 571 | //保存到空间库里面 | ||
| 572 | var self = this; | ||
| 573 | for(var key in this.geoAttributes){ | ||
| 574 | if(key == "BSM"){ | ||
| 575 | self.geoAttributes[key] = this.bsm | ||
| 576 | }else if(key == 'JGRQ'){ | ||
| 577 | var formKay = key.toLowerCase(); | ||
| 578 | self.geoAttributes[key] = new Date(self.form[formKay]).getTime(); | ||
| 579 | }else { | ||
| 580 | var formKay = key.toLowerCase(); | ||
| 581 | self.geoAttributes[key] = self.form[formKay]; | ||
| 582 | } | ||
| 583 | } | ||
| 584 | self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) { | ||
| 585 | console.log("属性保存完成!!"); | ||
| 586 | }); | ||
| 587 | } | ||
| 588 | }else{ | 582 | }else{ |
| 589 | this.$message({ | 583 | this.$message({ |
| 590 | // message: item.name+'不能为空', | 584 | // message: item.name+'不能为空', |
| ... | @@ -594,6 +588,25 @@ | ... | @@ -594,6 +588,25 @@ |
| 594 | } | 588 | } |
| 595 | }) | 589 | }) |
| 596 | }, | 590 | }, |
| 591 | //保存空间信息 | ||
| 592 | saveGraphicAttributes(ybsm){ | ||
| 593 | //保存到空间库里面 | ||
| 594 | var self = this; | ||
| 595 | for(var key in this.geoAttributes){ | ||
| 596 | if(key == "BSM"){ | ||
| 597 | self.geoAttributes[key] = this.bsm | ||
| 598 | }else if(key == 'JGRQ'){ | ||
| 599 | var formKay = key.toLowerCase(); | ||
| 600 | self.geoAttributes[key] = new Date(self.form[formKay]).getTime(); | ||
| 601 | }else { | ||
| 602 | var formKay = key.toLowerCase(); | ||
| 603 | self.geoAttributes[key] = self.form[formKay]; | ||
| 604 | } | ||
| 605 | } | ||
| 606 | self.updAttributes(this.bsm,'zrz',this.geoAttributes,function (res) { | ||
| 607 | console.log("属性保存完成!!"); | ||
| 608 | },ybsm); | ||
| 609 | }, | ||
| 597 | onSubmit(){ | 610 | onSubmit(){ |
| 598 | let data={ | 611 | let data={ |
| 599 | glbsm:this.bsm, | 612 | glbsm:this.bsm, |
| ... | @@ -612,6 +625,7 @@ | ... | @@ -612,6 +625,7 @@ |
| 612 | }) | 625 | }) |
| 613 | }, | 626 | }, |
| 614 | open() { | 627 | open() { |
| 628 | const self = this; | ||
| 615 | this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', { | 629 | this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', { |
| 616 | confirmButtonText: '确定', | 630 | confirmButtonText: '确定', |
| 617 | cancelButtonText: '取消', | 631 | cancelButtonText: '取消', |
| ... | @@ -621,6 +635,16 @@ | ... | @@ -621,6 +635,16 @@ |
| 621 | .then((res)=>{ | 635 | .then((res)=>{ |
| 622 | this.form.zrzh=res.result.substring(0,24); | 636 | this.form.zrzh=res.result.substring(0,24); |
| 623 | this.form.bdcdyh=res.result; | 637 | this.form.bdcdyh=res.result; |
| 638 | console.log(self.initZrzh,self.hcount,"self") | ||
| 639 | if(self.initZrzh != null && self.initZrzh !== '' && self.hcount>0){ | ||
| 640 | self.booleanUpdateH =true; | ||
| 641 | self.$notify({ | ||
| 642 | title: '提示', | ||
| 643 | message: '修改自然幢号,可能会影响该自然幢下户的不动产单元号的重新生成!', | ||
| 644 | duration: 0, | ||
| 645 | type: 'warning' | ||
| 646 | }); | ||
| 647 | } | ||
| 624 | }); | 648 | }); |
| 625 | this.$message({ | 649 | this.$message({ |
| 626 | type: 'success', | 650 | type: 'success', |
| ... | @@ -634,6 +658,7 @@ | ... | @@ -634,6 +658,7 @@ |
| 634 | }); | 658 | }); |
| 635 | }, | 659 | }, |
| 636 | generatorCode(){ | 660 | generatorCode(){ |
| 661 | const self = this; | ||
| 637 | console.log(this.form,'this.form'); | 662 | console.log(this.form,'this.form'); |
| 638 | if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){ | 663 | if((this.form.zrzh!=null&&this.form.zrzh!=='')||(this.form.bdcdyh!=null&&this.form.bdcdyh!=='')){ |
| 639 | this.open(); | 664 | this.open(); |
| ... | @@ -641,8 +666,18 @@ | ... | @@ -641,8 +666,18 @@ |
| 641 | } | 666 | } |
| 642 | getBdcdyh(this.form.zddm,"zrz") | 667 | getBdcdyh(this.form.zddm,"zrz") |
| 643 | .then((res)=>{ | 668 | .then((res)=>{ |
| 644 | this.form.zrzh=res.result.substring(0,24); | 669 | self.form.zrzh=res.result.substring(0,24); |
| 645 | this.form.bdcdyh=res.result; | 670 | self.form.bdcdyh=res.result; |
| 671 | console.log(self.initZrzh,self.hcount,"self") | ||
| 672 | if(self.initZrzh != null && self.initZrzh !== '' && self.hcount>0){ | ||
| 673 | self.booleanUpdateH =true; | ||
| 674 | self.$notify({ | ||
| 675 | title: '提示', | ||
| 676 | message: '修改自然幢号,可能会影响该自然幢下户的不动产单元号的重新生成!', | ||
| 677 | duration: 0, | ||
| 678 | type: 'warning' | ||
| 679 | }); | ||
| 680 | } | ||
| 646 | }) | 681 | }) |
| 647 | }, | 682 | }, |
| 648 | 683 | ||
| ... | @@ -664,6 +699,9 @@ | ... | @@ -664,6 +699,9 @@ |
| 664 | getZrzDetailByBsm(data).then((res)=>{ | 699 | getZrzDetailByBsm(data).then((res)=>{ |
| 665 | if(res.code===200){ | 700 | if(res.code===200){ |
| 666 | this.form=res.result; | 701 | this.form=res.result; |
| 702 | if(res.result.ydybsm){ | ||
| 703 | this.saveGraphicAttributes(res.result.ydybsm); | ||
| 704 | } | ||
| 667 | if(res.result.gygyqlrqk!=null){ | 705 | if(res.result.gygyqlrqk!=null){ |
| 668 | this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk); | 706 | this.$refs.qlrxxModule.changeGyfs(res.result.gygyqlrqk); |
| 669 | } | 707 | } |
| ... | @@ -676,6 +714,8 @@ | ... | @@ -676,6 +714,8 @@ |
| 676 | }else { | 714 | }else { |
| 677 | this.disabled = true | 715 | this.disabled = true |
| 678 | } | 716 | } |
| 717 | //初始化的自然幢号,用于判断该自然幢的不动产单元号是否更改,是否更改其下户的不动产单元号 | ||
| 718 | this.initZrzh = res.result.zrzh; | ||
| 679 | this.$store.state.zrzh = res.result.zrzh; | 719 | this.$store.state.zrzh = res.result.zrzh; |
| 680 | if(this.form.fwjgList.length===0){ | 720 | if(this.form.fwjgList.length===0){ |
| 681 | this.form.fwjgList.push({ | 721 | this.form.fwjgList.push({ |
| ... | @@ -729,6 +769,27 @@ | ... | @@ -729,6 +769,27 @@ |
| 729 | e.target.style.boxSizing = 'border-box'; | 769 | e.target.style.boxSizing = 'border-box'; |
| 730 | } | 770 | } |
| 731 | }, | 771 | }, |
| 772 | inputBlurZrzh(e){ | ||
| 773 | if(this.initZrzh != null && this.initZrzh !== ''&& e.target.value !==''&& this.hcount>0){ | ||
| 774 | if(this.initZrzh !== e.target.value){ | ||
| 775 | this.booleanUpdateH =true; | ||
| 776 | this.$notify({ | ||
| 777 | title: '提示', | ||
| 778 | message: '修改自然幢号,可能会影响该自然幢下户的不动产单元号的重新生成!', | ||
| 779 | duration: 0, | ||
| 780 | type: 'warning' | ||
| 781 | }); | ||
| 782 | }else { | ||
| 783 | this.booleanUpdateH =false; | ||
| 784 | } | ||
| 785 | } | ||
| 786 | if(e.target.value!=''){ | ||
| 787 | e.target.style.border="" | ||
| 788 | }else{ | ||
| 789 | e.target.style.border="1px solid red"; | ||
| 790 | e.target.style.boxSizing = 'border-box'; | ||
| 791 | } | ||
| 792 | } | ||
| 732 | }, | 793 | }, |
| 733 | created(){ | 794 | created(){ |
| 734 | //todo 怎么判断进入到该页面是从新建处进来的,还是从右键宗地进来的!如果是从新建进来的就需要把虚拟宗标识码带过来; | 795 | //todo 怎么判断进入到该页面是从新建处进来的,还是从右键宗地进来的!如果是从新建进来的就需要把虚拟宗标识码带过来; |
| ... | @@ -748,6 +809,11 @@ | ... | @@ -748,6 +809,11 @@ |
| 748 | } | 809 | } |
| 749 | }, | 810 | }, |
| 750 | mounted() { | 811 | mounted() { |
| 812 | getHCountByZrzbsm(this.$route.query.bsm).then((res)=>{ | ||
| 813 | if(res.code === 200){ | ||
| 814 | this.hcount = res.result; | ||
| 815 | } | ||
| 816 | }); | ||
| 751 | this.$nextTick(() => { | 817 | this.$nextTick(() => { |
| 752 | this.mainBoxWidth = this.$refs.mainBox.clientWidth; | 818 | this.mainBoxWidth = this.$refs.mainBox.clientWidth; |
| 753 | }) | 819 | }) |
| ... | @@ -770,6 +836,7 @@ | ... | @@ -770,6 +836,7 @@ |
| 770 | "form.zrzh":function (val) { | 836 | "form.zrzh":function (val) { |
| 771 | if (val != '') { | 837 | if (val != '') { |
| 772 | this.$refs.zrzh.style.border = ''; | 838 | this.$refs.zrzh.style.border = ''; |
| 839 | this.form.bdcdyh = val+"0000"; | ||
| 773 | } | 840 | } |
| 774 | }, | 841 | }, |
| 775 | "form.fwxzbsm":{ | 842 | "form.fwxzbsm":{ | ... | ... |
-
Please register or sign in to post a comment