Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
5264cb68 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 4f6f3235 ef92b346
Inline Side-by-side
Showing 10 changed files with 228 additions and 54 deletions
......@@ -105,9 +105,10 @@
:disabled="formData.qszt!='0'"
v-model="childItem.tdsyqssj"
type="date"
:picker-options="childItem.pickerStart"
value-format="yyyy-MM-dd"
placeholder="选择日期"
@input="startTime(index,childIndex)"
>
</el-date-picker>
</li>
......@@ -211,7 +212,8 @@
:disabled="formData.qszt!='0'"
v-model="childItem.tdsyjssj"
type="date"
:picker-options="childItem.pickerEnd"
@input="endTime(index,childIndex)"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
......@@ -290,6 +292,8 @@ export default {
sjytmj: 0,
syqx: "",
tdsyjssj: "",
pickerStart:{},
pickerEnd:{},
tdsyqssj: "",
tdzh: "",
},
......@@ -304,6 +308,42 @@ export default {
console.log(this.formData,'formData');
},
methods: {
startTime(index,childIndex){
let startTime= this.countList[index].list[childIndex].tdsyqssj;
let endTime=this.countList[index].list[childIndex].tdsyjssj;
this.countList[index].list[childIndex].pickerEnd={
disabledDate: (time) => {
if (Object.keys(startTime).length>0) {
return new Date(startTime).getTime()>time.getTime();
}else {
return time.getTime()< Date.now();
}
}
}
if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
let startYear= new Date(startTime).getFullYear();
let endYear=new Date(endTime).getFullYear();
this.countList[index].list[childIndex].syqx=endYear-startYear;
}
},
endTime(index,childIndex){
let startTime = this.countList[index].list[childIndex].tdsyqssj;
let endTime = this.countList[index].list[childIndex].tdsyjssj;
this.countList[index].list[childIndex].pickerStart={
disabledDate: (time) => {
if (Object.keys(endTime).length>0) {
return new Date(endTime).getTime()<time.getTime();
}else {
return time.getTime() > Date.now();
}
}
}
if (Object.keys(startTime).length > 0 && Object.keys(endTime).length > 0) {
let startYear= new Date(startTime).getFullYear();
let endYear=new Date(endTime).getFullYear();
this.countList[index].list[childIndex].syqx=endYear-startYear;
}
},
//外层操作
handleClick(ind, type) {
let outsideObj = {
......@@ -325,6 +365,8 @@ export default {
sjdjbsm: "",
sjdjmc: "",
sjytdm: "",
pickerStart:{},
pickerEnd:{},
sjytmc: "",
sjytmj: 0,
syqx: "",
......@@ -360,6 +402,8 @@ export default {
sjytdm: "",
sjytmc: "",
sjytmj: 0,
pickerStart:{},
pickerEnd:{},
syqx: "",
tdsyjssj: "",
tdsyqssj: "",
......@@ -402,7 +446,7 @@ export default {
border-bottom: 1px solid #E6E6E6;
.el-col {
// height: 100%;
border-right: 1px solid grey;
border-right: 1px solid #E6E6E6;
position: relative;
.qlxz {
line-height: 34px;
......@@ -448,7 +492,7 @@ export default {
}
.childYT {
height: 114px;
border-top: 1px solid grey;
border-top: 1px solid #E6E6E6;
ul {
margin-top: 0;
li {
......@@ -478,7 +522,7 @@ export default {
height: 34px;
line-height: 34px;
background-color: #fff;
border-bottom: 1px solid grey;
border-bottom: 1px solid #E6E6E6;
position: absolute;
right: 0;
top: 0;
......@@ -516,7 +560,9 @@ export default {
/deep/.el-select-tree{
width: 100%;
.el-input__inner{
height: 30px !important;
height: 34px !important;
position: relative;
top: -1px;
}
}
}
......
......@@ -329,7 +329,7 @@ export default {
border-bottom: 1px solid #e6e6e6;
.el-col {
// height: 100%;
border-right: 1px solid grey;
border-right: 1px solid #E6E6E6;
position: relative;
.qlxz {
line-height: 34px;
......@@ -375,7 +375,7 @@ export default {
}
.childYT {
height: 114px;
border-top: 1px solid grey;
border-top: 1px solid #E6E6E6;
ul {
margin-top: 0;
li {
......@@ -405,7 +405,7 @@ export default {
height: 34px;
line-height: 34px;
background-color: #fff;
border-bottom: 1px solid grey;
border-bottom: 1px solid #E6E6E6;
position: absolute;
right: 0;
top: 0;
......
......@@ -163,7 +163,7 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
width: 100%;
}
table {
......
......@@ -2,12 +2,12 @@
<div class="content_box">
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick">
<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd"><jzd></jzd></el-tab-pane>
<el-tab-pane label="界址线" name="jzx"><jzx></jzx></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb></djb></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible"></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd"><jzd v-if="jzdVisible"></jzd></el-tab-pane>
<el-tab-pane label="界址线" name="jzx"><jzx v-if="jzxVisible"></jzx></el-tab-pane>
<el-tab-pane label="登记簿" name="djb"><djb v-if="djbVisible"></djb></el-tab-pane>
<el-tab-pane label="历史回溯" name="lshs"><lshs v-if="lshsVisible"></lshs></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl></fjcl></el-tab-pane>
<el-tab-pane label="附件材料" name="fjcl"><fjcl v-if="fjclVisible"></fjcl></el-tab-pane>
</el-tabs>
</div>
</template>
......@@ -29,14 +29,39 @@ export default {
data() {
return {
activeName: "djdcb",
mjftbVisible:false,
jzdVisible:false,
jzxVisible:false,
djbVisible:false,
lshsVisible:false,
fjclVisible:false,
};
},
methods: {
handleClick(tab, event) {
// console.log(tab, event);
if (tab.name == 'lshs') {
switch (tab.name) {
case 'mjftb':
this.mjftbVisible = true;
break;
case 'jzd':
this.jzdVisible = true;
break;
case 'jzx':
this.jzxVisible = true;
break;
case 'djb':
this.djbVisible = true;
break;
case 'lshs':
this.lshsVisible = true;
break;
case 'fjcl':
this.fjclVisible = true;
break;
default:
break;
}
},
},
......
......@@ -87,6 +87,14 @@
</span>
</el-dialog>
</div>
<!--
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" @click="oneExit">编辑</el-button>
<el-button type="primary" @click="save">保存</el-button>
<el-button type="primary" @click="batchExit">批量修改</el-button>
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div> -->
</div>
</template>
......@@ -276,7 +284,25 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
width: 100%;
.header-button {
height: 50px;
position: fixed;
bottom: 0;
right: ;
text-align: center;
background-color: #ffffff;
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
}
table {
margin-top: 10px;
background-color: #fff;
......
......@@ -344,7 +344,7 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
width: 100%;
table {
margin-top: 10px;
background-color: #fff;
......
<template>
<div class="main">
<div class="main" ref="mainBox">
<table border="1">
<tr>
<td colspan="2">土地坐落</td>
......@@ -67,8 +67,12 @@
<td class="fttjmj">{{sumFttdmj}}</td>
</tr>
</table>
<div class="pers">
<!-- <div class="pers">
<el-button @click="save" type="primary">保存</el-button>
</div> -->
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="save">保存</el-button>
</div>
</div>
</template>
......@@ -100,7 +104,8 @@
tdsyqsyqmj: '' // 土地所有权/使用权面积
}
]
}
},
mainBoxWidth:0
}
},
......@@ -198,7 +203,6 @@
console.log("create init...")
},
mounted() {
console.log("mounted init...")
this.mjftData.zdbsm = this.$store.state.zdbsm
this.zdmj = this.$store.state.zdmj
this.tdzl = this.$store.state.zdzl
......@@ -206,6 +210,9 @@
if (this.mjftData.zdbsm) {
this.getData(this.mjftData.zdbsm)
}
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
},
watch: {
"$store.state.zdbsm": function (bsm) {
......@@ -229,8 +236,7 @@
box-sizing: border-box;
padding: 18px;
height: auto;
width: 80%;
}
width: 100%;
table {
margin-top: 10px;
......@@ -238,14 +244,7 @@
font-size: 14px;
width: 100%;
cursor: pointer;
td {
text-align: center;
height: 36px;
min-width: 50px;
}
}
table .formInput {
.formInput {
margin: 0;
height: 36px;
outline: none;
......@@ -255,7 +254,31 @@
text-align: center;
cursor: text;
}
td {
text-align: center;
height: 36px;
min-width: 50px;
}
}
.header-button {
height: 50px;
position: fixed;
bottom: 0;
right: 0;
text-align: center;
background-color: #ffffff;
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
}
}
.pers {
text-align: center;
margin-top: 10px;
......
<template>
<div class="main">
<div class="main" ref="mainBox">
<div class="formMenu">
<Qlr ref="qlrxxModule" :bsm="curZdbsm" :qszt="formData.qszt"></Qlr>
<!-- <el-button
......@@ -338,10 +338,18 @@
</tr>
</table>
<div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" @click="updateZDxx">保存</el-button>
<!-- <div style="min-height: 40px;text-align: center;margin-top: 10px">
<el-button type="success" class="saveBtn" @click="updateZDxx">保存</el-button>
<el-button type="primary" @click="submitZDxx">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div> -->
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="updateZDxx">保存</el-button>
<el-button type="primary" @click="submitZDxx">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
<!-- <el-button type="primary" class="saveBtn" @click="save">保存</el-button> -->
</div>
</div>
</div>
......@@ -414,6 +422,7 @@ export default {
formData: {},
dpdm:'', //宗地底盘代码
curZdbsm:'',
mainBoxWidth:0,
geoAttributes:{
OBJECTID:"",
BSM:"",
......@@ -467,6 +476,9 @@ export default {
},
mounted() {
this.getZdjbxxData(this.$store.state.zdbsm);
this.$nextTick(() => {
this.mainBoxWidth = this.$refs.mainBox.clientWidth;
})
},
methods: {
registerCall(){
......@@ -830,6 +842,7 @@ export default {
td {
text-align: center;
height: 36px;
border-color: #E6E6E6;
}
/deep/ .el-input__inner {
margin: 0;
......@@ -867,5 +880,26 @@ export default {
width: 100%;
}
}
.header-button {
height: 50px;
position: fixed;
bottom: 0;
right: 6px;
text-align: center;
background-color: #ffffff;
.el-button{
padding: 10px 30px;
margin-top: 8px;
}
.saveBtn {
background-color: #00CACD;
border-color: #00CACD;
}
.saveBtn:hover {
background-color: rgba(0, 202, 205, .8);
border-color: rgba(0, 202, 205, .8);
}
}
}
</style>
......
......@@ -488,13 +488,15 @@ export default {
//清空已选中层户
this.cbsmList = [];
this.bsms = [];
console.log(this.$refs.lpbContent.$refs.cBsm,'this.$refs.lpbContent.$refs.cBsm');
this.$nextTick(()=>{
//户
this.$refs.lpbContent.$refs.hBsm.forEach(item=>{
item.style.borderColor = 'rgb(230, 230, 230)';
if (item.className == "tdSelect") {
item.className = "";
}
});
//层
this.$refs.lpbContent.$refs.cBsm.forEach(item=>{
console.log(item.className,'item.className');
item.className = "floor";
......@@ -579,12 +581,10 @@ export default {
} else {
//单击 TO DO
}
console.log(this.bsms);
},
//获取选中层bsmlist
getCbsm(data){
this.cbsmList = data;
console.log(this.cbsmList);
},
//不动产单元号输入框事件
inputFocus() {
......
......@@ -21,6 +21,7 @@
ref="ljz"
v-for="(ljzs, ljzIndex) in lpbData.ljzs"
:key="ljzIndex"
:style="{'marginTop':ljzs.zdys.length > 0 ? '-30px':0}"
>
<!-- <div class="ljz-zdy-wrap" :style="{'min-height':ljzzdyHeight+40+'px'}"> -->
<!-- 循环逻辑幢下的幢单元 -->
......@@ -65,9 +66,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
<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>
</td>
</tr>
</table>
......@@ -119,9 +120,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
<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>
</td>
</tr>
</table>
......@@ -178,9 +179,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
<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>
</td>
</tr>
</table>
......@@ -222,9 +223,9 @@
@contextmenu.prevent="openMenu($event, hs, 'h')"
>
{{ hs.shbw }}
<span class="hqszt lin" v-show="hs.qszt == '0'">临</span>
<span class="hqszt zheng" v-show="hs.qszt == '1'">正</span>
<span class="hqszt xian" v-show="hs.qszt == '2'">现</span>
<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>
</td>
</tr>
</table>
......@@ -339,11 +340,14 @@ export default {
sjc: "", //当前的层的SJC +1
},
formLabelWidth: "120px",
yclpbData:{},
sclpbData:{}
};
},
created() {},
mounted() {
this.getLpb(this.$store.state.zrzbsm, this.$parent.scyclx);
this.getLpb(this.$store.state.zrzbsm, "0");
this.getLpb(this.$store.state.zrzbsm, "1");
setTimeout(() => {
//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
......@@ -366,7 +370,14 @@ export default {
res.result.ljzs = res.result.ljzs
.sort(this.compare("place"))
.reverse();
this.lpbData = res.result == null ? this.lpbData : res.result;
// this.lpbData = res.result == null ? this.lpbData : res.result;
//给实预测楼盘表对象赋值，默认加载预测楼盘表数据
if(scyclx == 0){
this.yclpbData = res.result == null ? this.yclpbData : res.result;
this.lpbData = this.yclpbData;
}else{
this.sclpbData = res.result == null ? this.sclpbData : res.result;
}
this.$nextTick(() => {
//渲染楼盘表
this.dataChange();
......@@ -438,6 +449,7 @@ export default {
}
//计算逻辑幢下的幢单元和层户的高度
this.ljzzdyHeight = 1;
if (this.$refs.ljzzdy != undefined && this.$refs.ljzzdy.length > 0) {
//判断自然幢下有没有比层户高的幢单元
let higher = true;
......@@ -617,6 +629,9 @@ export default {
});
},
//end
qsztClick(){
},
},
computed: {
createFlagChange() {
......@@ -631,7 +646,12 @@ export default {
},
watch: {
scyclx(n) {
this.getLpb(this.$store.state.zrzbsm, n);
// this.getLpb(this.$store.state.zrzbsm, n);
if(n == '0'){
this.lpbData = this.yclpbData;
}else{
this.lpbData = this.sclpbData;
}
},
createFlagChange: function(val) {
setTimeout(() => {
......