Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
9dba7c9f by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 1ea00911 417eb778
Inline Side-by-side
Showing 23 changed files with 340 additions and 264 deletions
......@@ -60,7 +60,7 @@ export default {
position: absolute;
top: 0;
left: 0;
z-index: 1;
z-index: 1000;
.content{
width: 240px;
height: 160px;
......
......@@ -101,6 +101,7 @@ ol, ul { list-style:none; }
/deep/ .el-tabs--border-card{
border: 0;
}
//二级菜单样式
.tabs{
>.el-tabs__content{
......@@ -115,28 +116,24 @@ ol, ul { list-style:none; }
width: 100%;
margin-bottom: 0;
border-top: 1px solid #F4F9FF;
// >.is-top>.el-tabs__nav-scroll{
// height: 50px;
// background-color: #ffffff;
// box-sizing: border-box;
// padding-left: 20px;
// .el-tabs__active-bar{
// display: none;
// }
// >.el-tabs__nav{
// >.el-tabs__item{
// border: 1px solid #DEDEDE;
// height: 30px;
// line-height: 28px;
// padding: 0 20px;
// margin: 9px 10px 9px 0;
// }
// .is-active{
// color: #006CFF;
// background-color: #ffffff;
// }
// }
// }
}
}
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
position: unset;
/deep/.el-tab-pane{
height: 100%;
}
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
.el-tabs__item{
......
<template>
<div >
<table border="1">
<thead>
<tr rowspan="2">
<th colspan="4">
<h2> 集体土地所有权宗地分类面积调查表</h2><br/>
<div class="dw">
单位:
<el-radio-group v-model="flmjData.dw">
<el-radio :label="3">平方米</el-radio>
<el-radio :label="6">公顷</el-radio>
<el-radio :label="9">亩</el-radio>
</el-radio-group>
</div>
</th>
</tr>
</thead>
<tbody>
<tr>
<th>权利人</th>
<td colspan="3">
<el-input v-model="flmjData.qlr" disabled></el-input>
</td>
</tr>
<tr>
<th>宗地代码</th>
<td colspan="3">
<el-input v-model="flmjData.zddm" disabled></el-input>
</td>
</tr>
<tr>
<th>不动产单元号</th>
<td colspan="3">
<el-input v-model="flmjData.bdcdyh" disabled></el-input>
</td>
</tr>
<tr >
<th rowspan="7">
分类面积
</th>
<th colspan="2">农用地</th>
<td>
<el-input v-model="flmjData.lyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th rowspan="4">
其他
</th>
<th>
耕地
</th>
<th colspan="2">
<el-input v-model="flmjData.gd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</th>
</tr>
<tr>
<th>林地</th>
<td colspan="2">
<el-input v-model="flmjData.ld" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th>
草地
</th>
<td colspan="2">
<el-input v-model="flmjData.cd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th>其他</th>
<td colspan="2">
<el-input v-model="flmjData.qt" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th>建设用地</th>
<td colspan="3">
<el-input v-model="flmjData.jsyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th>
未利用地
</th>
<td colspan="3">
<el-input v-model="flmjData.wlyd" oninput="value = (value.match(/^\d{0,8}(\.?\d{0,3})/g)[0]) || null"></el-input>
</td>
</tr>
<tr>
<th rowspan="2">调查记事</th>
<td colspan="3">
<el-input type="textarea"
:autosize="{ minRows: 2, maxRows: 4}" v-model="flmjData.dcjs"></el-input>
</td>
</tr>
<tr>
<td colspan="3">
<el-form :inline="true" :model="flmjData" class="demo-form-inline">
<el-form-item label="调查员:">
<el-input v-model="flmjData.dcy" ></el-input>
</el-form-item>
<el-form-item label="日期:">
<el-input
placeholder="请选择日期"
title="调查日期"
type="date"
v-model="flmjData.dcrq">
</el-input>
</el-form-item>
</el-form>
</td>
</tr>
<tr>
<th rowspan="2">审核意见</th>
<td colspan="3">
<el-input type="textarea"
:autosize="{ minRows: 2, maxRows: 4}" v-model="flmjData.shyj"></el-input>
</td>
</tr>
<tr>
<td colspan="3">
<el-form :inline="true" :model="flmjData" class="demo-form-inline">
<el-form-item label="审核员:">
<el-input v-model="flmjData.shy" ></el-input>
</el-form-item>
<el-form-item label="日期:">
<el-input
placeholder="请选择日期"
title="调查日期"
type="date"
v-model="flmjData.shrq">
</el-input>
</el-form-item>
</el-form>
</td>
</tr>
<tr>
<td colspan="4" style="text-align: center">
<el-button>保存</el-button>
</td>
</tr>
</tbody>
</table>
</div>
</template>
<script>
export default {
name: "Fldcb",
data(){
return{
flmjData:{
dw:'', // 单位
qlr:'', // 权利人
zddm:'', // 宗地代码
bdcdyh:'', // 不动产单元号
lyd:'', // 农用地
gd:'', // 耕地
ld:'', // 林地
cd:'', // 草地
qt:'', //其他
jsyd:'', // 建设用地
wlyd:'', // 未利用地
dcjs:"", // 调查记事
dcy:'', // 调查员
dcrq:'', // 调查日期
shyj:'', // 审核意见
shy:'', // 审核员
shrq:'' // 审核日期
}
}
}
}
</script>
<style scoped lang="less">
table{
margin-top: 20px;
background-color: #fff;
font-size: 14px;
width: 100%;
cursor: pointer;
th{
height: 36px;
}
}
.dw{
float: right;
}
.demo-form-inline{
float: right;
}
</style>
......@@ -495,8 +495,10 @@
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
vm.loadingShow('业务办理中');
fwsxbgbl(params)
.then((res) => {
vm.loadingHide();
if (res.success) {
// this.$message({
// message: res.message,
......@@ -538,6 +540,7 @@
}
})
.catch((error) => {
vm.loadingHide();
this.$message({
message: res.message,
type: "error",
......
......@@ -10,24 +10,25 @@
<div>
<table border="1">
<tr>
<td>室号前缀</td>
<td>幢单元号</td>
<td>分割符A</td>
<td>层号前自动补0</td>
<td>层</td>
<td>分割符B</td>
<td>户号</td>
<td>室号后缀</td>
<th>室号前缀</th>
<th>幢单元号</th>
<th>分割符A</th>
<th>层号前自动补0</th>
<th>层号</th>
<th>分割符B</th>
<th>户号前自动补零</th>
<th>户号</th>
<th>室号后缀</th>
</tr>
<tr>
<td>
<input type="text" class="inputtitle" v-model="plshData.shqz"/>
<el-input v-model="plshData.shqz"></el-input>
</td>
<td>
<el-checkbox v-model="plshData.selectDyh"></el-checkbox>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.fgfA"/>
<el-input v-model="plshData.fgfA"></el-input>
</td>
<td>
<el-checkbox v-model="plshData.chqbl"></el-checkbox>
......@@ -43,13 +44,15 @@
</el-select>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.fgfB"/>
<el-input v-model="plshData.fgfB"></el-input>
</td>
<td>
<el-checkbox v-model="plshData.hhqbl"></el-checkbox>
</td>
<td>
</td>
<td>
<input type="text" class="inputtitle" v-model="plshData.shhz"/>
<el-input v-model="plshData.shhz"></el-input>
</td>
</tr>
</table>
......@@ -60,15 +63,15 @@
<span>
样例1：1011 <span>（1单元01层01室）</span>([单元号][层号]，勾选“层号自动补0”)
<br/>
样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀])
样例2：1131室<span>（1单元13层01室）</span>([单元号][层号][后缀],后缀填写'室')
<br/>
样例3：11<span>(1层01室)</span>([层号])
样例3：101<span>(1层01室)</span>([层号],勾选“户号自动补0”)
<br/>
样例4：1-011<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号之前增加分隔符”)
样例4：1-011<span>(1单元-01层01室)</span>([单元号][分隔符A][层号]，勾选“层号自动补0”)
<br/>
样例5：1-13-1<span>(1单元13层01室)</span>([单元号][分隔符A][层号][分隔符B])
样例5：1-12-1<span>(1单元12层01室)</span>([单元号][分隔符A][层号][分隔符B])
<br/>
样例6：1-1<span>(1单元13层01室)</span>([单元号][分隔符]，勾选“室号之前增加分隔符”)
样例6：1-12<span>(1层12室)</span>([层号][分隔符B])
</span>
</div>
</div>
......@@ -106,6 +109,7 @@
chqbl: false,
c: '',
fgfB: '',
hhqbl:false,
shhz: ''
},
cs: [
......@@ -128,8 +132,6 @@
methods: {
test: function () {
for (let key in this.plshData) {
console.log(key)
console.log(this.plshData[key])
if (key === 'chqbl') {
continue;
}
......@@ -153,6 +155,7 @@
selectDyh: false,
fgfA: '',
chqbl: false,
hhqbl:false,
c: '',
fgfB: '',
shhz: ''
......@@ -223,7 +226,9 @@
cursor: pointer;
}
}
th{
height: 36px;
}
td {
text-align: center;
height: 36px;
......
......@@ -55,6 +55,10 @@
<i class="iconfont icondiqiu" title="图形管理" v-if="!isMap" @click="goMap"></i>
<i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i>
</div>
<div class="user-info">
<span>admin</span>
<img src="https://himg.bdimg.com/sys/portraitn/item/a1b5badad3b61739" alt="">
</div>
</div>
<!-- <div class="header-bottom">
<Navigation ref="navigation"></Navigation>
......@@ -528,10 +532,38 @@ export default {
right: 18px;
top: 20px;
.tuOrShu{
float: left;
.iconfont{
cursor: pointer;
color:#ffffff;
font-size:30px
font-size:26px;
position: relative;
top: 2px;
}
}
.user-info{
float: left;
margin-left: 20px;
cursor: pointer;
span{
line-height: 30px;
vertical-align: middle;
color: #fff;
font-size: 14px;
}
img{
// padding: 2px;
width: 24px;
height: 24px;
margin-left: 6px;
border-radius: 50%;
border: 1px solid #fff;
vertical-align: middle;
}
}
.user-info:hover{
span{
color: #006CFF;
}
}
}
......
......@@ -189,33 +189,15 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
margin: 0;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
margin-left: 2px;
......@@ -247,6 +229,5 @@
margin: 20px auto 0;
width: 230px;
}
}
}
}
</style>
......
......@@ -72,33 +72,13 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
margin: 0;
border-top: 1px solid #E4E7ED;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px 0 0;
display: flex;
flex-direction: column;
//background-color: #F4F9FF;
background-color: #F4F9FF;
.tips{
color: #9B9B9B;
......@@ -131,6 +111,5 @@
margin: 20px auto 0;
width: 230px;
}
}
}
}
</style>
......
......@@ -507,7 +507,9 @@
this.$nextTick(()=> {
if (flag && this.$refs.qlxzModule.getRulesResult()) {
vm.loadingShow('请求发送中');
saveDzInfo(this.form).then((res)=>{
vm.loadingHide();
if(res.code===200){
this.$message.success("保存完成！")
}else {
......@@ -517,6 +519,10 @@
});
}
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
}else {
this.$message({
// message: item.name+'不能为空',
......
......@@ -63,22 +63,4 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -237,11 +237,17 @@
this.bsm=this.$route.query.bsm;
this.form.bsm=this.bsm;
this.form.jgsj=this.form.jgrq;
vm.loadingShow('请求发送中');
updateGzwjbxx(this.form).then((res)=>{
vm.loadingHide();
if(res.code === 200){
this.$message.success("保存完成!");
}
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
}
})
......
......@@ -30,19 +30,4 @@
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
}
/deep/ .el-tabs__item {
height: 48px;
}
}
</style>
\ No newline at end of file
......
......@@ -162,25 +162,7 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -211,6 +193,5 @@
padding: 18px 0;
}
}
}
}
</style>
......
......@@ -305,8 +305,7 @@
newzdzdtzmbsm: this.zdhbhData.zdtzmbsm,
oldzdbsms: oldBsm
}
console.log(data, '宗地合并数据')
vm.loadingShow();
vm.loadingShow('请求发送中');
ZdHb(data).then(res => {
vm.loadingHide();
if (res.success) {
......@@ -335,7 +334,7 @@
newdzxmmc: this.$refs.dzhb.dzhbhData.xmmc,
zdbsm: this.$refs.dzhb.zdbsm
}
vm.loadingShow();
vm.loadingShow('请求发送中');
DzHb(data).then(res => {
vm.loadingHide();
if (res.success) {
......
......@@ -69,23 +69,4 @@ export default {
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
position: unset;
/deep/.el-tab-pane{
height: calc(100% - 40px);
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -493,11 +493,14 @@ export default {
</script>
<style lang="less">
.eltabs {
height: 366px;
height: 366px!important;
width: 100%;
position: relative;
margin-left: 20px;
margin-top: 20px;
/deep/.el-tabs__content{
position: relative!important;
}
.eltabspane {
height: 100%;
width: 100%;
......
......@@ -243,24 +243,7 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -291,6 +274,5 @@
padding: 18px 0;
}
}
}
}
</style>
......
......@@ -193,24 +193,7 @@
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
.main {
.main {
width: 100%;
height: 100%;
box-sizing: border-box;
......@@ -250,6 +233,5 @@
margin: 20px auto 0;
width: 230px;
}
}
}
</style>
......
......@@ -2,6 +2,7 @@
<!-- <div class="content_box"> -->
<el-tabs v-model="activeName" class="tabs" @tab-click="handleClick" type="border-card" >
<el-tab-pane label="地籍调查表" name="djdcb"><zddcb></zddcb></el-tab-pane>
<el-tab-pane label="分类调查表" name="fldcb"><fldcb v-if="fldbcVisible"></fldcb></el-tab-pane>
<el-tab-pane label="面积分摊表" name="mjftb"><mjftb v-if="mjftbVisible" :is-disabled="isDisabled"></mjftb></el-tab-pane>
<el-tab-pane label="界址点" name="jzd">
<jzd v-if="jzdVisible" :is-disabled="isDisabled"></jzd>
......@@ -26,10 +27,11 @@ import djb from "./djb";
import lshs from "./lshs";
import fjcl from "./fjcl/fjcl"
import {queryStatus} from "@api/search"
import Fldcb from "@components/Fldcb/Fldcb"
export default {
name: "",
components: {
zddcb,mjftb,jzd,jzx,djb,lshs,fjcl
zddcb,mjftb,jzd,jzx,djb,lshs,fjcl,Fldcb
},
props: {},
data() {
......@@ -38,6 +40,7 @@ export default {
activeName: "djdcb",
mjftbVisible:false,
jzdVisible:false,
fldbcVisible:false,
jzxVisible:false,
djbVisible:false,
lshsVisible:false,
......@@ -67,6 +70,9 @@ export default {
case 'mjftb':
this.mjftbVisible = true;
break;
case 'fldcb':
this.fldbcVisible = true;
break;
case 'jzd':
this.jzdVisible = true;
break;
......@@ -103,23 +109,4 @@ export default {
};
</script>
<style scoped lang="less">
.el-tabs{
height: calc(100% - 50px);
/deep/.el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
</style>
......
......@@ -72,41 +72,5 @@ export default {
<style scoped lang="less">
.content_box{
padding: 0 0 6px;
// padding: 0 20px;
// .el-tabs{
// width: 100%;
// height: 100%;
// display: flex;
// flex-direction: column;
// }
// /deep/.el-tabs__content{
// width: 100%;
// height: 100%;
// flex:1;
// position: unset;
// }
// .el-tab-pane{
// width: 100%;
// height: 100%;
// }
.el-tabs{
height: calc(100% - 50px);
/deep/ .el-tabs__content{
//height: 100%;
/deep/.el-tab-pane{
height: 100%;
}
//background: #F4F9FF;
background-color: #F4F9FF;
padding: 0;
}
/deep/ .el-tabs__item {
height: 48px;
}
/deep/ .el-tabs__header{
background-color: #ffffff;
}
}
}
</style>
......
......@@ -904,7 +904,9 @@
this.form.qtjzmj=this.form.scqtjzmj;
this.form.ftxs=this.form.scftxs;
}
vm.loadingShow('请求发送中');
updateQjH(this.form).then((res)=>{
vm.loadingHide();
if(res.code===200){
this.$message.success("保存成功！")
console.log(this,"this")
......@@ -912,6 +914,10 @@
this.$message.warning(res.message)
}
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
}else {
this.$message({
// message: item.name+'不能为空',
......
......@@ -659,6 +659,8 @@ export default {
} else {
//选中→未选中
e.className = "";
this.hbsmList = this.hbsmList.filter(i=>i!=bsm);
this.hqsztList = this.hqsztList.filter(i=>i!=hs.qszt);
switch (this.lpbParent) {
case 'isHbfg':
self.fghbChoosedList = self.fghbChoosedList.filter(i=>i!=hs)
......@@ -891,6 +893,7 @@ export default {
//户合并
handleHb(type){
let olbBsms = '';
console.log(this.fghbChoosedList,'fghbChoosedList');
this.hbsmList.forEach((item,index)=>{
olbBsms+= index<this.hbsmList.length-1? item+',':item
})
......@@ -910,8 +913,9 @@ export default {
"zdybsm": this.fghbChoosedList[0].zdybsm,
"zrzbsm": this.fghbChoosedList[0].zrzbsm
}
// console.log(params,'params');
vm.loadingShow('请求发送中');
hhb(params).then((res) => {
vm.loadingHide();
if(res.code == 200){
Message.success('合并成功');
// 清除选中户
......@@ -923,7 +927,10 @@ export default {
Message.error(res.message);
}
})
.catch(() => {});
.catch((error) => {
vm.loadingHide();
console.log(error);
});
})
.catch(() => {});
}else{
......@@ -936,7 +943,9 @@ export default {
},
//户分割保存
savefgData(){
vm.loadingShow('请求发送中');
hfg(this.fgData).then((res) => {
vm.loadingHide();
if(res.code == 200){
Message.success('分割成功');
// 清除选中户
......@@ -949,7 +958,10 @@ export default {
Message.error(res.message);
}
})
.catch(() => {});
.catch((error) => {
vm.loadingHide();
console.log(error);
});
},
//范围属性变更
handleFwsxbg(){
......
......@@ -565,7 +565,9 @@
type: "warning",
});
}else{
vm.loadingShow('请求发送中');
saveZrzInfo(this.form).then((res)=>{
vm.loadingHide();
if(res.code===200){
this.$message.success("保存完成！")
this.getZrzDetailByBsm(this.$route.query.bsm)
......@@ -577,6 +579,10 @@
}
this.loading=false;
})
.catch((error) => {
vm.loadingHide();
console.log(error);
});
this.loading=false;
this.saveGraphicAttributes(); }
}else{
......