Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
aa65ab64 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 06b33ed5 e9466810
Inline Side-by-side
Showing 4 changed files with 94 additions and 59 deletions
......@@ -170,16 +170,13 @@
this.getData(this.queryData)
},
addData: function (val) {
let flag;
this.$emit("getData",
val
, i => {
flag = i
})
console.log(flag,"返回值")
if (flag&&this.isZdClose) {
this.close();
}
this.$emit("getData",val)
// if (this.isZdClose) {
// this.close();
// }
},
isClose(flag){
},
close: function () {
this.$emit('close')
......
......@@ -453,6 +453,7 @@
},
addZdData(data) {
this.zdhbqData.push(data);
this.centerDialogVisible = false;
ZdfggetZxx(data.zdbsm).then(res => {
if (res.success) {
res.result.zrzList.forEach(item => {
......@@ -474,35 +475,30 @@
}
})
},
async getData(data, callback) {
getData(data) {
console.log(data, '选择宗地数据')
let flat = true;
switch (this.tabName) {
case "zd":
let arr = [];
arr = this.zdhbqData.filter(i => i.zdbsm === data.zdbsm);
let arr = this.zdhbqData.filter(i => i.zdbsm === data.zdbsm);
if (arr.length > 0) {
this.$message.info("当前宗地已选择,请重新选择")
callback(false)
break
}
arr = this.zdhbqData.filter(i => i.xzqbsm !== data.xzqbsm || i.djqbsm !== data.djqbsm || i.djzqbsm !== data.djzqbsm);
if (arr.length > 0) {
this.$confirm('当前宗地不在同一地籍子区下,请确认？')
let arr1 = this.zdhbqData.filter(i => i.xzqbsm !== data.xzqbsm || i.djqbsm !== data.djqbsm || i.djzqbsm !== data.djzqbsm);
if (arr1.length > 0) {
this.$confirm('当前宗地不在同一地籍子区下,是否继续选择？')
.then(_ => {
this.addZdData(data)
this.addZdData(data);
})
.catch(_ => {
flat = false;
});
callback(flat)
} else {
this.addZdData(data)
}
break
case "dz":
arr = this.dzhbqData.filter(i => i.glbsm === data.glbsm);
if (arr.length > 0) {
let arr3 = this.dzhbqData.filter(i => i.glbsm === data.glbsm);
if (arr3.length > 0) {
break
}
if (this.dzhbqData.includes(data)) {
......
......@@ -28,8 +28,11 @@
<el-button class="radioBtn" label="1" border @click="create"
><i class="iconfont iconchuangjianloupan"></i>创建楼盘</el-button
>
<el-button class="radioBtn" label="2" border @click="plScYcChange"
><i class="iconfont iconshiyucezhuanhuan"></i>实预测转换</el-button
<el-button class="radioBtn" v-show='this.scyclx=="0"' label="2" border @click="plScYcChange"
><i class="iconfont iconshiyucezhuanhuan"></i>预测转实测</el-button
>
<el-button class="radioBtn" v-show='this.scyclx=="1"' label="2" border @click="plScYcChange"
><i class="iconfont iconshiyucezhuanhuan"></i>实测转预测</el-button
>
<el-button
class="radioBtn"
......
......@@ -22,13 +22,14 @@
ref="ljz"
v-for="(ljzs, ljzIndex) in lpbData.ljzs"
:key="ljzIndex"
:style="{'marginTop':ljzs.zdys.length>0?'0':'30px'}"
:style="{'marginTop':'30px'}"
>
<!-- :style="{'marginTop':ljzs.zdys.length>0?'0':'30px'}" -->
<!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
<!-- 循环逻辑幢下的幢单元 -->
<div
class="ljz-zdy"
:style="{ 'min-height': ljzzdyHeight + 40 + 'px','marginRight':zdyIndex<(ljzs.zdys.length-1)?'20px':'0'}"
:style="{ 'min-height': ljzzdyHeight + 'px','marginRight':zdyIndex<(ljzs.zdys.length-1)?'20px':'0'}"
ref="ljzzdy"
v-show="ljzs.zdys.length > 0"
v-for="(zdys, zdyIndex) in ljzs.zdys"
......@@ -38,7 +39,7 @@
<!-- <div class="chTable-wrap"> -->
<table
class="chTable psr"
:style="{ top: ljzzdyHeight - 1 - zdys.cs.length * 65 + 'px' }"
:style="{ top: (ljzzdyHeight - zdys.cs.length * 65) - 80 + 'px' }"
border="1"
cellspacing="0"
cellpadding="0"
......@@ -78,7 +79,9 @@
<!-- </div> -->
<!-- 幢单元名称 -->
<div class="zdy-name name">
{{ zdys.zdymc }}
<p>
{{ zdys.zdymc }}
</p>
</div>
</div>
<!-- 循环逻辑幢下的层户 -->
......@@ -89,12 +92,12 @@
v-if="ljzs.cs.length > 0"
>
<table
class="chTable"
class="chTable prs"
:style="{
top:
ljzzdyHeight + 40 - 1 - ljzs.cs.length * 65 < 0
ljzzdyHeight + 40 - ljzs.cs.length * 65 < 0
? 0
: ljzzdyHeight + 40 - 1 - ljzs.cs.length * 65 + 'px',
: ljzzdyHeight + 40 - ljzs.cs.length * 65 + 'px',
}"
border="1"
cellspacing="0"
......@@ -152,7 +155,9 @@
>
<!-- 幢单元名称 -->
<div class="zdy-name name">
{{ zdys.zdymc }}
<p>
{{ zdys.zdymc }}
</p>
</div>
<!-- 循环幢单元下的层户 -->
<table
......@@ -235,6 +240,14 @@
<span @click.stop="qsztClick" class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span>
<ul class="dyzt">
<li style="background-color:#6EDEE1">确</li>
<li style="background-color:#8ADC88">备</li>
<li style="background-color:#FF8282">抵</li>
<li style="background-color:#D7CECF">查</li>
<li style="background-color:#D4A3EB">异</li>
<li style="background-color:#A5A3FB">限</li>
</ul>
</td>
</tr>
</table>
......@@ -242,9 +255,9 @@
<!-- </template> -->
</div>
<!-- <div class="ch-wrap">层户</div> -->
</div>
<div class="zrz" :style="{ width: lpbContentWidth + 'px' }">
{{ lpbData.xmmc }}
<div class="zrz" :style="{ width: lpbContentWidth + 'px' }">
{{ lpbData.xmmc }}
</div>
</div>
<ul
v-show="lpbChVisible"
......@@ -463,7 +476,7 @@ export default {
//清除之前选中户
this.clearChoosedH();
this.searchNum = sh;
console.log("查询searchNum" + searchNum);
// console.log("查询searchNum" + searchNum);
},
//自然幢下元素高度宽度计算
dataChange() {
......@@ -511,9 +524,8 @@ export default {
this.zdyWidth = this.$refs.zrzDlch.offsetWidth+20;
}
}
//计算逻辑幢下的幢单元和层户的高度
this.ljzzdyHeight = 1;
this.ljzzdyHeight = 0;
if (this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0) {
//判断自然幢下有没有比层户高的幢单元
let higher = true;
......@@ -531,9 +543,7 @@ export default {
//计算自然幢下的幢单元高度，如果有比层户高的幢单元，则幢单元高度设为最高的幢单元高度，如果没有，则设为层户高度
higher = highest > this.$refs.ljzch.offsetHeight ? true : false;
this.$nextTick(() => {
this.ljzzdyHeight = higher
? highest
: this.$refs.ljzch.offsetHeight;
this.ljzzdyHeight = higher? highest : this.$refs.ljzch.offsetHeight;
highest = 0;
});
} else {
......@@ -582,12 +592,12 @@ export default {
//户双击事件
dbclick(bsm) {
clearTimeout(this.time);
if (this.isHbfg) {
// if (this.isHbfg) {
}else{
// }else{
// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
this.$parent.getHbsm(bsm, true);
}
// }
},
//删除多重数组中的某一项
deleteArrOption(arr, item) {
......@@ -854,6 +864,11 @@ export default {
this.$nextTick(() => {
this.$refs.hBsm.forEach((item) => {
if (item.className == "tdSelect") {
// console.log(item.offsetLeft,'offsetLeft');
// console.log(item.offsetTop,'offsetHeight');
//定位到最后一个户所在位置
this.$refs.lpbContent.scrollTop = item.offsetTop;
this.$refs.lpbContent.scrollLeft = item.offsetLeft;
console.log(item.dataset.bsm, "item.dataset.bsm");
// 判断hbsmList中是否已经存在
if (this.hbsmList.indexOf(item.dataset.bsm) == -1) {
......@@ -868,6 +883,9 @@ export default {
this.$refs.hBsm.forEach((item) => {
this.choosedList.forEach((i) => {
if (item.dataset.bsm == i) {
//定位到最后一个户所在位置
this.$refs.lpbContent.scrollTop = item.offsetTop;
this.$refs.lpbContent.scrollLeft = item.offsetLeft;
item.style.border = '1px solid '+this.borderColor;
}
});
......@@ -917,7 +935,7 @@ export default {
position: absolute;
height: 40px;
// background-color: rosybrown;
border:1px solid #E6E6E6
// border:1px solid #E6E6E6
}
// .chTable-wrap{
// position: absolute;
......@@ -942,11 +960,7 @@ export default {
width: calc(100% - 32px);
height: 40px;
// background-color: darkorange;
p{
width: 100%;
height: 100%;
border:1px solid #E6E6E6
}
}
}
div:last-child {
......@@ -959,7 +973,6 @@ export default {
.zdy-wrap {
height: auto;
overflow: hidden;
margin-bottom: 60px;
margin-top: 30px;
.zdy {
float: left;
......@@ -973,7 +986,7 @@ export default {
.zdy-name {
bottom: 0;
// background-color: blanchedalmond;
border:1px solid #E6E6E6
// border:1px solid #E6E6E6
}
}
.zdy-zdy:last-child {
......@@ -998,12 +1011,12 @@ export default {
// position: relative;
tr {
.floor {
background-color: blanchedalmond;
background-color: #fff;
}
td {
min-width: 124px;
height: 64px;
line-height: 64px;
min-width: 138px;
height: 72px;
line-height: 72px;
text-align: center;
cursor: pointer;
position: relative;
......@@ -1031,6 +1044,26 @@ export default {
color: #45AEFD;
border-color: #45AEFD;
}
.dyzt{
user-select: none;
width: 138px;
height: 18px;
position: absolute;
// background: orange;
bottom: 32px;
box-sizing: border-box;
padding: 0 6px;
li{
display: inline-block;
width: 18px;
height: 18px;
font-size: 12px;
line-height: 18px;
color: #ffffff;
border: 1px solid;
border-radius: 9px;
}
}
}
.tdSelect {
border: 1px solid #006cff !important;
......@@ -1049,6 +1082,12 @@ export default {
line-height: 40px;
text-align: center;
display: table-footer-group;
p{
width: calc(100% - 2px);
height: 100%;
border:1px solid #E6E6E6;
border-top:0;
}
}
// end
}
......@@ -1061,8 +1100,8 @@ export default {
line-height: 60px;
background-color: #ffffff;
border:1px solid #E6E6E6;
position: relative;
bottom: 66px;
// position: relative;
// bottom: 66px;
text-align: center;
transition: 0.5s;
}
......