Skip to content

任超 / js.CadastralSystem

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

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

2 parents d01c4a23 54e1db13
Inline Side-by-side
Showing 8 changed files with 154 additions and 132 deletions
......@@ -252,7 +252,7 @@ export function ZdHb(data) {
/**
* 多幢合并
*/
export function dzHb(data) {
export function DzHb(data) {
return request({
url:"/bg/dzSplitMerge/dzHb",
method:'post',
......
......@@ -8,7 +8,7 @@
:data="dzhbqData"
border
style="width: 100%"
height="200px"
:height="tableHeight"
:header-cell-style="{'text-align':'center'}"
:cell-style="{'text-align':'center'}">
<el-table-column
......@@ -57,10 +57,9 @@
</el-table-column>
</el-table>
</div>
</div>
<div class="hbh dzhbh">
<span class="tips" style="width:100%;display:block;margin-left:0;">合并后多幢信息</span>
<span class="tips">合并后多幢信息</span>
<div class="hbh">
<el-card class="data">
<div slot="header" class="clearfix">
<span>多幢基本信息</span>
......@@ -163,9 +162,9 @@
</el-card>
</div>
</div>
<div class="header-button">
<!-- <div class="header-button">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
</div> -->
<el-dialog v-dialogDrag :close-on-click-modal="false"
title="新增多幢"
:visible.sync="dzIsVisible"
......@@ -413,10 +412,14 @@
value: "Z",
}
],
tableHeight:0,
}
},
mounted() {
this.getXzqList();
this.$nextTick(()=>{
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 610
})
},
methods: {
getZdData(id) {
......@@ -460,25 +463,7 @@
}
},
save() {
let data = {
fwlist: this.dzhbqData,
newdzxmmc: this.dzhbhData.xmmc,
zdbsm: this.zdbsm
}
dzHb(data).then(res => {
if (res.success) {
console.log(res)
this.$message.success("多幢合并成功")
this.$router.push({
path: '/dz',
query: {
source: 1,
bsm: res.result
}
})
}
})
},
dzClose() {
this.dzIsVisible = false;
......@@ -637,59 +622,12 @@
</script>
<style scoped lang="less">
.hb {
.menu {
/deep/ .el-tabs__content {
position: unset;
margin-top: 62px;
overflow: visible;
}
/deep/ .el-tabs__header {
position: -webkit-fixed;
position: fixed;
top: 120px;
z-index: 999;
width: 100%;
margin-bottom: 0;
border: 0;
/deep/ .el-tabs__nav-scroll {
height: 50px;
box-sizing: border-box;
padding-left: 20px;
.el-tabs__active-bar {
display: none;
}
> .el-tabs__nav {
border: 0;
> .el-tabs__item {
border: 1px solid #DEDEDE;
height: 36px;
line-height: 32px;
padding: 0 20px;
margin: 9px 10px 9px 0;
background-color: #ffffff;
}
.is-active {
color: #006CFF;
border: 1px solid #006CFF;
}
}
}
/deep/ .el-tabs__nav-wrap::after {
width: 0;
}
}
}
}
.psn {
position: unset !important;
}
.hb-tabs {
height: auto;
width: 100%;
position: relative;
.addBtn {
position: absolute;
......@@ -785,12 +723,6 @@
.hbq {
margin: 14px 20px 20px 20px;
}
.dzhbh {
box-sizing: border-box !important;
padding: 0 18px 0 0 !important;
margin-top: 10px !important;
display: block !important;
}
.hbh {
margin-left: 20px;
margin-top: 14px;
......@@ -852,7 +784,7 @@
}
}
.zxx {
width: calc(60% - 24px);
width: calc(60% - 44px);
margin-left: 20px;
display: flex;
flex-direction: column;
......@@ -864,7 +796,7 @@
padding: 5px 0;
}
/deep/ .el-card__body {
height: 220px;
height: 200px;
overflow-y: scroll;
position: relative;
}
......
......@@ -246,6 +246,7 @@
<script>
import { cxlzZrzList } from "@api/zrz";
import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
export default {
name: "",
......@@ -345,7 +346,6 @@ export default {
(document.documentElement.clientHeight ||
document.body.clientHeight) - 352;
this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 220;
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
});
},
methods: {
......@@ -503,7 +503,27 @@ export default {
}
}
});
}
},
//切换房屋状态
handleChoosedH(bsms,color) {
debugger
//每次切换房屋状态，将之前高亮的户边框颜色重置为默认
this.$refs.lpbContent.choosedList = [];
this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
item.style.border = '';
});
// console.log(bsms,'bsms');
// console.log(color,'color');
// Dyzt:{list:[],mj:''}
//清除选中户
// this.$refs.lpbContent.clearChoosedH();
this.$nextTick(()=>{
//给hBsmList传值
// console.log(bsms,'bsms');
this.$refs.lpbContent.choosedList = bsms;
this.$refs.lpbContent.borderColor = color;
})
},
},
computed: {},
watch: {
......@@ -516,11 +536,14 @@ export default {
}
},
//选择自然幢展示楼盘表后，查询右侧图例数据
isSearch(n){
if (!n) {
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
}
isCxlz(n){
if (!n) {
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
this.$nextTick(()=>{
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
})
}
},
//改变syclx，更新楼盘表数据
scyclx(n){
......
......@@ -1218,8 +1218,6 @@
.xzq, .djq, .djzq {
width: 150px;
}
.search {
color: #BBB !important;
}
......
......@@ -86,7 +86,7 @@
></el-input>
<el-link type="primary" style="margin-left:20px" @click="isFwsxbg=true">重新选择户</el-link>
</div>
<div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }">
<div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }" v-loading="lpbloading">
<!-- 楼盘表主体 -->
<div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
<lpbContent ref="lpbContent" class="" :zrzbsm='zrzbsm' lpbParent = 'isFwsxbg'></lpbContent>
......@@ -220,6 +220,7 @@ import { getSearchList } from "@api/search";
import { fwsxbgbl } from "@api/common";
import {getQjHDetailByBsm} from "@api/h";
import lpbContent from "../../../zrz/lpb/bjlp/lpbContent/index";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
export default {
name: "",
......@@ -303,6 +304,7 @@ export default {
fwytList: [],
lpbContentHeight: 0,
lpbContentwidth: 0,
lpbloading:true,
};
},
created() {},
......@@ -314,7 +316,6 @@ export default {
(document.documentElement.clientHeight || document.body.clientHeight) -
352;
this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 222;
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
});
},
methods: {
......@@ -539,7 +540,26 @@ export default {
}
}
});
}
},
//切换房屋状态
handleChoosedH(bsms,color) {
//每次切换房屋状态，将之前高亮的户边框颜色重置为默认
this.$refs.lpbContent.choosedList = [];
this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
item.style.border = '';
});
// console.log(bsms,'bsms');
// console.log(color,'color');
// Dyzt:{list:[],mj:''}
//清除选中户
// this.$refs.lpbContent.clearChoosedH();
this.$nextTick(()=>{
//给hBsmList传值
// console.log(bsms,'bsms');
this.$refs.lpbContent.choosedList = bsms;
this.$refs.lpbContent.borderColor = color;
})
},
},
computed: {},
watch: {
......@@ -552,11 +572,14 @@ export default {
}
},
//选择自然幢展示楼盘表后，查询右侧图例数据
isSearch(n){
if (!n) {
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
}
isFwsxbg(n){
if (!n) {
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
this.$nextTick(()=>{
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
})
}
},
//改变syclx，更新楼盘表数据
scyclx(n){
......
......@@ -2,7 +2,7 @@
<div class="hb" ref="hbBox">
<el-tabs v-model="tabName" class="menu" @tab-click="handleClick">
<el-tab-pane label="宗地合并" name="zd">
<div class="hb-tabs top20">
<div class="hb-tabs top20" style="margin-top:14px">
<span class="tips">合并前宗地信息(已选择宗地{{zdhbqData.length}}个)</span>
<div class="hbq">
......@@ -10,7 +10,7 @@
:data="zdhbqData"
border
style="width: 100%"
height="200px"
:height="tableHeight"
:header-cell-style="{'text-align':'center'}"
:cell-style="{'text-align':'center'}">
<el-table-column>
......@@ -181,7 +181,10 @@
</div>
</el-tab-pane>
<el-tab-pane label="多幢合并" name="dz">
<dz-hb></dz-hb>
<dz-hb ref="dzhb"></dz-hb>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
</el-tab-pane>
<el-tab-pane label="户合并" name="h">
<div class="hb-tabs psn" v-if="hhbtabs">
......@@ -199,7 +202,7 @@
getListByPbsm,
getDdicByMC
} from "@api/common";
import {ZdHb,getQjZdjbxxDetailById} from "@api/zd"
import {ZdHb,getQjZdjbxxDetailById,DzHb} from "@api/zd"
import {saveDzHb, ZdfggetZxx} from "@api/dz"
import QueryData from '@components/queryData/queryData'
import zdQueryData from '@components/zdQueryData/zdQueryData'
......@@ -244,6 +247,7 @@
hhbtabs: false,
zdDzList: [],
zdZrzList: [],
tableHeight:0,
}
},
created() {
......@@ -252,7 +256,8 @@
this.getXzqList();
this.$nextTick(() => {
this.fgBoxWidth = this.$refs.hbBox.clientWidth;
})
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 610
});
},
methods: {
......@@ -277,6 +282,9 @@
case "zd":
this.zdHb();
break
case "dz":
this.dzHb();
break
case "h":
break;
default:
......@@ -317,7 +325,25 @@
})
},
dzHb() {
let data = {
fwlist: this.$refs.dzhb.dzhbqData,
newdzxmmc: this.$refs.dzhb.dzhbhData.xmmc,
zdbsm: this.$refs.dzhb.zdbsm
}
DzHb(data).then(res => {
if (res.success) {
console.log(res)
this.$message.success("多幢合并成功")
this.$router.push({
path: '/dz',
query: {
source: 1,
bsm: res.result
}
})
}
})
},
hHb() {
......@@ -532,13 +558,20 @@
watch: {
zdbsm: function (bsm) {
this.getZdData(bsm)
},
tabName(n){
if (n == 'h') {
this.hhbtabs = true
}
}
},
}
</script>
<style scoped lang="less">
.hb {
height: 100%;
.menu {
height: 100%;
/deep/ .el-tabs__content {
position: unset;
margin-top: 40px;
......@@ -613,13 +646,6 @@
}
}
.header-button {
height: 50px;
position: fixed;
bottom: 0;
text-align: center;
background-color: #ffffff;
}
table {
margin-top: 10px;
background-color: #fff;
......@@ -660,16 +686,6 @@
.noData {
color: #b2b2b2;
}
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
.xh {
width: 100px;
}
......@@ -682,13 +698,6 @@
}
.hbq {
margin: 14px 20px 20px 20px;
height: 200px;
}
.dzhbh {
box-sizing: border-box !important;
padding: 0 18px 0 0 !important;
margin-top: 10px !important;
display: block !important;
}
.hbh {
margin-left: 20px;
......@@ -815,6 +824,23 @@
}
}
.header-button {
height: 50px;
position: fixed;
bottom: 0;
text-align: center;
background-color: #ffffff;
}
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
.cz {
color: blue;
}
......
......@@ -314,7 +314,6 @@ export default {
this.$nextTick(()=>{
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 320;
this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 270;
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
})
this.search();
},
......@@ -487,7 +486,26 @@ export default {
}
}
});
}
},
//切换房屋状态
handleChoosedH(bsms,color) {
//每次切换房屋状态，将之前高亮的户边框颜色重置为默认
this.$refs.lpbContent.choosedList = [];
this.$refs.lpbContent.$refs.hBsm.forEach((item) => {
item.style.border = '';
});
// console.log(bsms,'bsms');
// console.log(color,'color');
// Dyzt:{list:[],mj:''}
//清除选中户
// this.$refs.lpbContent.clearChoosedH();
this.$nextTick(()=>{
//给hBsmList传值
// console.log(bsms,'bsms');
this.$refs.lpbContent.choosedList = bsms;
this.$refs.lpbContent.borderColor = color;
})
},
},
computed: {},
watch: {
......@@ -504,6 +522,9 @@ export default {
if (!n) {
this.getDyztBsmList();
this.getLpbFwytAndQlxz();
this.$nextTick(()=>{
this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
})
}
},
//改变syclx，更新楼盘表数据
......
......@@ -74,8 +74,7 @@ export default {
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
overflow-y: scroll;
height: calc(100% - 40px);
}
background: #eaedf5;
padding: 0;
......