085644f5 by zhaoqian

Merge remote-tracking branch 'origin/master'

2 parents bf4bc937 e4c98b74
......@@ -3,8 +3,8 @@
<el-col :span="24">
<el-row>
<el-col :span="24">
<el-form :inline="true" class="demo-form-inline" label-width="120px">
<el-form-item label="宗地编码:">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="宗地编码">
<el-input
v-model="queryData.zddm"
placeholder="输入宗地编码"
......@@ -40,7 +40,7 @@
</el-row>
<el-row class="row3" v-if="ismore">
<el-col :span="22">
<el-form :inline="true" class="demo-form-inline" label-width="120px">
<el-form :inline="true" class="demo-form-inline" label-width="106px">
<el-form-item label="权利人名称">
<el-input
placeholder="输入权利人名称"
......@@ -69,7 +69,7 @@
</el-row>
<el-row>
<el-col :span="24">
<el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="120px">
<el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px">
<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>
......
......@@ -105,24 +105,6 @@ export default {
select: false,
},
],
tempTab: [
{
path: "/zrz",
name: "自然幢",
},
{
path: "/dz",
name: "多幢",
},
{
path: "/h",
name: "户",
},
{
path: "/zd",
name: "宗地",
},
],
// 上导航选中id
indId: undefined,
menuList: [],
......
......@@ -24,7 +24,7 @@
<tr>
<td class="cz"><el-button
type="primary"
class="changeBtn outAdd addMinus"
class="changeBtn inAdd addMinus"
@click="addRow"
>+</el-button
></td>
......@@ -37,7 +37,7 @@
<td class="cz">
<el-button
type="primary"
class="changeBtn outMinus addMinus"
class="changeBtn inMinus addMinus"
@click="delRow(i)"
>-</el-button
>
......
<template>
<div class="lpbContent-wrap" ref="lpbContentWrap">
<div
:class="
lpbData.ljzs.length == 0 ? 'column-reverse lpbContent' : 'lpbContent'
"
:class="lpbData.ljzs.length == 0 ? ' lpbContent' : 'lpbContent'"
ref="lpbContent"
v-loading="loading"
>
......@@ -73,12 +71,12 @@
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
</ul>
</td>
</tr>
......@@ -139,12 +137,12 @@
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
</ul>
</td>
</tr>
......@@ -211,12 +209,12 @@
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
</ul>
</td>
</tr>
......@@ -265,12 +263,12 @@
<span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'"></span>
<span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" ></span>
<ul class="dyzt">
<li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt!='0'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt!='0'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt!='0'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'"></li>
<li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'"></li>
<li style="background-color:#8ADC88" v-show="hs.bazt=='1'"></li>
<li style="background-color:#FF8282" v-show="hs.dyzt=='1'"></li>
<li style="background-color:#D7CECF" v-show="hs.cfzt=='1'"></li>
<li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'"></li>
<li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'"></li>
</ul>
</td>
</tr>
......@@ -445,7 +443,7 @@ export default {
this.getLpb(this.zrzbsm, "1");
setTimeout(() => {
//tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
this.lpbContentWidth = this.$store.state.contentWidth - 39 - 20;
//让滚动条滚动至最下面 -6是横向滚动条的高度
this.$refs.lpbContent.scrollTop =
this.$refs.lpbContent.scrollHeight -
......
......@@ -15,7 +15,7 @@
<td>
<el-button
type="primary"
class="changeBtn outAdd addMinus"
class="changeBtn inAdd addMinus"
@click="addRow"
>+</el-button
>
......@@ -31,7 +31,7 @@
<td>
<el-button
type="primary"
class="changeBtn outMinus addMinus"
class="changeBtn inMinus addMinus"
@click="delRow(i)"
>-</el-button
>
......