Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
0a3a38d6 by weimo934
Options

Merge remote-tracking branch 'origin/master'

2 parents 220f0aab fb67cc55
Inline Side-by-side
Showing 1 changed file with 148 additions and 89 deletions
......@@ -6,30 +6,34 @@
<span class="tips">分割前宗地信息</span>
<el-button type="primary" class="addBtn" @click="newAdd">新增</el-button>
<div class="fgq">
<div class="data">
<el-card class="data">
<div slot="header" class="clearfix">
<span>基本信息</span>
</div>
<ul>
<li><span>宗地代码:</span>{{zdFgqData.zddm}}</li>
<li><span>不动产单元号:</span>{{zdFgqData.bdcdyh}}</li>
<li><span>项目名称:</span>{{zdFgqData.xmmc}}</li>
<li><span>不动产权证号:</span>{{zdFgqData.bdcqzh}}</li>
<li><span>权利人:</span>{{zdFgqData.qlr}}</li>
<li><span>坐落:</span>{{zdFgqData.zl}}</li>
<li><span class="label">宗地代码:</span><span class="value">{{zdFgqData.zddm}}</span></li>
<li><span class="label">不动产单元号:</span><span class="value">{{zdFgqData.bdcdyh}}</span></li>
<li><span class="label">项目名称:</span><span class="value">{{zdFgqData.xmmc}}</span></li>
<li><span class="label">不动产权证号:</span><span class="value">{{zdFgqData.bdcqzh}}</span></li>
<li><span class="label">权利人:</span><span class="value">{{zdFgqData.qlr}}</span></li>
<li><span class="label">坐落:</span><span class="value">{{zdFgqData.zl}}</span></li>
</ul>
</div>
</el-card>
<div class="zxx">
<div class="dz">
<div class="title">
<el-card class="dz">
<div slot="header" class="clearfix">
<span>多幢信息({{zdZxx.dzList.length}}个)</span>
</div>
<ul>
<li v-for="(item,index) in zdZxx.dzList" :key="index"
:class="[{'search':!zdDzList.includes(item)}]"
>{{item.displays}}
><span class="label">多幢名称:</span> <span class="value">{{item.displays}}</span>
</li>
</ul>
</div>
<div class="zrz">
<div class="title">
</el-card>
<el-card class="zrz">
<div slot="header" class="clearfix">
<span>自然幢信息({{zdZxx.zrzList.length}}个)</span>
</div>
<ul>
......@@ -38,7 +42,8 @@
{{item.displays}}
</li>
</ul>
</div>
<div class="line"></div>
</el-card>
</div>
</div>
<div class="fgh">
......@@ -53,7 +58,25 @@
<th class="tdtzm">土地特征码</th>
<th class="xmmc">项目名称</th>
<th class="xzzxx">幢信息</th>
<th class="">选择</th>
<!-- <th class="">选择</th> -->
</tr>
<tr>
<td>
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="addRow"
>+
</el-button
>
</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</tr>
<tr v-for="(item,index) in zdFghData.newZdlist" :key="index">
<td class="cz">
......@@ -66,7 +89,7 @@
>
</td>
<td class="xzq">
<el-select v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
<el-select class="" v-model="item.xzqbsm" @change="changeXzq(item.xzqbsm,index)">
<el-option
v-for="i in xzq"
:key="i.bsm"
......@@ -76,7 +99,7 @@
</el-select>
</td>
<td class="djq">
<el-select v-model="item.djqbsm" @change="changeDjq(item.djqbsm,index)">
<el-select class="" v-model="item.djqbsm" @change="changeDjq(item.djqbsm,index)">
<el-option
v-for="i in djq"
:key="i.bsm"
......@@ -86,7 +109,7 @@
</el-select>
</td>
<td class="syqlx">
<el-select v-model="item.djzqbsm">
<el-select class="" v-model="item.djzqbsm">
<el-option
v-for="i in djzq"
:key="i.bsm"
......@@ -96,7 +119,7 @@
</el-select>
</td>
<td class="tdtzm">
<el-select v-model="item.syqlxbsm">
<el-select class="" v-model="item.syqlxbsm">
<el-option
v-for="i in syq"
:key="i.value"
......@@ -106,7 +129,7 @@
</el-select>
</td>
<td class="syqlx">
<el-select v-model="item.zdtzmbsm">
<el-select class="" v-model="item.zdtzmbsm">
<el-option
v-for="i in tdtzm"
:key="i.bsm"
......@@ -119,7 +142,7 @@
<input type="text" v-model="item.xmmc" class="formInput"/>
</td>
<td class="xzzxx">
<span>多幢:</span>
<!-- <span>多幢:</span>
<ul>
<li v-for="(dzItem,dzIndex) in item.dz" :key="dzIndex"
@mouseenter="mouseenter($event,index,dzIndex,'dz')"
......@@ -135,9 +158,14 @@
>{{zrzItem.xmmc}}
<span v-if="zrzIndex<item.zrz.length-1">,</span>
</li>
</ul>
</ul> -->
<span class="zxx">自然幢1 <i class="fa fa-times"></i></span>
<span class="zxx">自然幢2 <i class="fa fa-times"></i></span>
<span class="zxx">自然幢3 <i class="fa fa-times"></i></span>
<span class="zxx">多幢1 <i class="fa fa-times"></i></span>
<span class="choose">选择</span>
</td>
<td class="">
<!-- <td class="">
<el-dropdown @command="dzHandleCommand($event,index)">
<span class="el-dropdown-link">
选择多幢<i class="el-icon-arrow-down el-icon--right"></i>
......@@ -160,25 +188,7 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</td>
</tr>
<tr>
<td>
<el-button
type="primary"
class="changeBtn outAdd addMinus"
@click="addRow"
>+
</el-button
>
</td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
<td></td>
</td> -->
</tr>
</table>
</div>
......@@ -988,116 +998,146 @@
.fgq {
margin-left: 20px;
margin-top: 20px;
margin-top: 14px;
display: flex;
flex-direction: column;
flex-flow: nowrap;
.data {
.data{
width: 36%;
}
.el-card {
border: 1px solid #E6E6E6;
background-color: white;
height: 180px;
overflow: auto;
.clearfix{
span{
color: #9B9B9B;
}
}
/deep/ .el-card__body{
padding:10px 12px;
}
ul {
li {
padding: 5px;
line-height: 20px;
color: #BBB;
span {
color: #000;
.label{
color: #4A4A4A;
display: inline-block;
width: 104px;
text-align: right;
}
.value{
color: #6D7278;
padding-left: 10px;
}
}
}
}
.zxx {
width: calc(64% - 40px);
margin-left: 20px;
display: flex;
flex-direction: column;
flex-flow: nowrap;
background-color: white;
.title {
color: red;
text-align: center;
padding: 5px 0;
}
/deep/ .el-card__body{
height: 200px;
overflow-y: scroll;
position: relative;
}
.line{
width: 1px;
height: calc(100% - 20px);
background-color: #EDEDED;
position: absolute;
top: 10px;
left: 50%;
}
.dz {
width: 33%;
border-right: 1px solid #000;
height: 180px;
overflow: auto;
ul {
overflow: auto;
li {
padding: 5px;
text-align: center;
line-height: 20px;
ul{
li{
width: 96% !important;
}
}
}
.zrz {
width: 66%;
height: 180px;
margin-left: 20px;
overflow: auto;
}
ul {
overflow: auto;
li {
padding: 5px;
width: 48%;
text-align: center;
padding: 5px;
text-align: left;
line-height: 20px;
display: inline-block;
.label{
width: 90px;
}
}
li:nth-of-type(even){
.label{
width: 110px;
text-indent: 20px;
}
}
}
.oddborder {
border-right: 1px solid #000;
}
.fgq .data {
width: 30%;
border: 1px solid #000;
}
.fgq .zxx {
width: 67%;
margin-left: 20px;
border: 1px solid #000;
.oddborder {
border-right: 1px solid #000;
}
.fg-tabs {
height: auto;
width: 100%;
position: relative;
top: 36px;
.table {
margin-top: 12px;
box-sizing: border-box;
padding: 18px;
}
.addBtn {
/* position: absolute;
right: 30px;
top: -46px;
z-index: 999;*/
position: absolute;
right: 24px;
top: -14px;
}
table {
margin-top: 10px;
background-color: #fff;
font-size: 14px;
width: 100%;
tr:nth-of-type(odd) {
background: #FAFAFA;
th {
height: 36px;
}
}
.formInput {
width: calc(100% - 40px);
/deep/.el-input__inner {
margin: 0;
height: 36px;
height: 44px;
outline: none;
border: none;
color: #606764;
overflow: visible;
text-align: center;
cursor: text;
}
tr:nth-of-type(odd) {
background: #FAFAFA;
}
tr{
th,td{
height: 44px;
}
}
tr:hover {
background-color: #F5F7FA;
}
......@@ -1124,10 +1164,14 @@
/*padding: 0 18px;*/
height: 480px;
overflow: auto;
margin-top: 10px;
margin-top: 26px;
table {
margin: 0 20px;
}
.tips {
display: inline-block;
margin-bottom: 14px;
}
}
.header-button {
height: 50px;
......@@ -1161,10 +1205,25 @@
}
.xzzxx {
ul {
li {
display: inline-block;
.zxx{
padding-right: 16px;
position: relative;
i{
color: #9F9F9F;
position: absolute;
right: 12px;
top: -8px;
display: none;
}
}
.zxx:hover{
>i{
display: inline;
}
}
.choose{
color: #30A4FD;
cursor: pointer;
}
}
......