Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
f098346b by weimo934
Options

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

2 parents 0317fdb6 9a4588de
Expand all
Inline Side-by-side
Showing 17 changed files with 111 additions and 67 deletions
......@@ -116,7 +116,7 @@ ol, ul { list-style:none; }
>.el-tabs__item{
border: 1px solid #DEDEDE;
height: 30px;
line-height: 30px;
line-height: 28px;
padding: 0 20px;
margin: 9px 10px 9px 0;
}
......@@ -128,6 +128,9 @@ ol, ul { list-style:none; }
}
}
}
.el-tabs__item{
font-size: 16px;
}
//弹框遮罩层样式
.v-modal{
opacity: .2;
......
......@@ -720,6 +720,8 @@ export default {
// height: 100%;
border-right: 1px solid #E6E6E6;
position: relative;
text-align: right;
padding-right: 10px;
.qlxz {
line-height: 34px;
}
......
......@@ -373,6 +373,8 @@ export default {
// height: 100%;
border-right: 1px solid #E6E6E6;
position: relative;
text-align: right;
padding-right: 10px;
.qlxz {
line-height: 34px;
}
......
......@@ -24,8 +24,8 @@
v-if="item.children"
class="reTree_icon"
:style="{
height: (size || 14 * 1.2) + 'px',
width: (size || 14 * 1.2) + 'px',
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
}"
:class="{
reTree_default_icon: item.children.length === 0,
......@@ -37,8 +37,8 @@
v-if="item.children==null"
class="reTree_icon reTree_expand_icon"
:style="{
height: (size || 14 * 1.2) + 'px',
width: (size || 14 * 1.2) + 'px',
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
}"
></div>
<div
......@@ -46,7 +46,7 @@
@contextmenu.prevent="openMenu($event, item,list)"
:class="{
active_color: item.expand,
curPage:$route.query.bsm==item.bsm
curPage:$route.query.bsm && $route.query.bsm==item.bsm
}"
>
<img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/>
......@@ -83,7 +83,7 @@ export default {
},
size: {
type: Number,
default: 14,
default: 16,
},
visible: {
type: Boolean,
......@@ -174,7 +174,7 @@ export default {
}
},
// 左键双击事件
dbclick(item) {
dbclick(item,) {
clearTimeout(this.time);
//此处不要将$router移到if的外面，因为可能是双击行政区，就不知道去哪儿了
if (item.type == 'zd') {
......@@ -342,8 +342,8 @@ export default {
content: "";
position: absolute;
/* 为了触顶 */
top: -14px;
height: calc(100% + 14px);
top: -16px;
height: calc(100% + 16px);
width: 1px;
left: 7px;
opacity: .5;
......@@ -355,7 +355,7 @@ export default {
content: "";
position: absolute;
height: 23px;
top: -14px;
top: -16px;
width: 1px;
left: 7px;
opacity: .5;
......@@ -401,7 +401,7 @@ export default {
background-size: contain;
}
.qsztImg{
width: 14px;
width: 16px;
position: relative;
top: 1px;
}
......
<template>
<div
class="content column-start-center reTree_box"
:style="{ fontSize: (size || 14) + 'px', lineHeight: (size || 14) + 'px', width: (islpb ? '200':'374') + 'px' }"
:style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'374') + 'px' }"
>
<div
class="column-start-center basic_layer"
......@@ -19,8 +19,8 @@
<div
class="reTree_icon"
:style="{
height: (size || 14 * 1.2) + 'px',
width: (size || 14 * 1.2) + 'px',
height: (size || 16 * 1.2) + 'px',
width: (size || 16 * 1.2) + 'px',
}"
:class="{
reTree_default_icon: item.children.length === 0,
......@@ -129,7 +129,7 @@ export default {
pd: {},
size: {
type: Number,
default: 14,
default: 16,
},
islpb:{
type: Boolean,
......@@ -730,8 +730,8 @@ export default {
content: "";
position: absolute;
/* 为了触顶 */
top: -14px;
height: calc(100% + 14px);
top: -16px;
height: calc(100% + 16px);
width: 1px;
left: 9px;
background: #c3c5c8;
......@@ -741,7 +741,7 @@ export default {
content: "";
position: absolute;
height: 23px;
top: -14px;
top: -16px;
width: 1px;
left: 9px;
background: #c3c5c8;
......
......@@ -287,7 +287,7 @@ export default {
}
},
cadFileSuccess(response, file, fileList){
debugger
},
excelFileSuccess(response, file, fileList){
var self = this;
......
......@@ -248,6 +248,8 @@ export default {
this.getRightTreeByZrzbsm(this.$store.state.zrzbsm)
}else if(this.$route.path == '/zd'){
this.getRightTree(this.$store.state.zdbsm)
}else if(this.$route.path == '/dz'){
this.getRightTreeByDzbsm(this.$store.state.dzbsm)
}else{
this.getTreeList();
}
......@@ -468,7 +470,7 @@ export default {
cursor: pointer;
height: 60px;
padding: 0 30px;
font-size: 16px;
font-size: 18px;
line-height: 60px;
float: left;
position: relative;
......
......@@ -37,16 +37,9 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >房屋类型</td>
<td colspan="2" align="center" >共有土地面积（㎡）</td>
<td colspan="4" >
<el-select class="formSelect" v-model="form.fwlxbsm" placeholder="请选择" >
<el-option
v-for="item in $store.state.fwlxList"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
</el-option>
</el-select>
<input class="formInput" v-model="form.zdmj">
</td>
<td colspan="2" align="center" >竣工日期</td>
<td colspan="4" >
......@@ -59,6 +52,10 @@
</tr>
<tr height="30">
<td colspan="2" align="center" >分摊土地面积（㎡）</td>
<td colspan="4" >
<input class="formInput" v-model="form.fttdsymj">
</td>
<td colspan="2" align="center" >产别</td>
<td colspan="4" >
<el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" >
......@@ -70,6 +67,13 @@
</el-option>
</el-select>
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
<td colspan="4" >
<input class="formInput" v-model="form.dlsytdmj">
</td>
<td colspan="2" align="center" >产权来源</td>
<td colspan="4" >
<el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" >
......@@ -96,6 +100,7 @@
<td colspan="3" align="center" >
<el-select-tree style="width:100%"
v-if="show"
@change="updateSjfyyt(item1)"
:default-expand-all="defaultExpandAll"
:multiple="multiple"
:placeholder="placeholder"
......@@ -124,21 +129,6 @@
</td>
</tr>
<tr height="30">
<td colspan="2" align="center" >共有土地面积（㎡）</td>
<td colspan="2" >
<input class="formInput" v-model="form.zdmj">
</td>
<td colspan="2" align="center" >分摊土地面积（㎡）</td>
<td colspan="2" >
<input class="formInput" v-model="form.fttdsymj">
</td>
<td colspan="2" align="center" >多幢独用土地面积（㎡）</td>
<td colspan="2" >
<input class="formInput" v-model="form.dlsytdmj">
</td>
</tr>
<tr>
<td colspan="12" align="center">
<Qlxz ref="qlxzModule" :hasSyqx='false' :formData="form"></Qlxz>
......@@ -450,6 +440,11 @@
}
})
},
updateSjfyyt(data){
data.fwsjytbsm = data.fwytzdbsm;
},
open() {
this.$confirm('已经存在不动产单元号或者自然幢号, 是否继续?', '提示', {
confirmButtonText: '确定',
......@@ -497,7 +492,17 @@
this.getDzDetailByBsm(this.$route.query.bsm)
}
},
computed: {
dzbsm() {
return this.$route.query.bsm;
},
},
watch:{
dzbsm:function (val) {
this.getDzDetailByBsm(val)
},
"$store.state.sxdrType": {
handler(n) {
this.$nextTick(()=>{
......
......@@ -64,8 +64,8 @@
<!-- <th class="xzzxx">幢信息</th> -->
<!-- <th class="">选择</th> -->
</tr>
<template v-for="(item,index) in zdFghData.newZdlist">
<tr :key="item.xzqbsm">
<template v-for="(item,index) in zdFghData.newZdlist" >
<tr :key="index">
<td class="cz" rowspan="2">
<el-button
type="primary"
......@@ -129,7 +129,7 @@
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
</tr>
<tr :key="index">
<tr :key="index+100">
<td colspan="6">
<div class="fghzxx">
<div class="choosedZxx">
......@@ -699,11 +699,6 @@
changeXzq(id, index) {
this.djq = [];
this.djzq = [];
if (index !== undefined) {
switch (this.tabName) {
case "zd":
this.zdFghData.newZdlist[index].djqbsm = '';
this.zdFghData.newZdlist[index].djzqbsm = '';
getListByXzqbsm(id)
.then((res) => {
if (res.result == null) {
......@@ -714,6 +709,11 @@
})
.catch((error) => {
});
if (index !== undefined) {
switch (this.tabName) {
case "zd":
this.zdFghData.newZdlist[index].djqbsm = '';
this.zdFghData.newZdlist[index].djzqbsm = '';
break;
case "dz":
//to do
......@@ -900,7 +900,7 @@
> .el-tabs__item {
border: 1px solid #DEDEDE;
height: 36px;
line-height: 36px;
line-height: 32px;
padding: 0 20px;
margin: 9px 10px 9px 0;
background-color: #ffffff;
......
......@@ -497,7 +497,7 @@
> .el-tabs__item {
border: 1px solid #DEDEDE;
height: 36px;
line-height: 36px;
line-height: 32px;
padding: 0 20px;
margin: 9px 10px 9px 0;
background-color: #ffffff;
......
......@@ -318,7 +318,7 @@ export default {
xmmc:'测试自然幢',
bdcqzh:'A12111111111111111',
dylx:'zrz',
zrzbsm:'b7162d97848b0d31d301f8d4a5b4596b'
zrzbsm:'1a94f3ab0f95ecc7137c5c3e51c15ac6'
}
]
},
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="分割" name="fg"><fg></fg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb v-if="hbLoad"></hb></el-tab-pane>
<el-tab-pane label="分割" name="fg"><fg ref="fg" v-if="fgLoad"></fg></el-tab-pane>
<el-tab-pane label="合并" name="hb"><hb ref="hb" v-if="hbLoad"></hb></el-tab-pane>
<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg v-if="fwsxbgLoad"></fwsxbg></el-tab-pane>
<el-tab-pane label="重新落宗" name="cxlz"><cxlz v-if="cxlzLoad"></cxlz></el-tab-pane>
</el-tabs>
......@@ -23,6 +23,7 @@ export default {
data() {
return {
activeName: "fg",
fgLoad:true,
hbLoad:false, //默认不加载合并tab
fwsxbgLoad:false, //默认不加载范围属性变更tab
cxlzLoad:false, //默认不加载重新落宗tab
......@@ -30,10 +31,19 @@ export default {
},
methods: {
handleClick(tab, event) {
console.log(tab.name);
// this.$refs.fg.$refs.isSearch = true;
if (tab.name != 'fg') {
this.fgLoad = false;
}
if (tab.name != 'hb') {
this.hbLoad = false;
}
if(!this.hbLoad){
this.hbLoad = tab.name == 'hb' ? true : false
}
if(!this.fgLoad){
this.fgLoad = tab.name == 'fg' ? true : false
}
if(!this.fwsxbgLoad){
this.fwsxbgLoad = tab.name == 'fwsxbg' ? true : false
}
......
......@@ -189,7 +189,7 @@ export default {
getLshsData(){
let _this = this;
const data = {
"bsm": "d85a274a332ad2d35c922a3a95eb154f",
"bsm": this.$store.state.zdbsm,
"type": "zd"
};
getLshs(data).then((res)=>{
......
......@@ -238,6 +238,7 @@
<el-select-tree
v-if="show"
:default-expand-all="defaultExpandAll"
@change="updateSjfyyt(item1)"
:multiple="multiple"
:placeholder="placeholder"
:disabled="disableFlag"
......@@ -546,6 +547,11 @@
}
})
},
updateSjfyyt(data){
data.fwsjytbsm = data.fwytzdbsm;
},
addYtInfo(){
this.form.fwytList.push({
glbsm:'',
......
......@@ -84,6 +84,7 @@
<!-- 循环逻辑幢下的层户 -->
<div
class="ljz-ch"
ref="ljzDlch"
:style="{ height: 'auto' }"
v-if="ljzs.cs.length > 0"
>
......@@ -196,6 +197,7 @@
<!-- <template > -->
<div
class="zdy column-reverse"
ref="zrzDlch"
:style="{ 'min-height': cHeight + 'px' }"
>
<table
......@@ -307,7 +309,7 @@
<el-form :model="fgData">
<el-form-item label="分割户数" required="" :label-width="formLabelWidth">
<el-input
:disabled="fgData.fghs!=''"
:disabled="fgData.fgfx!=0"
v-model="fgData.fghs"
autocomplete="off"
></el-input>
......@@ -472,6 +474,11 @@ export default {
this.ljzWidth += item.offsetWidth + 20;
});
} else {
if (this.$refs.ljzDlch != undefined) {
this.$refs.ljzDlch.forEach((item) => {
this.ljzWidth += item.offsetWidth + 20;
});
}
}
//计算独立幢单元和独立层户宽度
//考虑this.$refs.zdy的length为0的情况，即自然幢下没有独立幢单元
......@@ -500,10 +507,8 @@ export default {
}
} else {
//有且仅有独立层户
if (this.$refs.hBsm != undefined) {
this.$refs.hBsm.forEach((item) => {
this.zdyWidth += item.offsetWidth + 21;
});
if (this.$refs.zrzDlch != undefined) {
this.zdyWidth = this.$refs.zrzDlch.offsetWidth+20;
}
}
......@@ -538,7 +543,7 @@ export default {
});
}
} else {
// this.zdyWidth = 124;
}
},
//户单击事件
......@@ -634,10 +639,18 @@ export default {
//分割
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.sjhs == 1 ? '' : item.sjhs;
this.fgData.fghs = item.sjcs;
}
}
}else{
console.log(e, "e");
......@@ -795,6 +808,7 @@ export default {
if(res.code == 200){
Message.success('分割成功');
// 清除选中户
this.hfgDialogVisible = false
this.clearChoosedH();
this.fghbChoosedList = [];
// 更新楼盘表
......