Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
33e383c4 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents f057e5bd 907e9995
Expand all
Inline Side-by-side
Showing 14 changed files with 289 additions and 184 deletions
......@@ -68,4 +68,14 @@
.el-message{
min-width: 200px!important;
top: 50px!important;
}
.el-pager li{
background-color: #FFFFFF!important;
}
.el-pagination.is-background .el-pager li:not(.disabled).active {
background-color: #409EFF!important;
color: #FFF;
}
.el-pagination{
margin-left: -8px;
}
\ No newline at end of file
......
......@@ -216,7 +216,8 @@ export default {
path: '/'+item.type,
query:{
source: 2,
bsm:item.bsm
bsm:item.bsm,
auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
}
});
}else if(item.type == 'zrz'){
......@@ -225,7 +226,8 @@ export default {
path: '/'+item.type,
query:{
source: 2,
bsm:item.bsm
bsm:item.bsm,
auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
}
});
}else if(item.type == 'dz'){
......@@ -234,7 +236,8 @@ export default {
path: '/'+item.type,
query:{
source: 2,
bsm:item.bsm
bsm:item.bsm,
auth:this.$route.query.auth ? this.$route.query.auth :'0,1,2'
}
});
}
......
......@@ -128,7 +128,12 @@ import sxdr from '@components/sxdr/sxdr'
export default {
inheritAttrs: false,
props: {
pd: {},
pd: {
type:Array,
default: () => {
return [];
},
},
size: {
type: Number,
default: 16,
......@@ -169,7 +174,7 @@ export default {
};
},
watch: {
pd(n, o) {
pd(n, o) {
this.formatData = this.preDealData(n);
},
lpbvisible(value) {
......@@ -196,7 +201,9 @@ export default {
// }
},
created() {
this.preDealData(this.pd);
this.$nextTick(()=>{
this.preDealData(this.pd);
})
// this.expandTreeItemById(["6b5af49d803f97baf06afb897de257f5"]);
},
......@@ -280,6 +287,9 @@ export default {
},
preDealData(list) {
//楼盘表目录树没有expand属性
// if(list == null){
// return list
// }else{
list.forEach((x) => {
if (x.expand == undefined) this.$set(x, "expand", true);
if (x.children && x.children.length > 0) {
......@@ -287,6 +297,7 @@ export default {
}
});
return list;
// }
},
// 根据id展开树的具体项
expandTreeItemById(idList) {
......@@ -339,7 +350,8 @@ export default {
}
})
}
})
});
this.$store.state.treeData = this.formatData;
},
//自然幢右键点击事件
openMenu(e,item){
......
<template>
<el-row>
<el-col :span="24" style="margin-left: -10px;">
<el-row class="box">
<el-col :span="24">
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="不动产单元号">
<el-form-item label="宗地编码">
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
v-model="queryData.zddm"
placeholder="输入宗地编码"
@change="query"
></el-input>
</el-form-item>
......@@ -19,10 +18,11 @@
@change="query"
></el-input>
</el-form-item>
<el-form-item label="宗地编码">
<el-form-item label="不动产单元号">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
@change="query"
></el-input>
</el-form-item>
......@@ -30,7 +30,6 @@
<el-button type="warning" @click="reset">重置</el-button>
<el-button
type="primary"
class="moreSearchBtn"
@click="moreSearch"
>更多查询
</el-button>
......@@ -41,13 +40,6 @@
<el-row class="row3" v-if="ismore">
<el-col :span="22">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="不动产权证号">
<el-input
placeholder="输入不动产权证号"
v-model="queryData.bdcqzh"
@change="query"
></el-input>
</el-form-item>
<el-form-item label="权利人名称">
<el-input
placeholder="输入权利人名称"
......@@ -62,6 +54,13 @@
@change="query"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
<el-input
placeholder="输入不动产权证号"
v-model="queryData.bdcqzh"
@change="query"
></el-input>
</el-form-item>
</el-form>
</el-col>
<el-col :span="2" :offset="offset">
......@@ -155,8 +154,10 @@ export default {
moreSearch(){
if(this.ismore === true){
this.ismore = false;
this.$parent.tableHeight+=55;
}else {
this.ismore = true;
this.$parent.tableHeight-=55;
}
// this.$message('待开发');
......@@ -178,8 +179,17 @@ export default {
};
</script>
<style scoped lang="less">
.el-row{
background-color: #EAEDF5;
.box{
background-color: #FFFFFF;
box-sizing: border-box;
padding: 18px 0 0 0;
border: 1px solid #E6E6E6;
.el-col{
.el-row{
margin-left: -10px;
}
}
margin-bottom: 18px;
}
.el-button {
width: 100px;
......
......@@ -289,6 +289,7 @@ export default {
if (res.success) {
this.pd = res.result;
this.$store.state.newZdbsm = '';
this.$store.state.treeData = res.result;
}
});
},
......
<template>
<div class="main">
<p class="tips">查询条件</p>
<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
<p class="tips">查询列表</p>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -82,7 +84,7 @@
this.queryData.pageSize=this.pageSize
this.getData(this.queryData);
this.$nextTick(() => {
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
});
},
methods: {
......@@ -163,6 +165,11 @@
display: flex;
flex-direction: column;
background-color: #EAEDF5;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
......
<template>
<div class="main">
<div class="search">
<el-form :inline="true" class="demo-form-inline">
<div>
<p class="tips">查询条件</p>
<div class="search">
<el-row>
<el-col :span="8">
<el-form-item label="宗地编码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产权证号">
<el-input
v-model="queryData.bdcqzh"
placeholder="输入坐落地址"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="不动产单元号">
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-col :span="24" style="margin-left: -10px;">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="宗地编码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
></el-input>
</el-form-item>
<el-form-item label="不动产权证号">
<el-input
v-model="queryData.bdcqzh"
placeholder="输入坐落地址"
></el-input>
</el-form-item>
<el-form-item label="不动产单元号">
<el-input
maxlength="28"
v-model="queryData.bdcdyh"
placeholder="输入不动产单元号"
></el-input>
</el-form-item>
<el-button type="primary" @click="search">查询</el-button>
<el-button type="warning" style="margin-left:10px" @click="result">重置</el-button>
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<el-form-item label="权利人">
<el-input
v-model="queryData.qlrmc"
placeholder="输入权利人姓名"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="坐落">
<el-input
v-model="queryData.zl"
placeholder="输入坐落地址"
></el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-button type="primary" @click="search">查询</el-button>
<el-button type="warning" style="margin-left:10px" @click="result">重置</el-button>
<el-col :span="24" style="margin-left: -10px;">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="权利人">
<el-input
v-model="queryData.qlrmc"
placeholder="输入权利人姓名"
></el-input>
</el-form-item>
<el-form-item label="坐落">
<el-input
v-model="queryData.zl"
placeholder="输入坐落地址"
></el-input>
</el-form-item>
</el-form>
</el-col>
</el-row>
</el-form>
</div>
<p class="tips">查询列表</p>
<el-table :data="Data" :height="tableHeight">
<td class="xh">序号</td>
<td class="cz">操作</td>
......@@ -139,21 +136,11 @@ export default {
created() {},
mounted() {
this.getData(this.queryData);
if (
(document.documentElement.clientWidth || document.body.clientWidth) < 1890
) {
this.$nextTick(() => {
this.tableHeight =
(document.documentElement.clientHeight ||
document.body.clientHeight) - 355;
});
} else {
this.$nextTick(() => {
this.tableHeight =
(document.documentElement.clientHeight ||
document.body.clientHeight) - 304;
});
}
this.$nextTick(() => {
this.tableHeight =
(document.documentElement.clientHeight ||
document.body.clientHeight) - 396;
});
},
methods: {
currentChange: function(val) {
......@@ -200,6 +187,22 @@ export default {
padding: 18px;
height: auto;
}
.search{
background-color: #FFFFFF;
box-sizing: border-box;
padding: 18px 0 8px 0;
border: 1px solid #E6E6E6;
margin-bottom: 18px;
}
.el-button {
width: 100px;
}
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
table {
margin-top: 10px;
......@@ -287,21 +290,21 @@ table:hover {
width: auto;
height: auto;
}
/deep/ .el-form-item__label {
width: 96px;
}
/deep/ .el-form {
margin-left: -28px;
.el-button{
margin: 0 22px;
}
}
.el-form-item{
width: 100%;
box-sizing: border-box;
padding: 0 20px;
/deep/.el-form-item__content{
width: calc(100% - 96px);
}
}
// /deep/ .el-form-item__label {
// width: 96px;
// }
// /deep/ .el-form {
// margin-left: -28px;
// .el-button{
// margin: 0 22px;
// }
// }
// .el-form-item{
// width: 100%;
// box-sizing: border-box;
// padding: 0 20px;
// /deep/.el-form-item__content{
// width: calc(100% - 96px);
// }
// }
</style>
......
......@@ -485,14 +485,14 @@
},
xzDz(bsm, index) {
this.zdFghData.newZdlist.fwlist[index].push({
zbsm: bsm,
ztype: 'dz'
bsm: bsm,
type: 'dz'
})
},
xzZrz(bsm, index) {
this.zdFghData.newZdlist.fwlist[index].push({
zbsm: bsm,
ztype: 'zrz'
bsm: bsm,
type: 'zrz'
})
},
......@@ -502,8 +502,8 @@
this.zdDzList[childIndex].hasChoosed = index;
if(this.zdFghData.newZdlist[index].dz.indexOf(obj) < 0){
this.zdFghData.newZdlist[index].fwlist.push({
zbsm: bsm,
ztype: 'dz'
bsm: bsm,
type: 'dz'
});
this.zdFghData.newZdlist[index].dz.push(obj);
this.tempBsmList.push(bsm);
......@@ -523,8 +523,8 @@
this.zdZrzList[childIndex].hasChoosed = index;
if(this.zdFghData.newZdlist[index].zrz.indexOf(obj) < 0){
this.zdFghData.newZdlist[index].fwlist.push({
zbsm: bsm,
ztype: 'zrz'
bsm: bsm,
type: 'zrz'
})
this.zdFghData.newZdlist[index].zrz.push(obj);
this.tempBsmList.push(bsm);
......@@ -595,8 +595,8 @@
},
handleNodeClick(node) {
this.zdFghData.newZdlist[this.selectIndex].fwlist.push({
zbsm: node.label,
ztype: '多幢'
bsm: node.label,
type: '多幢'
}
);
},
......
......@@ -84,7 +84,7 @@
<div class="lpb-content" ref="lpbContentWrap" :style="{ height: lpbContentHeight + 'px' }">
<!-- 楼盘表主体 -->
<div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
<lpbContent ref="lpbContent" :zrzbsm='zrzbsm' :isHbfg = true :isHb="isHb"></lpbContent>
<lpbContent ref="lpbContent" :zrzbsm='zrzbsm' lpbParent = 'isHbfg' :isHb="isHb"></lpbContent>
</div>
<!-- 右侧图例 -->
<div class="lp-legend">
......@@ -538,8 +538,11 @@ export default {
.lp-overview {
transition: 0.5s;
flex: 1;
padding-right: 20px;
margin-right: 20px;
box-sizing: border-box;
border: 1px solid #ececec;
border-top: 0;
border-bottom: 0;
}
.lp-legend {
transition: 0.5s;
......
<template>
<div class="main">
<p class="tips">查询条件</p>
<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
<p class="tips">查询列表</p>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -90,7 +92,7 @@
this.queryData.pageSize=this.pageSize
this.getData(this.queryData)
this.$nextTick(() => {
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255;
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
});
},
methods: {
......@@ -232,6 +234,11 @@
display: flex;
flex-direction: column;
background-color: #EAEDF5;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
......
<template>
<div class="main">
<p class="tips">查询条件</p>
<SearchHead @getSearchCondition="geQuerytData" :type="type"></SearchHead>
<p class="tips">查询列表</p>
<div class="dataGrid" ref="dataGrid">
<el-table
:data="tableData"
......@@ -77,7 +79,8 @@
created() {
},
mounted() {
this.queryData.pageSize=this.pageSize
this.queryData.pageSize=this.pageSize;
this.queryData.pageNo=this.pageNo;
this.getData(this.queryData);
this.$nextTick(()=>{
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
......@@ -188,6 +191,11 @@
display: flex;
flex-direction: column;
background-color: #EAEDF5;
.tips{
color: #9B9B9B;
margin-left: 2px;
margin-bottom: 10px;
}
.demo-form-inline {
margin-top: 18px;
.moreSearchBtn {
......
......@@ -65,13 +65,13 @@
<el-button class="radioBtn" label="7" border @click="addBdcdyh"
><i class="iconfont iconpiliangdanyuanhao"></i>批量单元号</el-button
>
<el-button
<!-- <el-button
class="radioBtn"
label="7"
border
@click="hcxlz"
><i class="iconfont iconhuzhongxinlazong"></i>户重新落宗</el-button
>
> -->
<el-button
class="radioBtn"
label="7"
......@@ -257,10 +257,6 @@
:bsms="bsms"
@close="hcxlzClose"
></h-cxlz>
<!-- 双击户的弹出框 -->
<el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" >
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
</el-dialog>
</div>
</template>
......@@ -275,7 +271,6 @@ import LineTree from "@components/lineTree/lineTree";
import addLjz from "./ljz/index";
import addZdy from "./zdy/index";
import addCh from "./ch/index";
import hbj from "./hbj/index";
import lpbContent from "./lpbContent/index";
import { getLpbMenuTree, batchScYcChange, getLpbTj,batchGeneratorBdcdyh,getLpbFwytAndQlxz ,batchCommit} from "@api/lpb";
......@@ -291,14 +286,12 @@ export default {
PlSh,
PlH,
PlZl,
hbj,
HCxlz,
},
props: {},
data() {
return {
bsms: [],
hbsm: "",
dialogVisible: false,
plcVisible: false,
plhVisible: false,
......@@ -565,12 +558,7 @@ export default {
getHbsm(data, type) {
if (type) {
// 双击
this.hbsm = data;
this.$store.state.hbsm=this.data;
this.hbjVisible = true;
this.$nextTick(function() {
this.$refs.hbj.getHInfo(this.hbsm);
});
} else {
//单击 TO DO
this.bsms = data;
......
......@@ -302,7 +302,9 @@
<li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li>
<!-- 分割 -->
<li v-show="rightClickFlag == 'fg'" @click="handleFg">户分割</li>
<!-- <li v-show="rightClickFlag == 'fg'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li> -->
<!-- 范围属性变更 -->
<li v-show="rightClickFlag == 'fwsxbg'" @click="handleFwsxbg">变更信息</li>
</ul>
<!-- 层操作弹框 -->
......@@ -362,6 +364,10 @@
:type="scyclx"
@loading="loadingData($store.state.zrzbsm,$parent.scyclx)"
></move-h>
<!-- 双击户的弹出框 -->
<el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="80%" >
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
</el-dialog>
</div>
</template>
<script>
......@@ -369,22 +375,24 @@ import moveH from "@components/moveH/moveH";
import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
import { hhb,hfg } from "@api/h";
import { Message } from 'element-ui';
import { fwsxbgbl } from "@api/common";
import hbj from "../hbj/index";
export default {
name: "",
components: { moveH },
components: { moveH,hbj },
props: {
isHbfg:{
type:Boolean,
default:false
},
zrzbsm:{
type:String,
default:''
},
lpbParent:{
type:String,
default:'isLpb'
},
isHb:{
type:Boolean,
default:true
}
},
},
data() {
return {
......@@ -394,6 +402,7 @@ export default {
cs: [],
zdys: [],
},
hbjVisible:false,
lpbContentWidth: "",
ljzWidth: 10000,
zdyWidth: 1000,
......@@ -402,6 +411,7 @@ export default {
ljzcHeight: 0, //逻辑幢下层户的div高度
ljzzdyHeight: 0, //逻辑幢下幢单元的div高度
loading: true,
hbsm:'',
hbsmList: [],
cbsmList: [],
time: null, //区分单双击事件的定时器
......@@ -614,11 +624,17 @@ export default {
//户双击事件
dbclick(bsm) {
clearTimeout(this.time);
this.hbsm = bsm;
this.$store.state.hbsm=this.data;
this.hbjVisible = true;
this.$nextTick(function() {
this.$refs.hbj.getHInfo(this.hbsm);
});
// if (this.isHbfg) {
// }else{
// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
this.$parent.getHbsm(bsm, true);
// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
// this.$parent.getHbsm(bsm, true);
// }
},
//删除多重数组中的某一项
......@@ -646,49 +662,59 @@ export default {
openMenu(e, item, type) {
this.lpbChLeft = e.pageX;
this.lpbChTop = e.pageY;
if (this.isHbfg) {
this.rightClickFlag = this.isHb ? 'hb':'fg';
if (this.fghbChoosedList.length>1) {
//合并
this.lpbChVisible = true;
//判断选中户可以执行的合并类型
let chIsSame = this.fghbChoosedList.every((item)=> {
return item.ch == this.fghbChoosedList[0].ch;
});
let hhIsSame = this.fghbChoosedList.every((item)=> {
return item.hh == this.fghbChoosedList[0].hh;
});
this.$nextTick(()=>{
if(chIsSame){
this.canHb = 'zyhb'
}else if(hhIsSame){
this.canHb = 'sxhb'
this.chData = item;
switch (this.lpbParent) {
case 'isHbfg':
this.rightClickFlag = this.isHb ? 'hb':'fg';
if (this.fghbChoosedList.length>1) {
//合并
this.lpbChVisible = true;
//判断选中户可以执行的合并类型
let chIsSame = this.fghbChoosedList.every((item)=> {
return item.ch == this.fghbChoosedList[0].ch;
});
let hhIsSame = this.fghbChoosedList.every((item)=> {
return item.hh == this.fghbChoosedList[0].hh;
});
this.$nextTick(()=>{
if(chIsSame){
this.canHb = 'zyhb'
}else if(hhIsSame){
this.canHb = 'sxhb'
}else{
this.canHb = ''
}
})
}else{
//分割
this.lpbChVisible = true;
this.fgData.oldbsm = item.bsm;
console.log(item,'item');
//判断户的实际sjcs为1，只能水平分割
this.fgData.fgfx = item.sjcs == 1 ? 0 : 1;
if(item.sjcs == 1){
//判断户的实际sjcs为1，只能水平分割
this.fgData.fgfx = 0;
this.fgData.fghs = '';
}else{
this.canHb = ''
this.fgData.fgfx = 1;
//判断户的实际sjhs不为1，分割户数为sjhs的值
this.fgData.fghs = item.sjcs;
}
})
}else{
//分割
this.lpbChVisible = true;
this.fgData.oldbsm = item.bsm;
console.log(item,'item');
//判断户的实际sjcs为1，只能水平分割
this.fgData.fgfx = item.sjcs == 1 ? 0 : 1;
if(item.sjcs == 1){
//判断户的实际sjcs为1，只能水平分割
this.fgData.fgfx = 0;
this.fgData.fghs = '';
}else{
this.fgData.fgfx = 1;
//判断户的实际sjhs不为1，分割户数为sjhs的值
this.fgData.fghs = item.sjcs;
}
}
}else{
console.log(e, "e");
this.chData = item;
this.rightClickFlag = type;
this.lpbChVisible = true;
break;
case 'isFwsxbg':
console.log(item,'item');
this.rightClickFlag = 'fwsxbg';
this.lpbChVisible = true;
break;
case 'isLpb':
this.rightClickFlag = type;
this.lpbChVisible = true;
break;
default:
break;
}
},
// 户单元状态点击事件
......@@ -851,6 +877,33 @@ export default {
}
})
.catch(() => {});
},
//范围属性变更
handleFwsxbg(){
let params = { bsm: this.chData.bsm, type: 'h'};
this.$confirm('是否确定范围属性变更?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
fwsxbgbl(params)
.then((res) => {
if (res.code == 200) {
console.log('成功');
this.getLpb(this.zrzbsm,this.scyclx);
this.dbclick(this.chData.bsm);
} else {
this.$message({
message: res.message,
type: "warning",
});
}
}).catch((error) => {
});
}).catch(() => {
});
}
},
computed: {
......