ffea9b89 by weimo934

Merge remote-tracking branch 'origin/master'

2 parents e359f137 78d8bbff
......@@ -5,7 +5,7 @@
v-for="(items, index) in countList"
:key="items.id"
>
<el-col :span="2">
<el-col :span="2" class="btnCol">
<el-button
v-if="!items.isInside"
type="primary"
......@@ -20,12 +20,16 @@
@click="handleClick(items.id, index, 'minus')"
>-</el-button
>
<div
:class="items.hasNotBorder ? 'itemShow whiteItem' : 'whiteItem'"
v-if="items.isInside"
></div>
</el-col>
<el-col :span="2">
<span class="qlxz">权利性质</span>
<el-col :span="2" class="btnCol">
<span class="qlxz">权利性质</span><br>
<el-button
type="primary"
class="changeBtn mt6"
class="changeBtn"
@click="handleInClick(items, index, 'add')"
>+</el-button
>
......@@ -180,6 +184,7 @@ export default {
{
id: Math.random(),
isInside: false,
hasNotBorder: false,
qlxz: "",
pzyt: "",
sjyt: "",
......@@ -198,9 +203,10 @@ export default {
//外层操作
handleClick(id, ind, type) {
if (type === "add") {
this.countList.splice(ind + 1, 0, {
this.countList.push({
id: Math.random(),
isInside: false,
hasNotBorder: false,
qlxz: "",
pzyt: "",
sjyt: "",
......@@ -219,6 +225,7 @@ export default {
}
});
}
this.hasBorderOrNot();
},
//内层操作
handleInClick(obj, ind, type) {
......@@ -227,6 +234,7 @@ export default {
id: obj.id,
childId: Math.random(),
isInside: true,
hasNotBorder: false,
qlxz: "",
pzyt: "",
sjyt: "",
......@@ -254,13 +262,24 @@ export default {
tempNum++;
}
});
this.countList.splice(tempIndex,tempNum)
this.countList.splice(tempIndex, tempNum);
}
}
this.hasBorderOrNot();
},
getQlxzDataList(){
return this.countList
//判断是否显示边框
hasBorderOrNot() {
this.countList.forEach((item, index) => {
if (index == this.countList.length - 1) {
item.hasNotBorder = true;
} else {
item.hasNotBorder = item.isInside && !this.countList[index + 1].isInside ? true : false;
}
});
},
getQlxzDataList() {
return this.countList;
},
},
};
</script>
......@@ -274,12 +293,10 @@ export default {
.el-col {
height: 100%;
border-right: 1px solid grey;
position: relative;
.qlxz {
line-height: 34px;
}
.mt6 {
margin-top: 6px;
}
ul {
margin-top: 34px;
li {
......@@ -296,6 +313,17 @@ export default {
border-bottom: none;
}
}
.whiteItem {
background-color: #fff;
position: absolute;
width: 100%;
height: 2px;
bottom: -1px;
left: 0;
}
.itemShow {
bottom: 2px;
}
}
.el-col:nth-last-child(2) {
border-right: none;
......@@ -317,19 +345,26 @@ export default {
}
}
}
}
.btnCol {
position: relative;
.changeBtn {
width: 46px;
height: 46px;
margin-top: 40px;
font-size: 30px;
padding: 6px 4px;
padding: 4px 6px;
position: absolute;
top: 50%;
left: 50%;
margin-top: -38px;
margin-left: -23px;
}
.el-button + .el-button {
margin-top: 10px;
margin-left: 0;
margin-left: -23px;
margin-top: 16px;
}
}
.qlxzModule:nth-last-child(1) {
.el-row:nth-last-child(1) {
border-bottom: none;
}
}
......
......@@ -31,6 +31,14 @@
<i :class="item.icon"></i>
<span>{{ item.name }}</span>
</div>
<div class="top-items">
<el-menu :default-active="activeIndex" class="el-menu-demo" mode="horizontal" @select="handleSelect" :router="true">
<el-submenu index="2">
<template slot="title">临时网页开发路由跳转</template>
<el-menu-item v-for="(item,index) in tempTab" :index="item.path" :key="'tempTab'+index">{{item.name}}</el-menu-item>
</el-submenu>
</el-menu>
</div>
</div>
<div class="header-bottom">
<Navigation ref="navigation"></Navigation>
......@@ -56,6 +64,7 @@ export default {
},
data() {
return {
activeIndex:'1',
navigationList: [],
isActive: false,
textLogo: false,
......@@ -79,6 +88,20 @@ export default {
select: false,
}
],
tempTab:[
{
path:'/zrz',
name:'自然幢'
},
{
path:'/dz',
name:'多幢'
},
{
path:'/h',
name:'户'
},
],
// 上导航选中id
indId: undefined,
menuList: [],
......@@ -265,6 +288,9 @@ export default {
//树控件点击事件
itemClick(data){
console.log(data);
},
handleSelect(key, keyPath) {
console.log(key, keyPath);
}
},
};
......
.zrz {
.dz {
min-height: 200px;
width: 100%;
width: 80%;
margin-top: 10px;
float: left;
.el-input__inner{
/deep/.el-input__inner{
width: 100%;
border: 0;
}
textarea{
/deep/textarea{
width: 100%;
border: 0;
}
......@@ -37,4 +37,8 @@
table{
font-size: 14px;
}
.dzTable{
margin-top: 10px;
}
}
\ No newline at end of file
......
<template>
<div class="zrz content-form">
<div class="dz content-form">
<el-form ref="form" :model="form" label-width="160px">
<table border="1" width="80%" cellspacing="1" cellpadding="2">
<Qlr ref="qlrxxModule"></Qlr>
<table border="1" width="100%" cellspacing="1" cellpadding="2" class="dzTable">
<tbody>
<tr>
<td colspan="1"></td>
......@@ -144,6 +145,14 @@
</td>
</tr>
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule"></Qlxz>
</td>
</tr>
<tr></tr>
<tr></tr>
<tr></tr>
<tr height="30">
......@@ -205,8 +214,14 @@
</template>
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz";
export default {
name:'zrz',
components:{
Qlr,
Qlxz,
},
data () {
return {
form:{
......@@ -342,6 +357,6 @@
}
}
</script>
<style rel="stylesheet/less" lang="less">
<style rel="stylesheet/less" lang="less" scoped>
@import 'index.less';
</style>
\ No newline at end of file
......
.zrz {
.h {
min-height: 200px;
width: 100%;
width: 80%;
margin-top: 10px;
float: left;
.el-input__inner{
/deep/.el-input__inner{
width: 100%;
border: 0;
}
textarea{
/deep/textarea{
width: 100%;
border: 0;
}
......@@ -38,3 +38,7 @@
table{
font-size: 14px;
}
.hTable{
margin-top: 10px;
}
\ No newline at end of file
......
<template>
<div class="zrz content-form">
<div class="h content-form">
<el-form ref="form" :model="form" label-width="160px">
<table border="1" width="80%" cellspacing="1" cellpadding="2">
<Qlr ref="qlrxxModule"></Qlr>
<table border="1" width="100%" cellspacing="1" cellpadding="2" class="hTable">
<tbody>
<tr>
<td colspan="1"></td>
......@@ -294,6 +295,18 @@
</td>
</tr>
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule"></Qlxz>
</td>
</tr>
<tr></tr>
<tr></tr>
<tr></tr>
<tr height="30">
<td colspan="2" align="center" >
<span>坐落</span>
......@@ -375,8 +388,14 @@
</template>
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz";
export default {
name:'zrz',
components:{
Qlr,
Qlxz,
},
data () {
return {
form:{
......@@ -513,6 +532,6 @@
}
}
</script>
<style rel="stylesheet/less" lang="less">
<style rel="stylesheet/less" lang="less" scoped>
@import 'index.less';
</style>
\ No newline at end of file
......
.zrz {
min-height: 200px;
width: 100%;
width: 80%;
margin-top: 10px;
float: left;
.el-input__inner{
/deep/.el-input__inner{
width: 100%;
border: 0;
}
textarea{
/deep/textarea{
width: 100%;
border: 0;
}
......@@ -37,4 +37,8 @@
table{
font-size: 14px;
}
.zrzTable{
margin-top: 10px;
}
}
\ No newline at end of file
......
<template>
<div class="zrz content-form">
<el-form ref="form" :model="form" label-width="160px">
<table border="1" width="80%" cellspacing="1" cellpadding="2">
<Qlr ref="qlrxxModule"></Qlr>
<table border="1" width="100%" cellspacing="1" cellpadding="2" class="zrzTable">
<tbody>
<tr>
<td colspan="1"></td>
......@@ -210,6 +211,15 @@
</td>
</tr>
<tr>
<td colspan="12" rowspan="4" align="center">
<Qlxz ref="qlxzModule"></Qlxz>
</td>
</tr>
<tr></tr>
<tr></tr>
<tr></tr>
<tr height="30">
<td colspan="2" align="center" >
<span>坐落</span>
......@@ -269,8 +279,14 @@
</template>
<script>
import Qlr from "../../../components/formMenu/qlr";
import Qlxz from "../../../components/formMenu/qlxz";
export default {
name:'zrz',
components:{
Qlr,
Qlxz,
},
data () {
return {
form:{
......@@ -393,6 +409,6 @@
}
}
</script>
<style rel="stylesheet/less" lang="less">
<style rel="stylesheet/less" lang="less" scoped>
@import 'index.less';
</style>
\ No newline at end of file
......
......@@ -3,7 +3,7 @@
<div class="formMenu">
<Qlr ref="qlrxxModule"></Qlr>
<el-button
<!-- <el-button
type="primary"
class="changeBtn"
@click="getQlrxxData"
......@@ -14,7 +14,7 @@
class="changeBtn"
@click="getQlxzData"
>获取权利性质组件数据</el-button
>
> -->
<table class="zdjbxxTable" cellspacing="0" cellpadding="0" border="1">
<tr>
<th colspan="12">宗地基本信息</th>
......@@ -200,10 +200,42 @@
</td>
</tr>
<tr>
<td colspan="12" rowspan="4">
<td colspan="12">
<Qlxz ref="qlxzModule"></Qlxz>
</td>
</tr>
<tr>
<td colspan="2" rowspan="2">批准面积(㎡)</td>
<td colspan="2" rowspan="2">
<input type="text" class="formInput" />
</td>
<td colspan="2" rowspan="2">宗地面积(㎡)</td>
<td colspan="2" rowspan="2">
<input type="text" class="formInput" />
</td>
<td colspan="2">建筑占地宗面积</td>
<td colspan="2">
<input type="text" class="formInput" />
</td>
</tr>
<tr>
<td colspan="2">建筑面积(㎡)</td>
<td colspan="2">
<input type="text" class="formInput" />
</td>
</tr>
<tr>
<td colspan="2">共有/共用权利人情况</td>
<td colspan="10">
<input type="text" class="formInput" />
</td>
</tr>
<tr>
<td colspan="2" rowspan="2">说明</td>
<td colspan="10" rowspan="2">
<input type="text" class="formInput" />
</td>
</tr>
</table>
</div>
</div>
......