Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
10346c5d by 杨威
Options

代码合并，楼盘表图例单元状态数据统计

2 parents 93128983 a7d0085d
Expand all
Inline Side-by-side
Showing 9 changed files with 418 additions and 162 deletions
......@@ -77,4 +77,20 @@ export function getLpbTj (data) {
method: 'get',
data:data
})
}
/**
* 楼盘表 批量实预测转换
* zrzbsm 自然幢标识码 ,
* scyclx 实测预测类型 0预测，1实测
*/
export function batchGeneratorBdcdyh (dpdm,zrzbsm) {
return request({
url: 'system/generator/batchGeneratorBdcdyh',
method: 'get',
params: {
zrzbsm:zrzbsm,
dpdm:dpdm,
},
})
}
\ No newline at end of file
......
......@@ -150,7 +150,7 @@ export function jzxsbatchModify(data) {
*/
export function deleteZdInfoByBsm(data) {
return request({
url: '/zd/qjZdjbxx/deleteZdjbxxByBsm',
url: '/delete/deleteDyByBsm',
method: 'delete',
data: data
})
......@@ -161,10 +161,32 @@ export function deleteZdInfoByBsm(data) {
*/
export function zdfg(data) {
return request({
url: '/fg/zdFg',
url: '/bg/zdSplitMerge/zdFg',
method: 'post',
data: data
})
}
/**
* 获取宗地下的自然幢、逻辑幢、幢单元
*/
export function zdXlcd(bsm) {
return request({
url:'/zd/qjZdjbxx/parcels',
method:'get',
params:{
bsm
}
})
}
/**
* 户落宗
*/
export function hzl(data) {
return request({
url:'/system/qjH/hcxlz',
method:'put',
data:data
})
}
......
......@@ -48,14 +48,14 @@
</el-row>
<table border="1">
<tr>
<td>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
<td class="xh">序号</td>
<td class="zddm">宗地代码</td>
<td class="bdcdyh">不动产单元号</td>
<td class="xmmc">项目名称</td>
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
<td class="cz">操作</td>
</tr>
<tr v-if="Data.length==0">
<td colspan="8">
......@@ -63,16 +63,16 @@
</td>
</tr>
<tr v-else v-for="(item,index) in Data" :key="index">
<td>{{index+1}}</td>
<td @click="select(item)" class="xz">
<span>选择</span>
<td class="xh">{{index+1}}</td>
<td class="zddm" :title="item.zddm">{{item.zddm}}</td>
<td class="bdcqdyh" :title="item.bdcdyh">{{item.bdcdyh}}</td>
<td class="xmmc" :title="item.xmmc">{{item.xmmc}}</td>
<td class="bdcqzh" :title="item.bdcqzd">{{item.bdcqzh}}</td>
<td class="qlr" :title="item.qlr">{{item.qlr}}</td>
<td class="zl" :title="item.zl">{{item.zl}}</td>
<td @click="saveNotarize(item)" class="cz">
<span>落宗</span>
</td>
<td>{{item.zddm}}</td>
<td>{{item.bdcdyh}}</td>
<td>{{item.xmmc}}</td>
<td>{{item.bdcqzh}}</td>
<td>{{item.qlr}}</td>
<td>{{item.zl}}</td>
</tr>
</table>
</div>
......@@ -86,10 +86,6 @@
>
</el-pagination>
</div>
<div class="footer-button">
<el-button type="primary" @click="save">确认</el-button>
<el-button type="primary" @click="close">取消</el-button>
</div>
</el-dialog>
</div>
</template>
......@@ -144,13 +140,25 @@
created() {
},
methods: {
saveNotarize: function (val) {
this.zdbsm = val.glbsm;
this.$confirm('将落宗在该宗地上, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
this.save();
}).catch(() => {
this.$message({
type: 'info',
message: '已取消'
});
});
},
currentChange: function (val) {
this.queryData.pageNo = val;
this.getData(this.queryData);
},
select: function (val) {
this.zdbsm = val.glbsm
},
save: function () {
zrzcxlz({
zdBsm: this.zdbsm,
......@@ -216,6 +224,9 @@
background-color: #fff;
font-size: 14px;
width: 100%;
tr:hover{
background-color: #F5F7FA;
}
}
td {
......@@ -248,8 +259,38 @@
height: 650px;
}
.footer-button {
text-align: center;
margin-top: 20px;
.xh {
width: 50px;
}
.zddm {
width: 120px;
}
.bdcdyh {
width: 180px;
}
.xmmc {
width: 100px;
}
.bdcqzh {
width: 100px;
}
.qlr {
width: 100px;
}
.zl {
width: 100px;
}
.cz {
width: 50px;
span {
color: blue;
}
}
</style>
......
<template>
<div class="main">
<div class='input' contenteditable placeholder='请输入文字'>
<div @mouseover="mouseover($event)" @mouseleave="mouseLeave($event)" v-for="(item,index) in datas"
:key="index" style="float: left;"
class="item">
{{item}};
<div style="float: right;display: none" @click="itemClick(index)">X</div>
</div>
</div>
</div>
</template>
<script>
export default {
name: "emailInput",
data() {
return {
datas: ['111', '222', '333', '444', '555', '666', '777', '888', '999'],
}
},
props: {},
methods: {
mouseover(e) {
// e.target 是你当前点击的元素
// 是你绑定事件的元素
let dom = e.currentTarget.firstElementChild
dom.style = "float: right;display: block";
// 获得点击元素的前一个元素
/* e.currentTarget.previousElementSibling.innerHTML
// 获得点击元素的第一个子元素
e.currentTarget.firstElementChild
// 获得点击元素的下一个元素
e.currentTarget.nextElementSibling
// 获得点击元素中id为string的元素
e.currentTarget.getElementById("string")
// 获得点击元素的string属性
e.currentTarget.getAttributeNode('string')
//获得点击元素的父级元素
e.currentTarget.parentElement
// 获得点击元素的前一个元素的第一个子元素的HTML值
e.currentTarget.previousElementSibling.firstElementChild.innerHTML*/
},
mouseLeave(e) {
let dom = e.currentTarget.firstElementChild
dom.style = "float: right;display: none"
},
itemClick(index){
this.datas.splice(index,1)
}
},
computed: {
text: function () {
let text = "";
for (let item of this.datas) {
text += item + ";";
}
return text;
}
}
}
</script>
<style scoped lang="less">
.main {
.input {
width: auto;
height: 24px;
line-height: 24px;
font-size: 14px;
padding: 5px 8px;
border: 1px solid #ddd;
}
.input:empty::before {
content: attr(placeholder);
}
.item{
cursor: pointer;
}
.item:hover {
border: 1px solid #BBF;
}
}
</style>
<template>
<div class="main">
<el-dialog
title="户重新落宗"
:visible.sync="isVisible"
width="50%"
@close="close"
:modal-append-to-body="false"
>
<div class="content">
<div class="input-suffix">
宗 地：
<input
placeholder="请选择宗地" v-model="zdxx" readonly="readonly"
/>
<el-button type="primary" @click="xzzdVisible = true">选择宗地</el-button>
</div>
<div class="input-suffix">
自然幢：
<el-select v-model="hcxlzData.zrzbsm" filterable placeholder="请选择" @change="zrzChange">
<el-option
v-for="item in zrzList"
:key="item.xmmc"
:label="item.label"
:value="item.bsm">
</el-option>
</el-select>
</div>
<div class="input-suffix">
逻辑幢：
<el-select v-model="hcxlzData.ljzbsm" filterable placeholder="请选择" @change="ljzChange">
<el-option
v-for="item in ljzList"
:key="item.bsm"
:label="item.ljzmc"
:value="item.bsm">
</el-option>
</el-select>
</div>
<div class="input-suffix">
幢单元：
<el-select v-model="hcxlzData.zdybsm" filterable placeholder="请选择">
<el-option
v-for="item in zdyList"
:key="item.bsm"
:label="item.zdymc"
:value="item.bsm">
</el-option>
</el-select>
</div>
</div>
<div class="footer">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
<query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx"></query-data>
</el-dialog>
</div>
</template>
<script>
import queryData from './../../components/queryData/queryData'
import {zdXlcd, hzl} from './../../api/zd'
import {Message} from 'element-ui'
export default {
name: "hCxlz",
components: {queryData},
data() {
return {
zd: {},
zrz: {},
ljz: {},
zdy: {},
xzzdVisible: false,
isVisible: false,
zdxx: '', // 宗地信息
hcxlzData: {
bsms: [],
zrzbsm: '',
ljzbsm: '',
zdybsm: ''
},
total: 1,
zrzList: [],
ljzList: [],
zdyList: []
}
},
props: {
hCxlzVisble: {
type: Boolean,
default: false
},
bsms: {
type: Array
}
},
mounted() {
},
methods: {
ljzChange: function () {
const item = this.ljzList.find(i => i.bsm == this.hcxlzData.ljzbsm)
this.hcxlzData.zdybsm = ''
this.zdyList = item.list;
this.zdyList.push({
zdymc: '空',
bsm: ''
})
},
zrzChange: function () {
const item = this.zrzList.find(i => i.bsm == this.hcxlzData.zrzbsm);
this.hcxlzData.ljzbsm = ''
this.hcxlzData.zdybsm = ''
this.ljzList = item.ljzList;
this.ljzList.push({
ljzmc: '空',
bsm: ''
})
this.zdyList = item.zdyList;
this.zdyList.push({
zdymc: '空',
bsm: ''
})
},
getZrz: function (bsm) {
zdXlcd(bsm).then(res => {
this.zrzList = res.result;
})
},
getZdxx: function (val) {
console.log(val, "宗地信息")
this.zd = val
this.zdxx = val.xmmc + "(" + val.zddm + ")";
},
xzzdClose: function () {
this.xzzdVisible = false;
},
result: function () {
this.hcxlzData = {
bsms: [],
zrzbsm: '',
ljzbsm: '',
zdybsm: ''
};
},
cancel() {
console.log("cancel......")
this.close();
},
save() {
console.log("save.......")
if (this.hcxlzData.zrzbsm == '') {
Message.error("请选择自然幢")
return;
}
hzl(this.hcxlzData).then(res => {
if (res.success) {
this.close();
} else {
Message.error(res.message)
}
});
},
close() {
this.$emit('close', false);
this.result();
},
},
watch: {
hCxlzVisble: function (val) {
this.isVisible = val
},
zd: function (val) {
//this.getZrz(val.glbsm)
this.getZrz('815c80d0d5b35968432fdd9c654dd134')
}
}
}
</script>
<style scoped lang="less">
.input-suffix {
input {
width: 210px;
height: 30px;
border-radius: 3px;
border-color: #BBB;
}
}
.content {
text-align: center;
}
.footer {
margin-top: 20px;
text-align: center;
}
</style>
......@@ -222,23 +222,23 @@ export default {
},
//右键菜单的删除
deleteByBsm(){
let zdBsm = this.zdData.zdbsm;
let type;
console.log(zdBsm);
switch (this.zdData.type){
case "zd":
type="0";
break;
case "zrz":
type="1";
break;
case "h":
type="2";
break;
default:
break;
}
let params={"id":zdBsm,"type":type}
//let zdBsm = this.zdData.zdbsm;
//let type;
console.log(this.zdData.zdbsm);
//switch (this.zdData.type){
// case "zd":
// type="0";
// break;
// case "zrz":
// type="1";
// break;
// case "h":
// type="2";
// break;
// default:
// break;
//}
let params={"bsm":this.zdData.zdbsm,"type":this.zdData.type}
deleteZdInfoByBsm(params)
.then((res) => {
if(res.code=200){
......
......@@ -79,6 +79,16 @@
</div>
<span slot="footer" class="dialog-footer">
</span>
<div class="page">
<el-pagination
background
layout="prev, pager, next,total"
:page-size="queryData.pageSize"
:total="total"
@current-change="currentChange"
>
</el-pagination>
</div>
</el-dialog>
</div>
......@@ -91,6 +101,7 @@
name: "queryData",
data() {
return {
total:1,
queryData: {
bdcdyh: "",
bdcqzh: "",
......@@ -99,7 +110,9 @@
qszt: "2",
xmmc: "",
zddm: "",
zl: ""
zl: "",
pageNo: 1,
pageSize: 10,
},
Data: [],
isVisible: false
......@@ -125,6 +138,10 @@
created() {
},
methods: {
currentChange: function (val) {
this.queryData.pageNo = val;
this.getData(this.queryData);
},
result: function () {
this.queryData = {
bdcdyh: "",
......@@ -133,7 +150,9 @@
qszt: "2",
xmmc: "",
zddm: "",
zl: ""
zl: "",
pageNo: 1,
pageSize: 10
};
this.getData(this.queryData)
},
......@@ -141,6 +160,7 @@
data['dylxs'] = this.dylxs;
getSearchList(data).then(res => {
this.Data = res.result.records
this.total = res.result.total;
})
},
search: function () {
......@@ -151,7 +171,7 @@
},
close: function () {
this.$emit('close')
this.isVisible = false
this.result();
}
},
watch: {
......@@ -176,6 +196,9 @@
background-color: #fff;
font-size: 14px;
width: 100%;
tr:hover{
background-color: #F5F7FA;
}
}
td {
......
......@@ -41,14 +41,14 @@
</el-row>
<table border="1">
<tr>
<td>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
<td class="xh">序号</td>
<td class="cz">操作</td>
<td class="zddm">宗地代码</td>
<td class="bdcdyh">不动产单元号</td>
<td class="xmmc">项目名称</td>
<td class="bdcqzh">不动产权证号</td>
<td class="qlr">权利人</td>
<td class="zl">坐落</td>
</tr>
<tr v-if="Data.length == 0">
<td colspan="8">
......@@ -56,16 +56,16 @@
</td>
</tr>
<tr v-else v-for="(item, index) in Data" :key="index">
<td>{{ index + 1 }}</td>
<td @click="xzzrz(item)" class="xz">
<td class="xh">{{ index + 1 }}</td>
<td @click="xzzrz(item)" class="cz">
<span>选择</span>
</td>
<td>{{ item.zddm }}</td>
<td>{{ item.bdcdyh }}</td>
<td>{{ item.xmmc }}</td>
<td>{{ item.bdcqzh }}</td>
<td>{{ item.qlr }}</td>
<td>{{ item.zl }}</td>
<td class="zddm" :title="item.zddm">{{ item.zddm }}</td>
<td class="bdcdyh" :title="item.bdcdyh">{{ item.bdcdyh }}</td>
<td class="xmmc" :title="item.xmmc">{{ item.xmmc }}</td>
<td class="bdcqzh" :title="item.bdcqzh ">{{ item.bdcqzh }}</td>
<td class="qlr" :title="item.qlr">{{ item.qlr }}</td>
<td class="zl">{{ item.zl }}</td>
</tr>
</table>
</div>
......@@ -107,7 +107,7 @@
bdcqzh: "",
dylxs: ["zrz"],
qlrmc: "",
qszt: "",
qszt: "2",
xmmc: "",
zddm: "",
zl: "",
......@@ -142,7 +142,7 @@
bdcqzh: "",
dylxs: ["zrz"],
qlrmc: "",
qszt: "",
qszt: "2",
xmmc: "",
zddm: "",
zl: "",
......@@ -178,12 +178,19 @@
background-color: #fff;
font-size: 14px;
width: 100%;
}
td {
text-align: center;
height: 36px;
min-width: 50px;
table-layout: fixed;
tr:hover{
background-color: #F5F7FA;
}
td, th {
text-align: center;
height: 36px;
min-width: 50px;
overflow: hidden;
white-space: nowrap;
-ms-text-overflow: ellipsis;
text-overflow: ellipsis;
}
}
table:hover {
......@@ -198,8 +205,39 @@
margin-top: 20px;
}
.xz {
color: blue;
.xh {
width: 50px;
}
.zddm {
width: 120px;
}
.bdcdyh {
width: 180px;
}
.xmmc {
width: 100px;
}
.bdcqzh {
width: 100px;
}
.qlr {
width: 100px;
}
.zl {
width: 100px;
}
.cz {
width: 50px;
span {
color: blue;
}
}
.noData {
......