Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
4b2ce327 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 25b586d1 599df7a2
Inline Side-by-side
Showing 41 changed files with 276 additions and 78 deletions
......@@ -47,6 +47,22 @@ export function getListByPbsm(pbsm) {
}
/**
* 跟据所有权类型及其所在行政区，地籍区，地籍子区查询宗地和自然幢信息
*/
export function getZdDetailList(data) {
return request({
url: 'system/xzq/getZdDetailList',
method: 'get',
params: {
xzqbsm:data.xzqbsm,
djqbsm:data.djqbsm,
djzqbsm:data.djzqbsm,
syqlx:data.syqlx
}
})
}
/**
* 通过名称获取字典
*/
export function getDdicByMC(mc) {
......
......@@ -89,25 +89,37 @@ ol, ul { list-style:none; }
}
//二级菜单样式
.tabs{
>.is-top>.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: 30px;
padding: 0 20px;
margin: 9px 10px 9px 0;
>.el-tabs__content{
position: unset;
margin-top: 50px;
}
>.is-top{
position: -webkit-fixed;
position: fixed;
top: 60px;
z-index: 999;
width: 100%;
margin-bottom: 0;
>.is-top>.el-tabs__nav-scroll{
height: 50px;
background-color: #ffffff;
box-sizing: border-box;
padding-left: 20px;
.el-tabs__active-bar{
display: none;
}
.is-active{
color: #006CFF;
background-color: #ffffff;
>.el-tabs__nav{
>.el-tabs__item{
border: 1px solid #DEDEDE;
height: 30px;
line-height: 30px;
padding: 0 20px;
margin: 9px 10px 9px 0;
}
.is-active{
color: #006CFF;
background-color: #ffffff;
}
}
}
}
......@@ -121,9 +133,6 @@ ol, ul { list-style:none; }
-webkit-box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4);
box-shadow: 0px 4px 28px 0px rgba(0, 0, 0, 0.4);
}
.el-tabs__content{
position: unset;
}
// 自定义右键菜单样式
.contextmenu {
margin: 0;
......
<template>
<div class="tree_item_box">
<div class="tree_item_box" :class="list.length>10 ? 'ofy_scroll':''" :style="{maxHeight:(list.length > 10 ? treeXzqHeight:'unset')+'px'}">
<div
class="column-start-start linkLine_default"
v-for="(item, s_index) in list"
......@@ -34,6 +34,14 @@
}"
></div>
<div
v-if="item.children==null"
class="reTree_icon reTree_expand_icon"
:style="{
height: (size || 14 * 1.2) + 'px',
width: (size || 14 * 1.2) + 'px',
}"
></div>
<div
class="layer_text nowrap"
@contextmenu.prevent="openMenu($event, item,list)"
:class="{
......@@ -53,6 +61,7 @@
</div>
</template>
<script>
import {getZdDetailList} from "../../api/common"
export default {
name: "line-item",
props: {
......@@ -62,6 +71,12 @@ export default {
return [];
},
},
formatData: {
type: Array,
default: () => {
return [];
},
},
size: {
type: Number,
default: 14,
......@@ -77,20 +92,43 @@ export default {
},
data() {
return {
time:null
time:null,
treeXzqHeight:0,
}
},
mounted(){
this.$nextTick(()=>{
this.treeXzqHeight = this.$parent.$el.clientHeight-(this.formatData.length-1)*26+60;
})
},
methods: {
itemClick(item) {
let self = this;
// 开启延时器，300ms的间隔区分单击和双击，解决双击时执行两次单击事件
clearTimeout(self.time);
self.time = setTimeout(() => {
item.expand = item.expand == undefined? true:!item.expand;
self.$emit("itemClick", item);
// self.$emit("itemClick", item);
if (!item.children) {
self.$emit("valClick", item);
let data = {
xzqbsm:item.xzq,
djqbsm:item.djq,
djzqbsm:item.djzq,
syqlx:item.dm
}
getZdDetailList(data).then((res) => {
if (res.result.length>0) {
res.result.forEach(i=>{
if(i.children.length>0){
i.expand = false;
}
})
self.$emit("ownerMethod", item,res.result);
}
})
.catch((error) => {
});
}
}, 300);
},
......@@ -190,6 +228,10 @@ export default {
width: 100%;
cursor: pointer;
}
.ofy_scroll{
overflow-y: scroll;
overflow-x: hidden;
}
.basic_layer {
width: 100%;
position: relative;
......@@ -222,7 +264,7 @@ export default {
position: relative;
// padding-bottom: 15px;
width: 100%;
padding-left: 40px;
padding-left: 25px;
}
.white_layer {
color: black!important;
......@@ -243,7 +285,7 @@ export default {
content: "";
position: absolute;
height: 1px;
width: 22px;
width: 16px;
left: 8px;
top: 8px;
opacity: .5;
......
......@@ -34,6 +34,7 @@
<lineItem
v-if="item.expand && item.children.length > 0"
v-on="$listeners"
@ownerMethod="ownerMethod(arguments)"
@changeTop="changeTop"
@changeZdData="changeZdData"
@changeLeft="changeLeft"
......@@ -45,6 +46,7 @@
:visible="visible"
:size="size"
:islpb="islpb"
:formatData="formatData"
></lineItem>
</div>
......@@ -184,8 +186,7 @@ export default {
this.dialogVisible = false;
},
preDealData(list) {
// //楼盘表目录树没有expand属性
// list[0].expand = list[0].expand == undefined ? true:list[0].expand;
//楼盘表目录树没有expand属性
list.forEach((x) => {
if (x.expand == undefined) this.$set(x, "expand", true);
if (x.children && x.children.length > 0) {
......@@ -213,8 +214,42 @@ export default {
},
itemClick(item) {
// item.expand = item.expand == undefined? true:!item.expand;
console.log(item,'item');
console.log(this.formatData,'this.formatData');
this.formatData.forEach(i=>{
if(i.bsm != item.bsm){
i.expand = false
}else{
// i.expand = !item.expand
}
})
item.expand = !item.expand;
this.$emit("itemClick", item);
// this.$emit("itemClick", item);
},
//给所有权类型添加子节点
ownerMethod(arr){
let item = arr[0];
let list = arr[1]
this.formatData.forEach(i=>{
if (i.bsm == item.xzq){
i.children.forEach(j=>{
if (j.bsm == item.djq) {
j.children.forEach(k=>{
if(k.bsm == item.djzq){
k.children.forEach(n=>{
if(n.dm == item.dm){
this.$nextTick(()=>{
n.children = list;
})
}
})
}
})
}
})
}
})
console.log(this.formatData,'formatData');
},
//自然幢右键点击事件
openMenu(e,item){
......@@ -274,6 +309,7 @@ export default {
flex-direction: column;
justify-content: flex-start;
align-items: center;
}
.row-flex-start {
display: flex;
......
......@@ -43,6 +43,7 @@
<el-form-item class="demo-form-inline" label="查询范围">
<el-checkbox-group v-model="queryData.dylxs" @change="query">
<el-checkbox label="zd" name="type">宗地</el-checkbox>
<el-checkbox label="dz" name="type">多幢</el-checkbox>
<el-checkbox label="zrz" name="type">自然幢</el-checkbox>
<el-checkbox label="h" name="type">户</el-checkbox>
<el-checkbox label="gzw" name="type">构筑物</el-checkbox>
......
......@@ -33,5 +33,9 @@ let bdcLxArray = [
label: "户",
value: "h",
},
{
label: "多幢",
value: "dz",
},
];
createFilter("bdcLxFilter", bdcLxArray);
\ No newline at end of file
......
......@@ -63,25 +63,25 @@ const constantRoutes = [
path: "/zrz",
name: "自然幢",
code: "1-1",
component: () => import("@/views/systemZRZ/index"),
component: () => import("@/views/zrz/index"),
},
{
path: "/dz",
name: "多幢",
code: "1-2",
component: () => import("@/views/systemDZ/index"),
component: () => import("@/views/dz/index"),
},
{
path: "/zd",
name: "宗地",
code: "1-5",
component: () => import("@/views/systemZD/index"),
component: () => import("@/views/zd/index"),
},
{
path: "/c",
name: "层",
code: "1-7",
component: () => import("@/views/systemZRZ/c/index"),
component: () => import("@/views/zrz/c/index"),
},
],
},
......
......@@ -10,7 +10,7 @@
/>
<span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
</div>
<div class="treeModule">
<div class="treeModule" :style="{height:treeHeight+'px'}">
<LineTree :pd="pd" @itemClick="itemClick"></LineTree>
</div>
</el-aside>
......@@ -123,6 +123,7 @@ export default {
},
pd: [],
dialogVisible: false,
treeHeight:0, //树结构区域高度
};
},
computed: {
......@@ -193,6 +194,9 @@ export default {
// }
this.getDic();
this.getTreeList();
this.$nextTick(()=>{
this.treeHeight = this.$el.clientHeight - 120;
});
},
methods: {
//请求字典数据
......
......@@ -14,8 +14,9 @@
</td>
<td colspan="2" align="center" >不动产单元号</td>
<td colspan="4" >
<el-input v-model="form.bdcdyh" style="width: 70%"></el-input>
<el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button>
<el-input v-model="form.bdcdyh" style="width: 70%" v-show="form.bdcdyh===''||form.bdcdyh==null"></el-input>
<el-input v-model="form.bdcdyh" v-show="form.bdcdyh!==''&&form.bdcdyh!=null"></el-input>
<el-button @click.prevent="generatorCode" size="mini" v-show="form.bdcdyh===''||form.bdcdyh==null" type="primary" style="width:25%;margin-left:3%">生成</el-button>
</td>
</tr>
<tr height="30">
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" @tab-click="handleClick">
<el-tab-pane label="自然幢信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
<el-tab-pane label="多幢基本信息" name="dzxx"><dzxx></dzxx></el-tab-pane>
</el-tabs>
</div>
</template>
......
......@@ -79,7 +79,9 @@
pageNo: this.pageNo,
pageSize: this.pageSize,
})
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
this.$nextTick(()=>{
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
})
},
methods: {
handleCurrentChange(val) {
......
<template>
<div>
<el-tabs v-model="tabName">
<div class="fg" ref="fgBox">
<el-tabs v-model="tabName" type="card" class="menu">
<el-tab-pane label="宗地分割" name="zd">
<div class="main">
<div class="button">
<el-button type="primary" @click="newAdd">新增</el-button>
</div>
<div class="fg-tabs">
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="table">
<span class="tips">分割前宗地信息</span>
<table border="1">
<tr>
<td>序号</td>
......@@ -39,7 +38,7 @@
</table>
</div>
<div class="fgh">
<span>分割后宗地:</span>
<span class="tips">分割后宗地信息</span>
<table border="1">
<tr>
<td>操作</td>
......@@ -167,17 +166,16 @@
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible"
@close="close"></query-data>
<div class="header-button">
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" @click="save">保存</el-button>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="多幢分割" name="dz">
<div class="main">
<div class="button">
<el-button type="primary" @click="newAdd">新增</el-button>
</div>
<div class="fg-tabs">
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="table">
<span class="tips">分割前宗地信息</span>
<table border="1">
<tr>
<td>序号</td>
......@@ -210,7 +208,7 @@
</table>
</div>
<div class="fgh">
<span>分割后宗地:</span>
<span class="tips">分割后宗地信息</span>
<table border="1">
<tr>
<td>操作</td>
......@@ -337,17 +335,16 @@
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['dz']"
@close="close"></query-data>
<div class="header-button">
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" @click="save">保存</el-button>
</div>
</div>
</el-tab-pane>
<el-tab-pane label="户分割" name="h">
<div class="main">
<div class="button">
<el-button type="primary" @click="newAdd">新增</el-button>
</div>
<div class="fg-tabs">
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="table">
<span class="tips">分割前宗地信息</span>
<table border="1">
<tr>
<td>序号</td>
......@@ -380,7 +377,7 @@
</table>
</div>
<div class="fgh">
<span>分割后宗地:</span>
<span class="tips">分割后宗地信息</span>
<table border="1">
<tr>
<td>操作</td>
......@@ -507,13 +504,26 @@
<query-data @getData="getData" :centerDialogVisible.sync="centerDialogVisible" :dylxs="['h']"
@close="close"></query-data>
<div class="header-button">
<div class="header-button" :style="{width:fgBoxWidth+'px'}">
<el-button type="primary" @click="save">保存</el-button>
</div>
</div>
</el-tab-pane>
</el-tabs>
</div>
<!-- <div class="lpb">
<el-tabs v-model="activeName" type="card" @tab-click="handleClick">
<el-tab-pane label="编辑楼盘" name="edit">
<bjlp></bjlp>
</el-tab-pane>
<el-tab-pane label="预览楼盘" name="preview">
<yllp></yllp>
</el-tab-pane>
<el-tab-pane label="详细信息" name="detail">
<xxxx></xxxx>
</el-tab-pane>
</el-tabs>
</div> -->
</template>
<script>
......@@ -619,7 +629,7 @@
oldZdbsm: "",
newZdlist: []
},
fgBoxWidth:0,
}
},
created() {
......@@ -627,6 +637,9 @@
mounted() {
this.getXzqList();
this.getzdtzm();
this.$nextTick(()=>{
this.fgBoxWidth = this.$refs.fgBox.clientWidth;
})
},
methods: {
handleNodeClick(node) {
......@@ -789,15 +802,65 @@
}
</script>
<style scoped lang="less">
.fg{
.menu{
/deep/.el-tabs__content{
position: unset;
margin-top: 62px;
overflow: visible;
}
/deep/.el-tabs__header{
position: -webkit-fixed;
position: fixed;
top: 120px;
z-index: 999;
width: 100%;
margin-bottom: 0;
border: 0;
/deep/.el-tabs__nav-scroll{
height: 50px;
box-sizing: border-box;
padding-left: 20px;
.el-tabs__active-bar{
display: none;
}
>.el-tabs__nav{
border: 0;
>.el-tabs__item{
border: 1px solid #DEDEDE;
height: 36px;
line-height: 36px;
padding: 0 20px;
margin: 9px 10px 9px 0;
background-color: #ffffff;
}
.is-active{
color: #006CFF;
border: 1px solid #006CFF;
}
}
}
}
}
}
.v-model {
z-index: 99 !important;
}
.main {
box-sizing: border-box;
padding: 18px;
.fg-tabs {
height: auto;
width: 80%;
width: 100%;
position: relative;
.table{
margin-top: 12px;
box-sizing: border-box;
padding: 18px;
}
.addBtn{
position: absolute;
right: 30px;
top: -46px;
}
table {
margin-top: 10px;
background-color: #fff;
......@@ -833,11 +896,19 @@
color: #b2b2b2;
}
.fgh {
margin-top: 20px;
box-sizing: border-box;
padding: 0 18px;
margin-top: 10px;
}
.header-button {
margin-top: 20px;
height: 50px;
position: fixed;
bottom: 0;
text-align: center;
background-color: #ffffff;
/deep/ .el-button{
margin-top: 5px;
}
}
.xz-container {
border: 1px solid #000;
......@@ -845,5 +916,8 @@
grid-template-columns: 70% 30%;
grid-template-rows: 1fr;
}
.tips{
color: #9B9B9B;
}
}
</style>
......
......@@ -73,7 +73,9 @@
},
mounted() {
this.getData({})
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
this.$nextTick(()=>{
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
})
},
methods: {
onSubmit() {
......
<template>
<div class="content_box">
<el-tabs v-model="activeName" @tab-click="handleClick">
<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></hb></el-tab-pane>
<el-tab-pane label="范围属性变更" name="fwsxbg"><fwsxbg></fwsxbg></el-tab-pane>
......
......@@ -285,6 +285,7 @@ export default {
//todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm
this.$refs['ruleForm2'].validate((valid) => {
if (valid) {
this.ruleForm2.zdbsm = this.$store.state.rightClickZdbsm != '' ? this.$store.state.rightClickZdbsm : '';
insertDzjbxx(this.ruleForm2)
.then((res) => {
if (res.code == "200") {
......
......@@ -95,7 +95,9 @@ export default {
};
},
mounted() {
this.tableHeight = this.$refs.notice.offsetHeight - 53;
this.$nextTick(()=>{
this.tableHeight = this.$refs.notice.offsetHeight - 53;
})
},
methods: {
handleSelect() {},
......
......@@ -78,7 +78,9 @@
},
mounted() {
this.getData({})
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
this.$nextTick(()=>{
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
})
},
methods: {
handleCurrentChange(val) {
......
......@@ -63,15 +63,17 @@
pageNo: 1,
pageSize: 15,
tableData: [],
tableHeight: "",
tableHeight: 0,
queryData: {}
};
},
created() {
},
mounted() {
this.getData({pageSize:15})
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
this.getData({pageSize:15});
this.$nextTick(()=>{
this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
})
},
methods: {
onSubmit() {
......
......@@ -43,7 +43,7 @@ export default {
width: 100%;
height: 100%;
box-sizing: border-box;
padding: 0 18px !important;
padding:18px;
-webkit-user-select:none;
-moz-user-select:none;
-ms-user-select:none;
......
......@@ -24,9 +24,9 @@
</td>
<td colspan="2" >不动产单元号</td>
<td colspan="4" >
<input class="formInput percent78" :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%">
<input class="formInput percent78" v-show="false" v-model="form.dyhbsm" style="width: 70%">
<el-button @click.prevent="" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button>
<input class="formInput percent78" v-show="form.bdcdyh === ''||form.bdcdyh == null " :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%">
<input class="formInput" :disabled="form.qszt!='0'" v-show="form.bdcdyh !== ''&&form.bdcdyh != null " v-model="form.bdcdyh" style="width: 100%">
<el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%" v-show="form.bdcdyh === ''||form.bdcdyh == null ">生成</el-button>
</td>
</tr>
......