Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
c2bc1fbb by 杨威
Options

Merge remote-tracking branch 'origin/master' into master

2 parents ad62a573 e09d8f62
Expand all
Inline Side-by-side
Showing 32 changed files with 805 additions and 162 deletions
......@@ -208,3 +208,4 @@ export function registerCall(data) {
data:data
})
}
......
......@@ -97,3 +97,13 @@ export function saveDzFg(data) {
data: data,
})
}
/**
* 多幢合并保存
*/
export function saveDzHb(data) {
return request({
url: '/bg/dzSplitMerge/dzHb',
method: 'post',
data: data,
})
}
......
......@@ -59,3 +59,14 @@ export function getHZdxx(bsm) {
})
}
/**
* 户合并
*/
export function hhb(data) {
return request({
url: '/bg/hSplitMerge/hHb',
method: 'post',
data: data
})
}
\ No newline at end of file
......
......@@ -10,6 +10,10 @@ export function getSearchList(data) {
})
}
/**
* 宗地分割选择宗地列表
* @param data
*/
export function zdlist(data) {
return request({
url: '/zd/qjZdjbxx/zdlist',
......@@ -17,3 +21,15 @@ export function zdlist(data) {
data:data
})
}
/**
* 多幢分割选择多幢列表
* @param data
*/
export function dzList(data) {
return request({
url:'/fw/qjDz/dzlist',
method:'post',
data:data
})
}
......
<template>
<div>
<el-dialog
title="新增"
:visible.sync="isVisible"
width="70%"
@close="close"
:modal-append-to-body="false"
center>
<div class="search">
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<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" style="margin-left:30px" @click="search">查询</el-button>
<el-button type="warning" @click="reset">重置</el-button>
</el-form>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline">
<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>
<div class="table-bode">
<table border="1">
<tr>
<td>序号</td>
<td>操作</td>
<td>宗地代码</td>
<td>不动产单元号</td>
<td>项目名称</td>
<td>不动产权证号</td>
<td>权利人</td>
<td>坐落</td>
</tr>
<tr v-if="Data.length==0">
<td colspan="8">
<span class="noData">暂无数据</span>
</td>
</tr>
<tr v-else v-for="(item,index) in Data" :key="index">
<td>{{index+1}}</td>
<td @click="addData(item)" class="xz">
<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>
</div>
<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>
</template>
<script>
import {dzList} from './../../api/search'
export default {
name: "zdQueryData",
data() {
return {
total: 1,
queryData: {
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
xmmc: "",
zddm: "",
zl: "",
pageNo: 1,
pageSize: 10,
},
Data: [],
isVisible: false
}
},
props: {
centerDialogVisible: {
type: Boolean,
default: function () {
return false
}
},
isClose: {
type: Boolean,
default: false
}
},
mounted() {
this.getData(this.queryData)
},
created() {
},
methods: {
currentChange: function (val) {
this.queryData.pageNo = val;
this.getData(this.queryData);
},
reset: function () {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
xmmc: "",
zddm: "",
zl: "",
pageNo: 1,
pageSize: 10
};
this.getData(this.queryData)
},
getData: function (data) {
dzList(data).then(res => {
this.Data = res.result.records
this.total = res.result.total;
})
},
search: function () {
this.getData(this.queryData)
},
addData: function (val) {
this.$emit("getData", val)
if (this.isClose) {
this.close();
}
},
close: function () {
this.$emit('close')
this.reset();
}
},
watch: {
centerDialogVisible(val) {
this.isVisible = val
}
}
}
</script>
<style scoped lang="less">
.main {
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
/deep/ .el-form-item__label {
width: 96px;
text-align: right;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
tr:hover {
background-color: #F5F7FA;
}
}
td {
text-align: center;
height: 36px;
min-width: 50px;
}
table:hover {
cursor: pointer;
}
.inputtitle {
line-height: 40px;
}
.shop {
margin-top: 20px;
}
.xz {
color: blue;
}
.noData {
color: #b2b2b2;
}
.table-bode{
height: 450px;
}
.page {
margin-top: 20px;
}
</style>
......@@ -55,7 +55,6 @@
custom-class="insetDialog"
append-to-body
width="50%"
center
>
<el-form :model="formData" class="qlrForm">
<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
......
......@@ -523,6 +523,40 @@ export default {
this.outNum--;
}
},
reset(){
this.countList=[
{
id: Math.random(),
isInside: false,
hasNotBorder: false,
bsm: "", //权利性质标识码
glbsm: "", //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzdm: "",
zhqlxzlx: "", //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
list: [
{
pzdjbsm: "",
pzdjmc: "",
pzytdm: "",
pzytmc: "",
pzytmj: 0,
qlxzbsm: "",
sjdjbsm: "",
sjdjmc: "",
sjytdm: "",
sjytmc: "",
sjytmj: 0,
syqx: "",
tdsyjssj: "",
pickerStart:{},
pickerEnd:{},
tdsyqssj: "",
tdzh: "",
},
],
},
];
},
//内层操作
handleInClick(index, childIndex, type) {
let insideObj = {
......
......@@ -46,6 +46,7 @@
@contextmenu.prevent="openMenu($event, item,list)"
:class="{
active_color: item.expand,
curPage:$route.query.bsm==item.bsm
}"
>
<img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
......@@ -404,4 +405,7 @@ export default {
position: relative;
top: 1px;
}
.curPage{
color: orange;
}
</style>
......
......@@ -67,7 +67,7 @@
<li @click="exportToShp">ESRI Shape</li>
</ul>
</li>
<li v-show="isZD">导入属性</li>
<li v-show="isZD" @click="drsx">导入属性</li>
<li v-show="!isZD">导入楼盘</li>
<li>重叠分析</li>
<li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li>
......@@ -110,6 +110,7 @@
<el-dialog title="新建" :visible.sync="dialogVisible" width="48%">
<Create @closeDialog="closeDialog" :auth="true"></Create>
</el-dialog>
<sxdr :sxdr-visible="sxdrVisible" @close="sxdrClose" :dylx="zdData.type" :bsm="zdData.bsm"></sxdr>
</div>
</template>
<script>
......@@ -121,6 +122,7 @@ import geoUtils from "@components/lineTree/tx/js/geoUtils";
import featureUpdate from "@libs/map/featureUpdate";
import {deleteLjz,deleteZdy} from "./../../api/lpb"
import exportTemJson from '@/assets/json/exportTemplate.json'
import sxdr from './../../components/sxdr/sxdr'
export default {
inheritAttrs: false,
props: {
......@@ -134,10 +136,11 @@ export default {
default: false,
}
},
components: { lineItem,Create,ImportGeo },
components: { lineItem,Create,ImportGeo,sxdr },
mixins:[geoUtils,featureUpdate],
data() {
return {
sxdrVisible:false,
selectedDetail: {},
timer: {},
formatData: [],
......@@ -197,6 +200,12 @@ export default {
},
methods: {
drsx(){
this.sxdrVisible=true;
},
sxdrClose(){
this.sxdrVisible=false;
},
loading(){
this.$emit("loading")
},
......
......@@ -6,7 +6,7 @@
width="50%"
@close="close"
:modal-append-to-body="false"
center>
>
<div>
<div class="bottom-radio">
<el-radio-group v-model="moveHdata.sxzylx">
......
......@@ -6,7 +6,7 @@
width="50%"
@close="close"
:modal-append-to-body="false"
center>
>
<div>
<table border="1">
<tr>
......
......@@ -6,7 +6,7 @@
width="70%"
@close="close"
:modal-append-to-body="false"
center>
>
<div>
<table border="1">
<tr>
......@@ -126,12 +126,12 @@
</tr>
<tr height="30" v-for="(item1,index) in form.fwytList" :key="index">
<td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle">
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button>
<el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addYtInfo">+</el-button>
<span>用途</span>
</td>
<td width="30" colspan="1" align="center" >
<el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button>
<el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button>
规划用途
</td>
<td width="30" colspan="4" align="center" >
......@@ -167,11 +167,12 @@
<tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index">
<td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" >
<el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button>
<el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button>
<span>房屋结构</span>
</td>
<td colspan="1" align="center" >
<span @click="deleteFwjgInfo(index)">删除</span>
<!-- <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteFwjgInfo(index)" circle>-</el-button>-->
</td>
<td colspan="9" >
<el-select v-model="item1.fwjgzdbsm" placeholder="请选择" >
......@@ -187,7 +188,7 @@
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
</td>
</tr>
<tr></tr>
......@@ -210,7 +211,7 @@
</div>
<div class="shop">
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="result">重置</el-button>
<el-button type="primary" @click="reset">重置</el-button>
<el-button type="primary" @click="cancel">取消</el-button>
</div>
</el-dialog>
......@@ -252,6 +253,7 @@
},
form:{
qszt:'0',
jzmj:'',
tnjzmj:'',
ftjzmj:'',
......@@ -360,18 +362,82 @@
this.isVisible = false
this.result()
},
result: function () {
reset: function () {
this.form={
qszt:'0',
jzmj:'',
tnjzmj:'',
ftjzmj:'',
dxbfjzmj:'',
qtjzmj:'',
ftxs:'',
hxbsm:'',
hxjgbsm:'',
gytdmj: '',
fttdmj: '',
dytdmj: '',
fwlxbsm: '',
fwcbbsm:'',
fwcqlybsm:'',
fwxzbsm:'',
dqtgs:'',
nqtgs:'',
xqtgs:'',
bqtgs:'',
fwjgbsm:'',
fwytList:[{
glbsm:'', //关联标识码
fwytzdbsm:'', //房屋用途字典标识码
sx:'', //顺序
fwsjytbsm:'', //房屋实际用途字典标识码
}],
fwjgList:[{
fwjgzdbsm:'', //房屋结构字典标识码
glbsm:'', //关联标识码
sx:'', //顺序
}],
qlxzList:[{
qlxzdm:'', //权利性质代码
glbsm:'', //宗地BSM、自然幢BSM、户BSM、多幢BSM、宗海BSM
qlxzzdbsm:'', //权利性质字典表标识码
qlxzmc:'', //权利名称名称
zhqlxzlx:'', //除宗海数据外，默认都是空；0:用海类型权利性质;2:海岛用途权利性质
addQjTdytRequestList:[{
}], //土地用途新增实体列表
}]
};
this.$refs.qlxzModule.reset();
this.ytTitleRowspan=1; //用途的单元格垂直合并数量
this.fwjgTitleRowspan=1; //房屋结构的单元格垂直合并数量
},
save: function () {
this.form['hbsms'] = this.bsms
this.form.qlxzList= this.$refs.qlxzModule.getQlxzDataList();
for(let i=0;i< this.form.fwjgList.length;i++){
if(this.form.fwjgList[i].fwjgzdbsm===''){
this.form.fwjgList.splice(i,1);
}
}
for(let i=0;i< this.form.fwytList.length;i++){
if(this.form.fwytList[i].fwsjytbsm===''){
this.form.fwytList.splice(i,1);
}
}
for(let i=0;i< this.form.qlxzList.length;i++){
if(this.form.qlxzList[i].qlxzdm===''){
this.form.qlxzList.splice(i,1);
}
}
console.log("批量户信息")
console.log(this.form)
batchUpdateQjH(this.form).then((res)=>{
if(res.code===200){
this.lodding()
this.$message.success("保存成功！")
this.$nextTick(()=>{
this.reset();
})
this.close();
}
})
},
......@@ -396,6 +462,7 @@
background-color: #fff;
font-size: 14px;
width: 100%;
table-layout: fixed;
}
td {
......
......@@ -6,7 +6,7 @@
width="50%"
@close="close"
:modal-append-to-body="false"
center>
>
<div>
<span class="xl" @click="xl">祥例</span>
<table border="1">
......
......@@ -6,7 +6,7 @@
width="60%"
@close="close"
:modal-append-to-body="false"
center>
>
<div>
<table border="1">
<tr>
......
......@@ -6,7 +6,7 @@
width="70%"
@close="close"
:modal-append-to-body="false"
center>
>
<div class="search">
<!-- <el-button type="primary" @click="search">查询</el-button>
<el-button type="primary" @click="result">重置</el-button> -->
......@@ -56,42 +56,7 @@
</el-form>
</el-col>
</el-row>
<!-- <el-row :gutter="10" class="shop">
<el-col :span="4" class="inputtitle">
宗地编码:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.zddm"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
不动产权证号:
</el-col>
<el-col :span="8" class="">
<el-input v-model="queryData.bdcqzh"></el-input>
</el-col>
</el-row> -->
<!-- <el-row :gutter="10">
<el-col :span="4" class="inputtitle">
不动产单元号:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.bdcdyh"></el-input>
</el-col>
<el-col :span="4" class="inputtitle">
权利人:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.qlrmc"></el-input>
</el-col>
</el-row>
<el-row :gutter="10">
<el-col :span="4" class="inputtitle">
坐落:
</el-col>
<el-col :span="8">
<el-input v-model="queryData.zl"></el-input>
</el-col>
</el-row> -->
<div class="table-data">
<table border="1">
<tr>
<td>序号</td>
......@@ -120,9 +85,9 @@
<td>{{item.qlr}}</td>
<td>{{item.zl}}</td>
</tr>
</table>
</div>
</div>
<div class="page">
<el-pagination
background
......@@ -145,7 +110,7 @@
name: "queryData",
data() {
return {
total:1,
total: 1,
queryData: {
bdcdyh: "",
bdcqzh: "",
......@@ -175,9 +140,9 @@
return ['zd']
}
},
isZdClose:{
type:Boolean,
default:false
isZdClose: {
type: Boolean,
default: false
}
},
mounted() {
......@@ -190,7 +155,7 @@
this.queryData.pageNo = val;
this.getData(this.queryData);
},
reset(){
reset() {
this.queryData = {
bdcdyh: "",
bdcqzh: "",
......@@ -204,23 +169,23 @@
};
this.getData(this.queryData)
},
getData(data){
getData(data) {
data['dylxs'] = this.dylxs;
getSearchList(data).then(res => {
this.Data = res.result.records
this.total = res.result.total;
})
},
search(){
search() {
this.getData(this.queryData)
},
addData(val){
addData(val) {
this.$emit("getData", val)
if (this.isZdClose) {
this.close();
}
},
close(){
close() {
this.$emit('close')
this.reset();
}
......@@ -241,7 +206,8 @@
height: auto;
width: 80%;
}
/deep/ .el-form-item__label{
/deep/ .el-form-item__label {
width: 96px;
text-align: right;
}
......@@ -251,7 +217,7 @@
background-color: #fff;
font-size: 14px;
width: 100%;
tr:hover{
tr:hover {
background-color: #F5F7FA;
}
}
......@@ -281,7 +247,10 @@
.noData {
color: #b2b2b2;
}
.page{
.table-data{
height: 450px;
}
.page {
margin-top: 20px;
}
......
<template>
<div>
<el-dialog
title="属性导入"
:visible.sync="isVisible"
width="30%"
:before-close="close">
<div class="main-button">
<el-upload
class="upload-demo"
:action="uploadUrl"
:data="sxdrData"
:on-success="uploadSuccess"
:show-file-list="false"
multiple
>
<el-button type="primary">上传</el-button>
<el-button type="primary" @click="downloadTemplate">下载模板</el-button>
</el-upload>
</div>
<ul>
<li v-for="(item,index) in errorData" :key="index">{{item}}</li>
</ul>
<span slot="footer" class="dialog-footer">
<el-button @click="dialogVisible = false">取 消</el-button>
<el-button type="primary" @click="dialogVisible = false">确 定</el-button>
</span>
</el-dialog>
</div>
</template>
<script>
export default {
name: "sxdr",
props: {
sxdrVisible: {
type: Boolean,
default: false
},
dylx: {
type: String,
},
bsm: {
type: String
}
},
data() {
return {
uploadUrl: '',
isVisible: false,
sxdrData: {
bsm: ''
},
errorData: []
}
},
mounted() {
this.$store.state.sxdrType = '';
},
methods: {
loading() {
this.$store.state.sxdrType = this.dylx;
},
reset() {
this.errorData = [];
this.uploadUrl = '';
this.sxdrData = {bsm: ''};
},
close() {
this.$emit('close')
this.reset();
},
downloadTemplate() {
window.open(`/api/tx/excelGeo/zdTemplate?type=` + this.dylx);
},
uploadSuccess(res, file, fileList) {
this.errorData = [];
if (res.success) {
this.$message.success("上传成功")
debugger
this.loading();
this.close()
} else {
if (res.result == null) {
this.$message.error(res.message)
} else {
this.$message.error("上传失败")
this.errorData = res.result;
}
}
}
},
watch: {
sxdrVisible(val) {
this.isVisible = val;
},
dylx(val) {
switch (val) {
case "zd":
this.uploadUrl = "/api/tx/excelGeo/Zdimport";
break;
default:
break;
}
},
bsm(val) {
this.sxdrData.bsm = val;
}
}
}
</script>
<style scoped lang="less">
.main-button {
display: -webkit-flex;
display: flex;
flex-direction: column-reverse;
flex-wrap: nowrap;
}
ul {
margin-top: 20px;
li {
line-height: 20px;
color: red;
}
}
</style>
......@@ -6,7 +6,7 @@
width="70%"
@close="close"
:modal-append-to-body="false"
center>
>
<div class="search">
<el-row>
<el-col :span="24">
......@@ -53,6 +53,7 @@
</el-form>
</el-col>
</el-row>
<div class="table-bode">
<table border="1">
<tr>
<td>序号</td>
......@@ -81,9 +82,9 @@
<td>{{item.qlr}}</td>
<td>{{item.zl}}</td>
</tr>
</table>
</div>
</div>
<div class="page">
<el-pagination
background
......@@ -106,13 +107,11 @@
name: "zdQueryData",
data() {
return {
total:1,
total: 1,
queryData: {
bdcdyh: "",
bdcqzh: "",
dylxs: ['zd'],
qlrmc: "",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......@@ -130,15 +129,9 @@
return false
}
},
qszt:{
type:Array,
default:function () {
return ['2']
}
},
isZdClose:{
type:Boolean,
default:false
isZdClose: {
type: Boolean,
default: false
}
},
mounted() {
......@@ -156,7 +149,6 @@
bdcdyh: "",
bdcqzh: "",
qlrmc: "",
qszt: ["2"],
xmmc: "",
zddm: "",
zl: "",
......@@ -166,7 +158,6 @@
this.getData(this.queryData)
},
getData: function (data) {
data['dylxs'] = this.dylxs;
zdlist(data).then(res => {
this.Data = res.result.records
this.total = res.result.total;
......@@ -202,18 +193,18 @@
height: auto;
width: 80%;
}
/deep/ .el-form-item__label{
/deep/ .el-form-item__label {
width: 96px;
text-align: right;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
tr:hover{
tr:hover {
background-color: #F5F7FA;
}
}
......@@ -243,7 +234,10 @@
.noData {
color: #b2b2b2;
}
.page{
.table-bode{
height: 450px;
}
.page {
margin-top: 20px;
}
......
......@@ -15,6 +15,7 @@ const store = new Vuex.Store({
zdmj: '', // 宗地面积
zdzl: '', // 宗地坐落
rightClickZdbsm:'', //右键菜单传入的zdbsm
sxdrType:'', // zd/zrz/dz/h 导入属性刷新数据
tdytList:[],
tddjList:[],
qlxzList:[],
......
......@@ -496,6 +496,19 @@
this.form.dzbsm=this.$route.query.bsm;
this.getDzDetailByBsm(this.$route.query.bsm)
}
},
watch:{
"$store.state.sxdrType": {
handler(n) {
this.$nextTick(()=>{
if (n === 'dz') {
this.getDzDetailByBsm(this.$route.query.bsm)
}
})
},
immediate: false,
deep: true,
}
}
}
</script>
......
......@@ -293,9 +293,10 @@
</tr>
</table>
</div>
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
:isZdClose="true"
@close="close"></query-data>
<dz-query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
:isClose="true"
@close="close">
</dz-query-data>
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
......@@ -310,7 +311,7 @@
<ul>
<li><span>宗地代码:</span>{{hFgqData.zddm}}</li>
<li><span>不动产单元号:</span>{{hFgqData.bdcdyh}}</li>
<li><span>项目名称:</span>{{hFgqData.xmmc}}</li>s's's's's's's's's's's's's's's's's's's
<li><span>项目名称:</span>{{hFgqData.xmmc}}</li>
<li><span>不动产权证号:</span>{{hFgqData.bdcqzh}}</li>
<li><span>权利人:</span>{{hFgqData.qlr}}</li>
<li><span>坐落:</span>{{hFgqData.zl}}</li>
......@@ -331,7 +332,7 @@
</div>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="(index+1)%2==0?'':'oddborder'">{{item.xmmc}}
:class="(index+1)%2===0?'':'oddborder'">{{item.xmmc}}
</li>
</ul>
</div>
......@@ -455,11 +456,12 @@
import {getHZdxx} from './../../../../api/h'
import QueryData from './../../../../components/queryData/queryData'
import zdQueryData from './../../../../components/zdQueryData/zdQueryData'
import dzQueryData from './../../../../components/dzQueryData/dzQueryData'
import {Message} from 'element-ui'
export default {
name: "",
components: {QueryData, zdQueryData},
components: {QueryData, zdQueryData,dzQueryData},
props: {},
data() {
return {
......@@ -557,7 +559,7 @@
this.dzFghData.fwlist[index].zrzlist.splice(chilInd,1);
this.tempBsmList = this.tempBsmList.filter(i => i!== bsm);
this.dzFgqZrzData.forEach(i=>{
if (i.bsm == bsm) {
if (i.bsm === bsm) {
i.hasChoosed = ""
}
})
......@@ -667,7 +669,7 @@
if(this.dzFgZrzList[childIndex].hasChoosed === '' || this.dzFgZrzList[childIndex].hasChoosed === index){
// this.zdZrzList[childIndex].hasChoosed = index;
if(fwlist.zrzlist.indexOf(bsm) < 0){
if(fwlist.ztype == 'zrz' && fwlist.zrzlist.length>0){
if(fwlist.ztype === 'zrz' && fwlist.zrzlist.length>0){
Message.warning("当前幢类型只能选择一个自然幢")
}else{
//存入当前选择幢信息的bsm
......@@ -744,7 +746,7 @@
}
},
saveZd() {
if(this.tempBsmList.length == (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
if(this.tempBsmList.length === (this.zdZxx.dzList.length + this.zdZxx.zrzList.length)){
zdfg(this.zdFghData).then(res => {
if (res.success) {
this.$store.state.zdbsms = res.result;
......@@ -973,9 +975,9 @@
},
dzFgqData: {
handler: function (item) {
this.dzFgqData.oldZdbsm = item.glbsm;
this.getDzZdjbxx(item.glbsm);
this.dzfgGetZrzxx(item.glbsm)
this.dzFgqData.oldZdbsm = item.bsm;
this.getDzZdjbxx(item.bsm);
this.dzfgGetZrzxx(item.bsm)
},
deep: true
},
......
......@@ -55,7 +55,7 @@
title="批量修改"
:visible.sync="centerDialogVisible"
width="30%"
center>
>
<div class="plxg">
<div>
<span class="batchlx"> 界标类型:</span>
......
......@@ -67,7 +67,7 @@
title="批量修改"
:visible.sync="centerDialogVisible"
width="30%"
center>
>
<div class="plxg">
<div class="batchlx">
<span class=""> 界址线类型:</span>
......
......@@ -113,16 +113,9 @@ export default {
},
//重置数据
reset() {
this.tableData = [
{
cz: "+",
ljzbsm: "",
zdybsm: "",
qsc: "",
jsc: "",
hs: "",
},
];
this.tableData[0].qsc = "";
this.tableData[0].jsc = "";
this.tableData[0].hs = "";
},
},
computed: {},
......
......@@ -310,7 +310,7 @@
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule" :hasSyqx='false'></Qlxz>
<Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
</td>
</tr>
<tr></tr>
......@@ -843,6 +843,17 @@
this.form.scyclx = this.scyclx;
})
}
},
"$store.state.sxdrType": {
handler(n) {
this.$nextTick(()=>{
if (n === 'h') {
this.getHInfo(this.$store.state.hbsm)
}
})
},
immediate: false,
deep: true,
}
}
}
......
......@@ -97,7 +97,7 @@
</div>
<!-- 楼盘表主体 -->
<div class="lp-overview" :style="{ width: lpbContentwidth + 'px' }">
<lpbContent ref="lpbContent" :key="time"></lpbContent>
<lpbContent ref="lpbContent" :zrzbsm="$route.query.bsm" :key="time"></lpbContent>
</div>
<!-- 右侧图例 -->
<div class="lp-legend">
......@@ -220,7 +220,7 @@
</div>
<!-- 右键菜单弹出框 -->
<el-dialog title="添加" :visible.sync="dialogVisible" width="50%" center>
<el-dialog title="添加" :visible.sync="dialogVisible" width="50%" >
<!-- 根据菜单类型（menuType）和右键点击的楼盘类型（treeData.type）来区分弹框内容 -->
<div class="addCh" v-show="menuType == 'ljz'">
<addLjz ref="ljz"></addLjz>
......@@ -255,7 +255,7 @@
@close="hcxlzClose"
></h-cxlz>
<!-- 双击户的弹出框 -->
<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" center>
<el-dialog title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="70%" >
<hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
</el-dialog>
</div>
......@@ -507,6 +507,9 @@ export default {
openLpbDialog(data, type) {
this.treeData = data;
this.menuType = type;
this.$nextTick(()=>{
this.resetInfo();
});
this.dialogVisible = true;
},
//弹框中的保存按钮，根据不同菜单点击类型调用不同子组件的保存方法
......@@ -632,7 +635,7 @@ export default {
if (res.code === 200) {
this.$message.success("生成完成！");
} else {
this.$message.warning("生成失败！");
this.$message.warning(res.message);
}
}
);
......
......@@ -29,16 +29,9 @@
<td colspan="4">
<el-input v-model="form.ljzmc"></el-input>
</td>
<td colspan="2" align="center">不动产单元号</td>
<td colspan="4" class="psr">
<el-input v-model="form.bdcdyh" maxlength="28" class="percent80"></el-input>
<el-button
@click.prevent=""
size="mini"
type="warning"
class="createBtn"
>生成</el-button
>
<td colspan="2" align="center">建筑物状态</td>
<td colspan="4">
<el-input v-model="form.jzwzt"></el-input>
</td>
</tr>
......@@ -177,13 +170,9 @@
<tr height="30">
<td colspan="2" align="center">总层数</td>
<td colspan="4">
<td colspan="10">
<el-input v-model="form.zcs"></el-input>
</td>
<td colspan="2" align="center">建筑物状态</td>
<td colspan="4">
<el-input v-model="form.jzwzt"></el-input>
</td>
</tr>
<tr height="30">
......
......@@ -62,7 +62,7 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm)"
@click="handleTdClick($event, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
......@@ -117,7 +117,7 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm)"
@click="handleTdClick($event, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
......@@ -133,7 +133,9 @@
<!-- 逻辑幢名称 -->
<div class="ljz-name name">
<p>
{{ ljzs.ljzmc }}
</p>
</div>
</div>
</div>
......@@ -177,7 +179,7 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm)"
@click="handleTdClick($event, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
......@@ -222,7 +224,7 @@
ref="hBsm"
:key="hsIndex"
:class="searchNum == hs.shbw || searchNum == hs.bdcdyh ? 'tdSelect' : ''"
@click="handleTdClick($event, hs.bsm)"
@click="handleTdClick($event, hs.bsm,hs)"
@dblclick="dbclick(hs.bsm)"
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
......@@ -257,13 +259,16 @@
向下添加层
</li>
<li v-show="rightClickFlag == 'c'" @click="handleDeleteC">删除层</li>
<!-- 合并 -->
<li v-show="rightClickFlag == 'hb'" :class="canHb!='zyhb'? 'cantHb':''" @click="handleHb('zyhb')">左右合并</li>
<li v-show="rightClickFlag == 'hb'" :class="canHb!='sxhb'? 'cantHb':''" @click="handleHb('sxhb')">上下合并</li>
</ul>
<!-- 层操作弹框 -->
<el-dialog
:title="addCData.title"
:visible.sync="addCVisible"
width="50%"
center
>
<el-form :model="addCData">
<el-form-item label="层号" :label-width="formLabelWidth">
......@@ -300,11 +305,22 @@
</template>
<script>
import moveH from "./../../../../../components/moveH/moveH";
import { getLpb, insertUpDownC, deleteCByBsm } from "../../../../../api/lpb";
import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
import { hhb } from "@api/h";
import { Message } from 'element-ui';
export default {
name: "",
components: { moveH },
props: {},
props: {
isHbfg:{
type:Boolean,
default:false
},
zrzbsm:{
type:String,
default:''
}
},
data() {
return {
moveHvisible: false,
......@@ -345,13 +361,15 @@ export default {
},
formLabelWidth: "120px",
yclpbData:{},
sclpbData:{}
sclpbData:{},
fghbChoosedList:[],
canHb:''//判断合并类型
};
},
created() {},
mounted() {
this.getLpb(this.$store.state.zrzbsm, "0");
this.getLpb(this.$store.state.zrzbsm, "1");
this.getLpb(this.zrzbsm, "0");
this.getLpb(this.zrzbsm, "1");
setTimeout(() => {
//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
......@@ -490,7 +508,7 @@ export default {
}
},
//户单击事件
handleTdClick(e, bsm) {
handleTdClick(e, bsm,hs) {
let self = this;
// 开启延时器，200ms的间隔区分单击和双击，解决双击时执行两次单击事件
clearTimeout(self.time);
......@@ -499,20 +517,38 @@ export default {
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
e.target.className = "tdSelect"; //加边框
if(this.isHbfg){
this.fghbChoosedList.push(hs);
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
}else{
this.hbsmList.push(bsm); // 将户bsm放进hbsmList
}
} else {
//选中→未选中
e.target.className = "";
if(this.isHbfg){
this.deleteArrOption(this.fghbChoosedList, hs)
this.deleteArrOption(this.hbsmList, bsm);
}else{
this.deleteArrOption(this.hbsmList, bsm);
}
}
if(this.isHbfg){
}else{
this.$parent.getHbsm(this.hbsmList, false);
}
}, 200);
},
//户双击事件
dbclick(bsm) {
clearTimeout(this.time);
if (this.isHbfg) {
}else{
// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
this.$parent.getHbsm(bsm, true);
}
},
//删除多重数组中的某一项
deleteArrOption(arr, item) {
......@@ -537,15 +573,41 @@ export default {
},
//户右键点击事件
openMenu(e, item, type) {
console.log(e, "e");
this.lpbChLeft = e.pageX;
this.lpbChTop = e.pageY;
if (this.isHbfg) {
this.rightClickFlag = 'hb';
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{
console.log(e, "e");
this.chData = item;
this.rightClickFlag = type;
this.lpbChVisible = true;
}
},
// 层选中事件
handleClickC(e, item) {
if (this.isHbfg) {
}else{
//判断点击的层是否选中
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
......@@ -557,6 +619,7 @@ export default {
this.deleteArrOption(this.cbsmList, item.bsm);
}
this.$parent.getCbsm(this.cbsmList);
}
},
//关闭右键菜单
closeMenu() {
......@@ -639,6 +702,46 @@ export default {
qsztClick(){
},
//户合并
handleHb(type){
let olbBsms = '';
this.hbsmList.forEach((item,index)=>{
olbBsms+= index<this.hbsmList.length-1? item+',':item
})
if (type == this.canHb) {
this.$confirm("是否确认合并选中户?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
//确定合并 调用合并接口 this.hbsmList为选中户bsm数组 TO DO
let params = {
"newuserbsm": "",
"oldBsms": olbBsms,
"scyclx": this.$parent.scyclx,
"ljzbsm": this.fghbChoosedList[0].ljzbsm,
"zdybsm": this.fghbChoosedList[0].zdybsm,
"zrzbsm": this.fghbChoosedList[0].zrzbsm
}
// console.log(params,'params');
hhb(params).then((res) => {
if(res.code == 200){
Message.success('合并成功');
// 清除选中户
this.clearChoosedH();
this.fghbChoosedList = [];
// 更新楼盘表
this.getLpb(this.zrzbsm, this.$parent.scyclx);
}
})
.catch(() => {});
})
.catch(() => {});
}else{
}
}
},
computed: {
createFlagChange() {
......@@ -688,12 +791,8 @@ export default {
//父组件中选择单元状态改变选中户的边框颜色
choosedList(n) {
this.$refs.hBsm.forEach((item) => {
// console.log(item.dataset.bsm,'item.dataset.bsm');
// console.log(this.choosedList,'this.choosedList');
this.choosedList.forEach((i) => {
if (item.dataset.bsm == i) {
// console.log(item.style.border,'item.style.border');
// console.log(this.borderColor,'this.borderColor');
item.style.border = '1px solid '+this.borderColor;
}
});
......@@ -742,7 +841,8 @@ export default {
bottom: 0;
position: absolute;
height: 40px;
background-color: rosybrown;
// background-color: rosybrown;
border:1px solid #E6E6E6
}
// .chTable-wrap{
// position: absolute;
......@@ -766,7 +866,12 @@ export default {
.ljz-name {
width: calc(100% - 32px);
height: 40px;
background-color: darkorange;
// background-color: darkorange;
p{
width: 100%;
height: 100%;
border:1px solid #E6E6E6
}
}
}
div:last-child {
......@@ -792,7 +897,8 @@ export default {
display: inline-table;
.zdy-name {
bottom: 0;
background-color: blanchedalmond;
// background-color: blanchedalmond;
border:1px solid #E6E6E6
}
}
.zdy-zdy:last-child {
......@@ -802,7 +908,8 @@ export default {
.zdy-name {
width: calc;
height: 40px;
background-color: rosybrown;
// background-color: rosybrown;
border:1px solid #E6E6E6
}
}
.column-reverse {
......@@ -877,13 +984,17 @@ export default {
.zrz {
height: 60px;
line-height: 60px;
background-color: darkgoldenrod;
background-color: #ffffff;
border:1px solid #E6E6E6;
position: relative;
bottom: 66px;
text-align: center;
transition: 0.5s;
}
.cantHb{
opacity: .5;
cursor: not-allowed;
}
.btnGroup {
margin: 20px auto 0;
width: 150px;
......
<template>
<div class="">
<el-radio-group v-model="scyclx" @change="scyclxChange">
<el-radio-button label="0">预测</el-radio-button>
<el-radio-button label="1">实测</el-radio-button>
</el-radio-group>
<el-table
:data="tableData"
style="width: 100%;margin-bottom: 20px;"
row-key="bsm"
border
default-expand-all
:default-expand-all="false"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
<el-table-column
prop="mc"
......@@ -35,23 +39,23 @@
</el-table-column>
<el-table-column
prop="jzmj"
label="面积">
label="建筑面积(㎡)">
</el-table-column>
<el-table-column
prop="tnjzmj"
label="套内建筑面积">
label="套内建筑面积(㎡)">
</el-table-column>
<el-table-column
prop="ftjzmj"
label="分摊建筑面积">
label="分摊建筑面积(㎡)">
</el-table-column>
<el-table-column
prop="dxbfjzmj"
label="地下部分建筑面积">
label="地下部分建筑面积(㎡)">
</el-table-column>
<el-table-column
prop="qtjzmj"
label="其它建筑面积">
label="其它建筑面积(㎡)">
</el-table-column>
</el-table>
</div>
......@@ -65,7 +69,10 @@ export default {
props:{},
data(){
return {
tableData: []
tableData: [],
scData:[],
ycData:[],
scyclx:'0',
}
},
created(){},
......@@ -74,6 +81,14 @@ export default {
},
methods:{
scyclxChange(){
if(this.scyclx === '0'){
this.tableData = this.ycData;
}else {
this.tableData = this.scData;
}
},
chFilter(row, column){
if(row.ch === 0){
return ''
......@@ -91,12 +106,19 @@ export default {
},
getData(){
let zrzbsm = '12a4eb0cf2b527273ff5f0b96820715a';
let scyclx = '0';
getDetailInfo(zrzbsm,scyclx).then((res)=>{
let zrzbsm = this.$store.state.zrzbsm;
// let scyclx = this.scyclx;
getDetailInfo(zrzbsm,'0').then((res)=>{
if(res.code===200){
console.log(res.result)
this.ycData = res.result;
this.tableData=this.ycData;
}
});
getDetailInfo(zrzbsm,'1').then((res)=>{
if(res.code===200){
console.log(res.result)
this.tableData = res.result;
this.scData = res.result;
}
})
},
......
......@@ -774,6 +774,17 @@
},
deep:true
},
"$store.state.sxdrType": {
handler(n) {
this.$nextTick(()=>{
if (n === 'zrz') {
this.getZrzDetailByBsm(this.$route.query.bsm)
}
})
},
immediate: false,
deep: true,
}
}
}
</script>
......