Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
79f64351 by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 85b5a8b9 9d41b9f4
Inline Side-by-side
Showing 11 changed files with 57 additions and 46 deletions
......@@ -48,7 +48,7 @@
label="不动产权证号">
</el-table-column>
<el-table-column
prop="qlr"
prop="qlrmc"
label="权利人">
</el-table-column>
<el-table-column
......@@ -72,10 +72,10 @@
<el-col :span="7" style="display: inline-block;">
<el-select v-model="dzhbhData.xzqbsm" value-key="xzqbsm" placeholder="行政区" @change="changeXzq(dzhbhData.xzqbsm)" disabled>
<el-option
v-for="item in xzq"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
v-for="xzqItem in xzq"
:key="xzqItem.bsm"
:label="xzqItem.mc"
:value="xzqItem.bsm">
</el-option>
</el-select>
</el-col>
......@@ -83,10 +83,10 @@
<el-col :span="7">
<el-select v-model="dzhbhData.djqbsm" placeholder="地籍区" @change="changeDjq(dzhbhData.djqbsm)" disabled>
<el-option
v-for="item in djq"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
v-for="djqItem in djq"
:key="djqItem.bsm"
:label="djqItem.mc"
:value="djqItem.bsm">
</el-option>
</el-select>
</el-col>
......@@ -94,10 +94,10 @@
<el-col :span="8">
<el-select v-model="dzhbhData.djzqbsm" placeholder="地籍子区" @change="$forceUpdate()" disabled>
<el-option
v-for="item in djzq"
:key="item.bsm"
:label="item.mc"
:value="item.bsm">
v-for="djzqItem in djzq"
:key="djzqItem.bsm"
:label="djzqItem.mc"
:value="djzqItem.bsm">
</el-option>
</el-select>
</el-col>
......
......@@ -750,6 +750,7 @@
background-color: white;
padding: 10px 0;
margin-bottom: 10px;
border: 1px solid #E6E6E6;
}
.tips{
color: #9B9B9B;
......
......@@ -14,16 +14,19 @@
:show-file-list="false"
multiple
>
<el-button type="primary">上传</el-button>
<el-button type="primary" icon="iconfont iconshangchuan">上传</el-button>
<el-button type="primary" @click="downloadTemplate">下载模板</el-button>
<!-- <a href=`/api/tx/excelGeo/template?type=${dylx}`>下载模板</a>-->
</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>
<el-button @click="cancel">取 消</el-button>
<el-button type="primary" @click="confirm">确 定</el-button>
</span>
</el-dialog>
</div>
......@@ -59,6 +62,12 @@
this.$store.state.sxdrType = '';
},
methods: {
cancel(){
this.close()
},
confirm(){
console.log("确定....")
},
loading() {
this.$store.state.sxdrType = this.dylx;
},
......@@ -71,7 +80,7 @@
this.reset();
},
downloadTemplate() {
window.open(`/api/tx/excelGeo/template?type=` + this.dylx);
window.open(`/api/tx/excelGeo/template?type=${this.dylx}`);
},
uploadSuccess(res, file, fileList) {
this.errorData = [];
......
<template>
<div class="main">
<div class="main1">
<template v-if="isCxlz">
<!-- <p class="tips">查询条件</p> -->
<div class="search">
......@@ -344,7 +344,7 @@ export default {
this.$nextTick(() => {
this.tableHeight =
(document.documentElement.clientHeight ||
document.body.clientHeight) - 352;
document.body.clientHeight) - 332;
this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 220;
});
},
......@@ -555,10 +555,12 @@ export default {
};
</script>
<style scoped lang="less">
.main {
.main1 {
width: 100%;
height: 100%;
-webkit-box-sizing: border-box;
box-sizing: border-box;
padding: 18px;
height: auto;
padding: 20px;
}
.search{
......
......@@ -192,7 +192,7 @@
<li><span class="label">不动产单元号:</span><span class="value">{{dzFgqData.bdcdyh}}</span></li>
<li><span class="label">项目名称:</span><span class="value">{{dzFgqData.xmmc}}</span></li>
<li><span class="label">不动产权证号:</span><span class="value">{{dzFgqData.bdcqzh}}</span></li>
<li><span class="label">权利人:</span><span class="value">{{dzFgqData.qlr}}</span></li>
<li><span class="label">权利人:</span><span class="value">{{dzFgqData.qlrmc}}</span></li>
<li><span class="label">坐落:</span><span class="value">{{dzFgqData.zl}}</span></li>
</ul>
<div class="zdmap">
......
......@@ -54,7 +54,7 @@
label="不动产权证号">
</el-table-column>
<el-table-column
prop="qlr"
prop="qlrmc"
label="权利人">
</el-table-column>
<el-table-column
......@@ -257,7 +257,7 @@
this.$nextTick(() => {
this.fgBoxWidth = this.$refs.hbBox.clientWidth;
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 610
});
});
},
methods: {
......
......@@ -88,8 +88,7 @@
this.queryData.pageNo=this.pageNo;
this.getData(this.queryData);
this.$nextTick(()=>{
console.log(this.$refs.dataGrid.offsetHeight,'this.$refs.dataGrid.offsetHeight');
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 332;
})
},
methods: {
......
......@@ -14,7 +14,7 @@
:on-exceed="handleExceed"
:disabled="isDisabled"
>
<el-button size="small" type="primary" :disabled="isDisabled" >上传</el-button>
<el-button size="small" type="primary" :disabled="isDisabled" icon="iconfont iconshangchuan">上传</el-button>
</el-upload>
<table border="2">
<tr>
......
......@@ -364,7 +364,7 @@
</tr>
</table>
<div class="header-button" :style="{width:mainBoxWidth+'px'}">
<el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled">保存</el-button>
<el-button type="primary" class="saveBtn" @click="updateZDxx" :disabled="disabled" icon="el-icon-search">保存</el-button>
<el-button type="primary" @click="submitZDxx" :disabled="disabled">提交</el-button>
<el-button type="primary" @click="registerCall">登记调用</el-button>
</div>
......
......@@ -233,7 +233,7 @@
</div>
</div>
</div>
<xxxx v-show="!bjztFlag"></xxxx>
<!-- 右键菜单弹出框 -->
......@@ -611,7 +611,7 @@ export default {
getHbsm(data, type) {
if (type) {
// 双击
} else {
//单击 TO DO
this.bsms = data;
......@@ -621,7 +621,7 @@ export default {
getQsztList(data, type) {
if (type) {
// 双击
} else {
//单击 TO DO
this.qsztList = data;
......
......@@ -621,7 +621,7 @@ export default {
this.$nextTick(()=>{
this.lpbContentWidth = this.zdyWidth > this.ljzWidth ?this.zdyWidth - 20 : this.ljzWidth-20;
if (this.lpbContentWidth == 0) {
this.lpbContentWidth = this.$refs.lpbContent.offsetWidth
//his.lpbContentWidth = this.$refs.lpbContent.offsetWidth
}
})
},
......@@ -643,16 +643,16 @@ export default {
self.fghbChoosedList.push(hs);
break;
case 'isFwsxbg':
break;
case 'isCxlz':
break;
case 'isLpb':
this.$parent.getHbsm(this.hbsmList, false);
this.$parent.getQsztList(this.hqsztList, false);
break;
default:
break;
}
......@@ -664,10 +664,10 @@ export default {
self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs)
break;
case 'isFwsxbg':
break;
case 'isCxlz':
break;
case 'isLpb':
this.hbsmList = this.hbsmList.filter(i=>i!=bsm);
......@@ -675,7 +675,7 @@ export default {
this.$parent.getHbsm(this.hbsmList, false);
this.$parent.getQsztList(this.hqsztList, false);
break;
default:
break;
}
......@@ -692,7 +692,7 @@ export default {
this.$refs.hbj.getHInfo(this.hbsm);
});
// if (this.isHbfg) {
// }else{
// this.hbsmList.push(bsm); // 将户bsm放进hbsmList
// this.$parent.getHbsm(bsm, true);
......@@ -781,7 +781,7 @@ export default {
this.rightClickFlag = type;
this.lpbChVisible = true;
break;
default:
break;
}
......@@ -800,7 +800,7 @@ export default {
if (e.target.className.indexOf("tdSelect") == -1) {
//未选中→选中
e.target.className += " tdSelect"; //加边框
this.cbsmList.push(item.bsm);
this.cbsmList.push(item.bsm);
} else {
//选中→未选中
e.target.className = "floor";
......@@ -808,7 +808,7 @@ export default {
}
this.$parent.getCbsm(this.cbsmList);
}else{
}
},
//关闭右键菜单
......@@ -901,7 +901,7 @@ export default {
type: "warning",
})
.then(() => {
//确定合并 调用合并接口 this.hbsmList为选中户bsm数组 TO DO
//确定合并 调用合并接口 this.hbsmList为选中户bsm数组 TO DO
let params = {
"newuserbsm": "",
"oldBsms": olbBsms,
......@@ -972,7 +972,7 @@ export default {
});
}
}).catch((error) => {
});
}).catch(() => {
......@@ -1191,7 +1191,7 @@ export default {
width: calc(100% - 32px);
height: 40px;
// background-color: darkorange;
}
}
.mt30{
......