Merge remote-tracking branch 'origin/master'
Showing
5 changed files
with
34 additions
and
54 deletions
| ... | @@ -3,8 +3,8 @@ | ... | @@ -3,8 +3,8 @@ |
| 3 | <el-col :span="24"> | 3 | <el-col :span="24"> |
| 4 | <el-row> | 4 | <el-row> |
| 5 | <el-col :span="24"> | 5 | <el-col :span="24"> |
| 6 | <el-form :inline="true" class="demo-form-inline" label-width="120px"> | 6 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> |
| 7 | <el-form-item label="宗地编码:"> | 7 | <el-form-item label="宗地编码"> |
| 8 | <el-input | 8 | <el-input |
| 9 | v-model="queryData.zddm" | 9 | v-model="queryData.zddm" |
| 10 | placeholder="输入宗地编码" | 10 | placeholder="输入宗地编码" |
| ... | @@ -40,7 +40,7 @@ | ... | @@ -40,7 +40,7 @@ |
| 40 | </el-row> | 40 | </el-row> |
| 41 | <el-row class="row3" v-if="ismore"> | 41 | <el-row class="row3" v-if="ismore"> |
| 42 | <el-col :span="22"> | 42 | <el-col :span="22"> |
| 43 | <el-form :inline="true" class="demo-form-inline" label-width="120px"> | 43 | <el-form :inline="true" class="demo-form-inline" label-width="106px"> |
| 44 | <el-form-item label="权利人名称"> | 44 | <el-form-item label="权利人名称"> |
| 45 | <el-input | 45 | <el-input |
| 46 | placeholder="输入权利人名称" | 46 | placeholder="输入权利人名称" |
| ... | @@ -69,7 +69,7 @@ | ... | @@ -69,7 +69,7 @@ |
| 69 | </el-row> | 69 | </el-row> |
| 70 | <el-row> | 70 | <el-row> |
| 71 | <el-col :span="24"> | 71 | <el-col :span="24"> |
| 72 | <el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="120px"> | 72 | <el-form :inline="true" :model="queryData" class="demo-form-inline" label-width="106px"> |
| 73 | <el-form-item class="demo-form-inline" label="查询范围"> | 73 | <el-form-item class="demo-form-inline" label="查询范围"> |
| 74 | <el-checkbox-group v-model="queryData.dylxs" @change="query"> | 74 | <el-checkbox-group v-model="queryData.dylxs" @change="query"> |
| 75 | <el-checkbox label="zd" name="type">宗地</el-checkbox> | 75 | <el-checkbox label="zd" name="type">宗地</el-checkbox> | ... | ... |
| ... | @@ -105,24 +105,6 @@ export default { | ... | @@ -105,24 +105,6 @@ export default { |
| 105 | select: false, | 105 | select: false, |
| 106 | }, | 106 | }, |
| 107 | ], | 107 | ], |
| 108 | tempTab: [ | ||
| 109 | { | ||
| 110 | path: "/zrz", | ||
| 111 | name: "自然幢", | ||
| 112 | }, | ||
| 113 | { | ||
| 114 | path: "/dz", | ||
| 115 | name: "多幢", | ||
| 116 | }, | ||
| 117 | { | ||
| 118 | path: "/h", | ||
| 119 | name: "户", | ||
| 120 | }, | ||
| 121 | { | ||
| 122 | path: "/zd", | ||
| 123 | name: "宗地", | ||
| 124 | }, | ||
| 125 | ], | ||
| 126 | // 上导航选中id | 108 | // 上导航选中id |
| 127 | indId: undefined, | 109 | indId: undefined, |
| 128 | menuList: [], | 110 | menuList: [], | ... | ... |
| ... | @@ -24,7 +24,7 @@ | ... | @@ -24,7 +24,7 @@ |
| 24 | <tr> | 24 | <tr> |
| 25 | <td class="cz"><el-button | 25 | <td class="cz"><el-button |
| 26 | type="primary" | 26 | type="primary" |
| 27 | class="changeBtn outAdd addMinus" | 27 | class="changeBtn inAdd addMinus" |
| 28 | @click="addRow" | 28 | @click="addRow" |
| 29 | >+</el-button | 29 | >+</el-button |
| 30 | ></td> | 30 | ></td> |
| ... | @@ -37,7 +37,7 @@ | ... | @@ -37,7 +37,7 @@ |
| 37 | <td class="cz"> | 37 | <td class="cz"> |
| 38 | <el-button | 38 | <el-button |
| 39 | type="primary" | 39 | type="primary" |
| 40 | class="changeBtn outMinus addMinus" | 40 | class="changeBtn inMinus addMinus" |
| 41 | @click="delRow(i)" | 41 | @click="delRow(i)" |
| 42 | >-</el-button | 42 | >-</el-button |
| 43 | > | 43 | > | ... | ... |
| 1 | <template> | 1 | <template> |
| 2 | <div class="lpbContent-wrap" ref="lpbContentWrap"> | 2 | <div class="lpbContent-wrap" ref="lpbContentWrap"> |
| 3 | <div | 3 | <div |
| 4 | :class=" | 4 | :class="lpbData.ljzs.length == 0 ? ' lpbContent' : 'lpbContent'" |
| 5 | lpbData.ljzs.length == 0 ? 'column-reverse lpbContent' : 'lpbContent' | ||
| 6 | " | ||
| 7 | ref="lpbContent" | 5 | ref="lpbContent" |
| 8 | v-loading="loading" | 6 | v-loading="loading" |
| 9 | > | 7 | > |
| ... | @@ -73,12 +71,12 @@ | ... | @@ -73,12 +71,12 @@ |
| 73 | <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> | 71 | <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> |
| 74 | <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> | 72 | <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> |
| 75 | <ul class="dyzt"> | 73 | <ul class="dyzt"> |
| 76 | <li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'">确</li> | 74 | <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'">确</li> |
| 77 | <li style="background-color:#8ADC88" v-show="hs.bazt!='0'">备</li> | 75 | <li style="background-color:#8ADC88" v-show="hs.bazt=='1'">备</li> |
| 78 | <li style="background-color:#FF8282" v-show="hs.dyzt!='0'">抵</li> | 76 | <li style="background-color:#FF8282" v-show="hs.dyzt=='1'">抵</li> |
| 79 | <li style="background-color:#D7CECF" v-show="hs.cfzt!='0'">查</li> | 77 | <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'">查</li> |
| 80 | <li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'">异</li> | 78 | <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'">异</li> |
| 81 | <li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'">限</li> | 79 | <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'">限</li> |
| 82 | </ul> | 80 | </ul> |
| 83 | </td> | 81 | </td> |
| 84 | </tr> | 82 | </tr> |
| ... | @@ -139,12 +137,12 @@ | ... | @@ -139,12 +137,12 @@ |
| 139 | <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> | 137 | <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> |
| 140 | <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> | 138 | <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> |
| 141 | <ul class="dyzt"> | 139 | <ul class="dyzt"> |
| 142 | <li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'">确</li> | 140 | <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'">确</li> |
| 143 | <li style="background-color:#8ADC88" v-show="hs.bazt!='0'">备</li> | 141 | <li style="background-color:#8ADC88" v-show="hs.bazt=='1'">备</li> |
| 144 | <li style="background-color:#FF8282" v-show="hs.dyzt!='0'">抵</li> | 142 | <li style="background-color:#FF8282" v-show="hs.dyzt=='1'">抵</li> |
| 145 | <li style="background-color:#D7CECF" v-show="hs.cfzt!='0'">查</li> | 143 | <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'">查</li> |
| 146 | <li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'">异</li> | 144 | <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'">异</li> |
| 147 | <li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'">限</li> | 145 | <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'">限</li> |
| 148 | </ul> | 146 | </ul> |
| 149 | </td> | 147 | </td> |
| 150 | </tr> | 148 | </tr> |
| ... | @@ -211,12 +209,12 @@ | ... | @@ -211,12 +209,12 @@ |
| 211 | <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> | 209 | <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> |
| 212 | <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> | 210 | <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> |
| 213 | <ul class="dyzt"> | 211 | <ul class="dyzt"> |
| 214 | <li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'">确</li> | 212 | <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'">确</li> |
| 215 | <li style="background-color:#8ADC88" v-show="hs.bazt!='0'">备</li> | 213 | <li style="background-color:#8ADC88" v-show="hs.bazt=='1'">备</li> |
| 216 | <li style="background-color:#FF8282" v-show="hs.dyzt!='0'">抵</li> | 214 | <li style="background-color:#FF8282" v-show="hs.dyzt=='1'">抵</li> |
| 217 | <li style="background-color:#D7CECF" v-show="hs.cfzt!='0'">查</li> | 215 | <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'">查</li> |
| 218 | <li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'">异</li> | 216 | <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'">异</li> |
| 219 | <li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'">限</li> | 217 | <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'">限</li> |
| 220 | </ul> | 218 | </ul> |
| 221 | </td> | 219 | </td> |
| 222 | </tr> | 220 | </tr> |
| ... | @@ -265,12 +263,12 @@ | ... | @@ -265,12 +263,12 @@ |
| 265 | <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> | 263 | <span @click.stop="qsztClick" class="hqszt zheng" v-show="hs.qszt == '1'">正</span> |
| 266 | <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> | 264 | <span @click.stop="qsztClick" class="hqszt xian" v-show="hs.qszt == '2'" >现</span> |
| 267 | <ul class="dyzt"> | 265 | <ul class="dyzt"> |
| 268 | <li style="background-color:#6EDEE1" v-show="hs.qqzt!='0'">确</li> | 266 | <li style="background-color:#6EDEE1" v-show="hs.qqzt=='1'">确</li> |
| 269 | <li style="background-color:#8ADC88" v-show="hs.bazt!='0'">备</li> | 267 | <li style="background-color:#8ADC88" v-show="hs.bazt=='1'">备</li> |
| 270 | <li style="background-color:#FF8282" v-show="hs.dyzt!='0'">抵</li> | 268 | <li style="background-color:#FF8282" v-show="hs.dyzt=='1'">抵</li> |
| 271 | <li style="background-color:#D7CECF" v-show="hs.cfzt!='0'">查</li> | 269 | <li style="background-color:#D7CECF" v-show="hs.cfzt=='1'">查</li> |
| 272 | <li style="background-color:#D4A3EB" v-show="hs.yyzt!='0'">异</li> | 270 | <li style="background-color:#D4A3EB" v-show="hs.yyzt=='1'">异</li> |
| 273 | <li style="background-color:#A5A3FB" v-show="hs.xzzt!='0'">限</li> | 271 | <li style="background-color:#A5A3FB" v-show="hs.xzzt=='1'">限</li> |
| 274 | </ul> | 272 | </ul> |
| 275 | </td> | 273 | </td> |
| 276 | </tr> | 274 | </tr> |
| ... | @@ -445,7 +443,7 @@ export default { | ... | @@ -445,7 +443,7 @@ export default { |
| 445 | this.getLpb(this.zrzbsm, "1"); | 443 | this.getLpb(this.zrzbsm, "1"); |
| 446 | setTimeout(() => { | 444 | setTimeout(() => { |
| 447 | //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight | 445 | //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight |
| 448 | this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20; | 446 | this.lpbContentWidth = this.$store.state.contentWidth - 39 - 20; |
| 449 | //让滚动条滚动至最下面 -6是横向滚动条的高度 | 447 | //让滚动条滚动至最下面 -6是横向滚动条的高度 |
| 450 | this.$refs.lpbContent.scrollTop = | 448 | this.$refs.lpbContent.scrollTop = |
| 451 | this.$refs.lpbContent.scrollHeight - | 449 | this.$refs.lpbContent.scrollHeight - | ... | ... |
| ... | @@ -15,7 +15,7 @@ | ... | @@ -15,7 +15,7 @@ |
| 15 | <td> | 15 | <td> |
| 16 | <el-button | 16 | <el-button |
| 17 | type="primary" | 17 | type="primary" |
| 18 | class="changeBtn outAdd addMinus" | 18 | class="changeBtn inAdd addMinus" |
| 19 | @click="addRow" | 19 | @click="addRow" |
| 20 | >+</el-button | 20 | >+</el-button |
| 21 | > | 21 | > |
| ... | @@ -31,7 +31,7 @@ | ... | @@ -31,7 +31,7 @@ |
| 31 | <td> | 31 | <td> |
| 32 | <el-button | 32 | <el-button |
| 33 | type="primary" | 33 | type="primary" |
| 34 | class="changeBtn outMinus addMinus" | 34 | class="changeBtn inMinus addMinus" |
| 35 | @click="delRow(i)" | 35 | @click="delRow(i)" |
| 36 | >-</el-button | 36 | >-</el-button |
| 37 | > | 37 | > | ... | ... |
-
Please register or sign in to post a comment