Merge remote-tracking branch 'origin/master' into master
# Conflicts: # src/components/lineTree/lineItem.vue # src/components/lineTree/lineTree.vue
Showing
43 changed files
with
1199 additions
and
448 deletions
| ... | @@ -12,6 +12,7 @@ | ... | @@ -12,6 +12,7 @@ |
| 12 | "lint": "vue-cli-service lint" | 12 | "lint": "vue-cli-service lint" |
| 13 | }, | 13 | }, |
| 14 | "dependencies": { | 14 | "dependencies": { |
| 15 | "@antv/g6": "^4.0.2", | ||
| 15 | "axios": "^0.19.0", | 16 | "axios": "^0.19.0", |
| 16 | "core-js": "^2.6.5", | 17 | "core-js": "^2.6.5", |
| 17 | "e-icon-picker": "^1.0.7", | 18 | "e-icon-picker": "^1.0.7", |
| ... | @@ -20,6 +21,7 @@ | ... | @@ -20,6 +21,7 @@ |
| 20 | "element-ui": "^2.13.2", | 21 | "element-ui": "^2.13.2", |
| 21 | "file-saver": "^2.0.2", | 22 | "file-saver": "^2.0.2", |
| 22 | "form-making": "^1.2.9", | 23 | "form-making": "^1.2.9", |
| 24 | "insert-css": "^2.0.0", | ||
| 23 | "js-cookie": "^2.2.1", | 25 | "js-cookie": "^2.2.1", |
| 24 | "mockjs": "^1.1.0", | 26 | "mockjs": "^1.1.0", |
| 25 | "screenfull": "^5.0.2", | 27 | "screenfull": "^5.0.2", | ... | ... |
src/api/fwsxbg.js
0 → 100644
| ... | @@ -44,13 +44,13 @@ export function insertChInfo (data) { | ... | @@ -44,13 +44,13 @@ export function insertChInfo (data) { |
| 44 | /** | 44 | /** |
| 45 | * 查询楼盘表数据 | 45 | * 查询楼盘表数据 |
| 46 | */ | 46 | */ |
| 47 | export function getLpb (data) { | 47 | export function getLpb (data,lx) { |
| 48 | return request({ | 48 | return request({ |
| 49 | url: 'fw/lpb/getLpb', | 49 | url: 'fw/lpb/getLpb', |
| 50 | method: 'get', | 50 | method: 'get', |
| 51 | params: { | 51 | params: { |
| 52 | zrzbsm:data, | 52 | zrzbsm:data, |
| 53 | syclx:0, | 53 | scyclx:lx, |
| 54 | }, | 54 | }, |
| 55 | }) | 55 | }) |
| 56 | } | 56 | } |
| ... | @@ -73,7 +73,7 @@ export function batchScYcChange (data) { | ... | @@ -73,7 +73,7 @@ export function batchScYcChange (data) { |
| 73 | */ | 73 | */ |
| 74 | export function getLpbTj (data) { | 74 | export function getLpbTj (data) { |
| 75 | return request({ | 75 | return request({ |
| 76 | url: 'fw/lpb/getLpbTj?zrzbsm='+data.zrzbsm+'&syclx='+data.syclx, | 76 | url: 'fw/lpb/getLpbTj?zrzbsm='+data.zrzbsm+'&scyclx='+data.scyclx, |
| 77 | method: 'get', | 77 | method: 'get', |
| 78 | data:data | 78 | data:data |
| 79 | }) | 79 | }) |
| ... | @@ -102,8 +102,46 @@ export function batchGeneratorBdcdyh (dpdm,zrzbsm) { | ... | @@ -102,8 +102,46 @@ export function batchGeneratorBdcdyh (dpdm,zrzbsm) { |
| 102 | */ | 102 | */ |
| 103 | export function getLpbFwytAndQlxz (data) { | 103 | export function getLpbFwytAndQlxz (data) { |
| 104 | return request({ | 104 | return request({ |
| 105 | url: 'fw/lpb/getLpbFwytAndQlxz?zrzbsm='+data.zrzbsm+'&syclx='+data.syclx, | 105 | url: 'fw/lpb/getLpbFwytAndQlxz?zrzbsm='+data.zrzbsm+'&scyclx='+data.scyclx, |
| 106 | method: 'get', | 106 | method: 'get', |
| 107 | data:data | 107 | data:data |
| 108 | }) | 108 | }) |
| 109 | } | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 109 | } | ||
| 110 | /** | ||
| 111 | * 楼盘表 添加层 | ||
| 112 | // "cbsm": "63147d2d9766db01ead0cd53f23de908",//层标识码 | ||
| 113 | // "hcount": 3,//添加户数 | ||
| 114 | // "scyclx": "1",//实测预测类型 | ||
| 115 | // "sjc": 4//当前的层的SJC ± 1 | ||
| 116 | */ | ||
| 117 | export function insertUpDownC (data) { | ||
| 118 | return request({ | ||
| 119 | url: 'fw/lpbright/insertUpDownC', | ||
| 120 | method: 'post', | ||
| 121 | data:data | ||
| 122 | }) | ||
| 123 | } | ||
| 124 | |||
| 125 | /** | ||
| 126 | * 楼盘表 删除层 | ||
| 127 | *"bsm": "c0818d9e4286b35b8ee9b96d90b522aa", | ||
| 128 | *"scyclx": "1" | ||
| 129 | */ | ||
| 130 | export function deleteCByBsm (data) { | ||
| 131 | return request({ | ||
| 132 | url: '/fw/lpbright/deleteCByBsm', | ||
| 133 | method: 'delete', | ||
| 134 | data:data | ||
| 135 | }) | ||
| 136 | } | ||
| 137 | /** | ||
| 138 | * 上下左右移动户 | ||
| 139 | * @param data | ||
| 140 | */ | ||
| 141 | export function moveH(data) { | ||
| 142 | return request({ | ||
| 143 | url:'fw/lpbright/insertMoveH', | ||
| 144 | method:'post', | ||
| 145 | data:data | ||
| 146 | }) | ||
| 147 | } | ... | ... |
| ... | @@ -9,3 +9,11 @@ export function getSearchList(data) { | ... | @@ -9,3 +9,11 @@ export function getSearchList(data) { |
| 9 | data : data, | 9 | data : data, |
| 10 | }) | 10 | }) |
| 11 | } | 11 | } |
| 12 | |||
| 13 | export function zdlist(data) { | ||
| 14 | return request({ | ||
| 15 | url: '/zd/qjZdjbxx/zdlist', | ||
| 16 | method: 'post', | ||
| 17 | data:data | ||
| 18 | }) | ||
| 19 | } | ... | ... |
src/assets/images/tj.png
0 → 100644
3.87 KB
| ... | @@ -40,6 +40,9 @@ table{ | ... | @@ -40,6 +40,9 @@ table{ |
| 40 | table,td,tr,.el-col,.title{ | 40 | table,td,tr,.el-col,.title{ |
| 41 | border-color: #E6E6E6 !important; | 41 | border-color: #E6E6E6 !important; |
| 42 | } | 42 | } |
| 43 | .el-table th{ | ||
| 44 | background-color: #FBFBFB; | ||
| 45 | } | ||
| 43 | .formInput { | 46 | .formInput { |
| 44 | height: 100%; | 47 | height: 100%; |
| 45 | width: 100%; | 48 | width: 100%; |
| ... | @@ -54,6 +57,7 @@ table,td,tr,.el-col,.title{ | ... | @@ -54,6 +57,7 @@ table,td,tr,.el-col,.title{ |
| 54 | } | 57 | } |
| 55 | input:disabled{ | 58 | input:disabled{ |
| 56 | cursor: not-allowed; | 59 | cursor: not-allowed; |
| 60 | background-color: #F5F7FA; | ||
| 57 | } | 61 | } |
| 58 | .formInput:focus{ | 62 | .formInput:focus{ |
| 59 | border: 1px solid #A0C5F6!important; | 63 | border: 1px solid #A0C5F6!important; |
| ... | @@ -145,15 +149,70 @@ ol, ul { list-style:none; } | ... | @@ -145,15 +149,70 @@ ol, ul { list-style:none; } |
| 145 | font-size: 12px; | 149 | font-size: 12px; |
| 146 | font-weight: 400; | 150 | font-weight: 400; |
| 147 | color: #333; | 151 | color: #333; |
| 148 | box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3); | 152 | box-shadow: 2px 2px 3px 0 rgba(0, 0, 0, 0.3); |
| 153 | li { | ||
| 154 | margin: 0; | ||
| 155 | padding: 7px 16px; | ||
| 156 | cursor: pointer; | ||
| 157 | } | ||
| 158 | li:hover { | ||
| 159 | background: #eee; | ||
| 160 | } | ||
| 161 | .noEdit{ | ||
| 162 | color: #E6E6E6; | ||
| 163 | cursor: not-allowed; | ||
| 164 | } | ||
| 165 | .noEdit:hover{ | ||
| 166 | background: #ffffff; | ||
| 167 | } | ||
| 149 | } | 168 | } |
| 150 | .contextmenu li { | 169 | // end |
| 151 | margin: 0; | 170 | //生成按钮样式 |
| 152 | padding: 7px 16px; | 171 | .el-button--warning{ |
| 153 | cursor: pointer; | 172 | color: #FFF; |
| 173 | background-color: #F79700; | ||
| 174 | border-color: #F79700; | ||
| 154 | } | 175 | } |
| 155 | 176 | .el-button--warning:focus, .el-button--warning:hover{ | |
| 156 | .contextmenu li:hover { | 177 | background-color: rgba(247, 151, 0,.7); |
| 157 | background: #eee; | 178 | border-color: rgba(247, 151, 0,.7); |
| 179 | } | ||
| 180 | .percent80{ | ||
| 181 | width: 78%; | ||
| 182 | float: left; | ||
| 158 | } | 183 | } |
| 159 | // end | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 184 | .createBtn{ | ||
| 185 | position: absolute; | ||
| 186 | width: 50px; | ||
| 187 | padding: 6px 0px; | ||
| 188 | right: 6px; | ||
| 189 | top: 4px; | ||
| 190 | } | ||
| 191 | // 增删操作按钮样式 | ||
| 192 | .addMinus{ | ||
| 193 | border-radius:50%; | ||
| 194 | width: 30px !important; | ||
| 195 | height: 30px !important; | ||
| 196 | font-size: 22px!important; | ||
| 197 | padding: 4px 6px; | ||
| 198 | } | ||
| 199 | .outAdd,.outAdd:hover:focus{ | ||
| 200 | background-color: #2FA5FF!important; | ||
| 201 | border: 1px solid #2FA5FF!important; | ||
| 202 | color: #fff!important; | ||
| 203 | } | ||
| 204 | .inAdd,.inAdd:hover:focus{ | ||
| 205 | border: 1px solid #2FA5FF!important; | ||
| 206 | background-color: #fff!important; | ||
| 207 | color: #2FA5FF!important; | ||
| 208 | } | ||
| 209 | .outMinus,.outMinus:hover:focus{ | ||
| 210 | background-color: #FA6400!important; | ||
| 211 | border: 1px solid #FA6400!important; | ||
| 212 | color: #fff!important; | ||
| 213 | } | ||
| 214 | .inMinus,.inMinus:hover:focus{ | ||
| 215 | border: 1px solid #FA6400!important; | ||
| 216 | background-color: #fff!important; | ||
| 217 | color: #FA6400!important; | ||
| 218 | } | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -91,7 +91,7 @@ | ... | @@ -91,7 +91,7 @@ |
| 91 | </template> | 91 | </template> |
| 92 | 92 | ||
| 93 | <script> | 93 | <script> |
| 94 | import {getSearchList} from './../../api/search' | 94 | import {zdlist} from './../../api/search' |
| 95 | import {zrzcxlz} from './../../api/h' | 95 | import {zrzcxlz} from './../../api/h' |
| 96 | import {Message} from 'element-ui' | 96 | import {Message} from 'element-ui' |
| 97 | 97 | ||
| ... | @@ -103,9 +103,8 @@ | ... | @@ -103,9 +103,8 @@ |
| 103 | queryData: { | 103 | queryData: { |
| 104 | bdcdyh: "", | 104 | bdcdyh: "", |
| 105 | bdcqzh: "", | 105 | bdcqzh: "", |
| 106 | dylxs: ['zd'], | ||
| 107 | qlrmc: "", | 106 | qlrmc: "", |
| 108 | qszt: "2", | 107 | qszt: ["2"], |
| 109 | xmmc: "", | 108 | xmmc: "", |
| 110 | zddm: "", | 109 | zddm: "", |
| 111 | zl: "", | 110 | zl: "", |
| ... | @@ -141,7 +140,7 @@ | ... | @@ -141,7 +140,7 @@ |
| 141 | }, | 140 | }, |
| 142 | methods: { | 141 | methods: { |
| 143 | saveNotarize: function (val) { | 142 | saveNotarize: function (val) { |
| 144 | this.zdbsm = val.glbsm; | 143 | this.zdbsm = val.zdbsm; |
| 145 | this.$confirm('将落宗在该宗地上, 是否继续?', '提示', { | 144 | this.$confirm('将落宗在该宗地上, 是否继续?', '提示', { |
| 146 | confirmButtonText: '确定', | 145 | confirmButtonText: '确定', |
| 147 | cancelButtonText: '取消', | 146 | cancelButtonText: '取消', |
| ... | @@ -176,7 +175,7 @@ | ... | @@ -176,7 +175,7 @@ |
| 176 | bdcdyh: "", | 175 | bdcdyh: "", |
| 177 | bdcqzh: "", | 176 | bdcqzh: "", |
| 178 | qlrmc: "", | 177 | qlrmc: "", |
| 179 | qszt: "2", | 178 | qszt: ["2"], |
| 180 | xmmc: "", | 179 | xmmc: "", |
| 181 | zddm: "", | 180 | zddm: "", |
| 182 | zl: "", | 181 | zl: "", |
| ... | @@ -186,8 +185,7 @@ | ... | @@ -186,8 +185,7 @@ |
| 186 | this.getData(this.queryData) | 185 | this.getData(this.queryData) |
| 187 | }, | 186 | }, |
| 188 | getData: function (data) { | 187 | getData: function (data) { |
| 189 | data['dylxs'] = this.dylxs; | 188 | zdlist(data).then(res => { |
| 190 | getSearchList(data).then(res => { | ||
| 191 | this.Data = res.result.records | 189 | this.Data = res.result.records |
| 192 | this.total = res.result.total; | 190 | this.total = res.result.total; |
| 193 | }) | 191 | }) | ... | ... |
| ... | @@ -210,13 +210,13 @@ | ... | @@ -210,13 +210,13 @@ |
| 210 | <td rowspan="2" class="btnCol"> | 210 | <td rowspan="2" class="btnCol"> |
| 211 | <el-button | 211 | <el-button |
| 212 | type="primary" | 212 | type="primary" |
| 213 | class="changeBtn" | 213 | class="changeBtn outAdd addMinus" |
| 214 | @click="handleClick(item, index, 'add')" | 214 | @click="handleClick(item, index, 'add')" |
| 215 | >+</el-button | 215 | >+</el-button |
| 216 | > | 216 | > |
| 217 | <el-button | 217 | <el-button |
| 218 | type="primary" | 218 | type="primary" |
| 219 | class="changeBtn" | 219 | class="changeBtn outMinus addMinus" |
| 220 | @click="handleClick(item, index, 'minus')" | 220 | @click="handleClick(item, index, 'minus')" |
| 221 | >-</el-button | 221 | >-</el-button |
| 222 | > | 222 | > |
| ... | @@ -671,10 +671,6 @@ | ... | @@ -671,10 +671,6 @@ |
| 671 | text-align: center; | 671 | text-align: center; |
| 672 | cursor: text; | 672 | cursor: text; |
| 673 | } | 673 | } |
| 674 | .percent78 { | ||
| 675 | width: 78%; | ||
| 676 | float: left; | ||
| 677 | } | ||
| 678 | .percent68 { | 674 | .percent68 { |
| 679 | width: 68% !important; | 675 | width: 68% !important; |
| 680 | float: left; | 676 | float: left; |
| ... | @@ -685,13 +681,6 @@ | ... | @@ -685,13 +681,6 @@ |
| 685 | width: 30% !important; | 681 | width: 30% !important; |
| 686 | float: left; | 682 | float: left; |
| 687 | } | 683 | } |
| 688 | .createBtn { | ||
| 689 | position: absolute; | ||
| 690 | width: 50px; | ||
| 691 | padding: 6px 4px; | ||
| 692 | right: 4px; | ||
| 693 | top: 4px; | ||
| 694 | } | ||
| 695 | .el-input__icon { | 684 | .el-input__icon { |
| 696 | line-height: 37px; | 685 | line-height: 37px; |
| 697 | } | 686 | } | ... | ... |
| ... | @@ -15,14 +15,14 @@ | ... | @@ -15,14 +15,14 @@ |
| 15 | <el-button | 15 | <el-button |
| 16 | v-show="childIndex < 1" | 16 | v-show="childIndex < 1" |
| 17 | type="primary" | 17 | type="primary" |
| 18 | class="changeBtn" | 18 | class="changeBtn addMinus outAdd" |
| 19 | @click="handleClick(index, 'add')" | 19 | @click="handleClick(index, 'add')" |
| 20 | >+</el-button | 20 | >+</el-button |
| 21 | > | 21 | > |
| 22 | <el-button | 22 | <el-button |
| 23 | v-show="childIndex < 1" | 23 | v-show="childIndex < 1" |
| 24 | type="primary" | 24 | type="primary" |
| 25 | class="changeBtn" | 25 | class="changeBtn addMinus outMinus" |
| 26 | @click="handleClick(index, 'minus')" | 26 | @click="handleClick(index, 'minus')" |
| 27 | >-</el-button | 27 | >-</el-button |
| 28 | > | 28 | > |
| ... | @@ -41,13 +41,13 @@ | ... | @@ -41,13 +41,13 @@ |
| 41 | <span class="qlxz" v-show="childIndex < 1">权利性质</span><br /> | 41 | <span class="qlxz" v-show="childIndex < 1">权利性质</span><br /> |
| 42 | <el-button | 42 | <el-button |
| 43 | type="primary" | 43 | type="primary" |
| 44 | class="changeBtn" | 44 | class="changeBtn addMinus inAdd" |
| 45 | @click="handleInClick(index, childIndex, 'add')" | 45 | @click="handleInClick(index, childIndex, 'add')" |
| 46 | >+</el-button | 46 | >+</el-button |
| 47 | > | 47 | > |
| 48 | <el-button | 48 | <el-button |
| 49 | type="primary" | 49 | type="primary" |
| 50 | class="changeBtn" | 50 | class="changeBtn addMinus inMinus" |
| 51 | @click="handleInClick(index, childIndex, 'minus')" | 51 | @click="handleInClick(index, childIndex, 'minus')" |
| 52 | >-</el-button | 52 | >-</el-button |
| 53 | > | 53 | > |
| ... | @@ -132,6 +132,7 @@ | ... | @@ -132,6 +132,7 @@ |
| 132 | <li> | 132 | <li> |
| 133 | <input | 133 | <input |
| 134 | type="text" | 134 | type="text" |
| 135 | style="top: -1px;" | ||
| 135 | :disabled="formData.qszt!='0'" | 136 | :disabled="formData.qszt!='0'" |
| 136 | placeholder="请输入" | 137 | placeholder="请输入" |
| 137 | v-model="childItem.pzytdm" | 138 | v-model="childItem.pzytdm" |
| ... | @@ -398,7 +399,7 @@ export default { | ... | @@ -398,7 +399,7 @@ export default { |
| 398 | .qlxzModule { | 399 | .qlxzModule { |
| 399 | height: auto; | 400 | height: auto; |
| 400 | position: relative; | 401 | position: relative; |
| 401 | border-bottom: 1px solid grey; | 402 | border-bottom: 1px solid #E6E6E6; |
| 402 | .el-col { | 403 | .el-col { |
| 403 | // height: 100%; | 404 | // height: 100%; |
| 404 | border-right: 1px solid grey; | 405 | border-right: 1px solid grey; |
| ... | @@ -422,6 +423,8 @@ export default { | ... | @@ -422,6 +423,8 @@ export default { |
| 422 | input { | 423 | input { |
| 423 | position: relative; | 424 | position: relative; |
| 424 | top: -2px; | 425 | top: -2px; |
| 426 | height: 35px; | ||
| 427 | width: calc(100% - 1px) !important; | ||
| 425 | } | 428 | } |
| 426 | .el-input__inner { | 429 | .el-input__inner { |
| 427 | height: 34px; | 430 | height: 34px; | ... | ... |
This diff is collapsed.
Click to expand it.
| ... | @@ -64,19 +64,19 @@ | ... | @@ -64,19 +64,19 @@ |
| 64 | <el-button type="primary" @click="save">保存</el-button> | 64 | <el-button type="primary" @click="save">保存</el-button> |
| 65 | <el-button type="primary" @click="cancel">取消</el-button> | 65 | <el-button type="primary" @click="cancel">取消</el-button> |
| 66 | </div> | 66 | </div> |
| 67 | <query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx" | 67 | <zd-query-data :centerDialogVisible="xzzdVisible" @close="xzzdClose" @getData="getZdxx" |
| 68 | :isZdClose="true"></query-data> | 68 | :isZdClose="true"></zd-query-data> |
| 69 | </el-dialog> | 69 | </el-dialog> |
| 70 | </template> | 70 | </template> |
| 71 | 71 | ||
| 72 | <script> | 72 | <script> |
| 73 | import queryData from './../../components/queryData/queryData' | 73 | import zdQueryData from './../../components/zdQueryData/zdQueryData' |
| 74 | import {zdXlcd, hzl} from './../../api/zd' | 74 | import {zdXlcd, hzl} from './../../api/zd' |
| 75 | import {Message} from 'element-ui' | 75 | import {Message} from 'element-ui' |
| 76 | 76 | ||
| 77 | export default { | 77 | export default { |
| 78 | name: "hCxlz", | 78 | name: "hCxlz", |
| 79 | components: {queryData}, | 79 | components: {zdQueryData}, |
| 80 | data() { | 80 | data() { |
| 81 | return { | 81 | return { |
| 82 | zd: {}, | 82 | zd: {}, | ... | ... |
| ... | @@ -48,6 +48,9 @@ | ... | @@ -48,6 +48,9 @@ |
| 48 | active_color: item.expand, | 48 | active_color: item.expand, |
| 49 | }" | 49 | }" |
| 50 | > | 50 | > |
| 51 | <span v-if="item.qszt=='0'" style="color:red">(临)</span> | ||
| 52 | <span v-if="item.qszt=='1'" style="color:green">(正)</span> | ||
| 53 | <span v-if="item.qszt=='2'" style="color:blue">(现)</span> | ||
| 51 | {{ item.mc }} | 54 | {{ item.mc }} |
| 52 | </div> | 55 | </div> |
| 53 | </div> | 56 | </div> |
| ... | @@ -97,7 +100,7 @@ export default { | ... | @@ -97,7 +100,7 @@ export default { |
| 97 | } | 100 | } |
| 98 | }, | 101 | }, |
| 99 | mounted(){ | 102 | mounted(){ |
| 100 | 103 | ||
| 101 | }, | 104 | }, |
| 102 | methods: { | 105 | methods: { |
| 103 | itemClick(item) { | 106 | itemClick(item) { |
| ... | @@ -229,6 +232,10 @@ export default { | ... | @@ -229,6 +232,10 @@ export default { |
| 229 | width: 100%; | 232 | width: 100%; |
| 230 | cursor: pointer; | 233 | cursor: pointer; |
| 231 | } | 234 | } |
| 235 | // .ofy_scroll{ | ||
| 236 | // overflow-y: scroll; | ||
| 237 | // overflow-x: hidden; | ||
| 238 | // } | ||
| 232 | .basic_layer { | 239 | .basic_layer { |
| 233 | width: 100%; | 240 | width: 100%; |
| 234 | position: relative; | 241 | position: relative; |
| ... | @@ -261,7 +268,7 @@ export default { | ... | @@ -261,7 +268,7 @@ export default { |
| 261 | position: relative; | 268 | position: relative; |
| 262 | // padding-bottom: 15px; | 269 | // padding-bottom: 15px; |
| 263 | width: 100%; | 270 | width: 100%; |
| 264 | padding-left: 40px; | 271 | padding-left: 25px; |
| 265 | } | 272 | } |
| 266 | .white_layer { | 273 | .white_layer { |
| 267 | color: black!important; | 274 | color: black!important; |
| ... | @@ -272,19 +279,21 @@ export default { | ... | @@ -272,19 +279,21 @@ export default { |
| 272 | position: absolute; | 279 | position: absolute; |
| 273 | height: 1px; | 280 | height: 1px; |
| 274 | width: 16px; | 281 | width: 16px; |
| 275 | left: 9px; | 282 | left: 8px; |
| 276 | top: 9px; | 283 | top: 8px; |
| 277 | background: url('../../assets/images/rowline.png'); | 284 | opacity: .5; |
| 285 | background: url('../../assets/images/rowline1.png'); | ||
| 278 | background-position-y: center; | 286 | background-position-y: center; |
| 279 | } | 287 | } |
| 280 | .third_layer::before { | 288 | .third_layer::before { |
| 281 | content: ""; | 289 | content: ""; |
| 282 | position: absolute; | 290 | position: absolute; |
| 283 | height: 1px; | 291 | height: 1px; |
| 284 | width: 22px; | 292 | width: 16px; |
| 285 | left: 9px; | 293 | left: 8px; |
| 286 | top: 9px; | 294 | top: 8px; |
| 287 | background: url('../../assets/images/rowline.png'); | 295 | opacity: .5; |
| 296 | background: url('../../assets/images/rowline1.png'); | ||
| 288 | background-position-y: center; | 297 | background-position-y: center; |
| 289 | } | 298 | } |
| 290 | 299 | ||
| ... | @@ -295,7 +304,8 @@ export default { | ... | @@ -295,7 +304,8 @@ export default { |
| 295 | width: 1px; | 304 | width: 1px; |
| 296 | left: 7px; | 305 | left: 7px; |
| 297 | top: 0px; | 306 | top: 0px; |
| 298 | background: url('../../assets/images/colline.png'); | 307 | opacity: .5; |
| 308 | background: url('../../assets/images/colline1.png'); | ||
| 299 | background-position-x: center; | 309 | background-position-x: center; |
| 300 | } | 310 | } |
| 301 | .linkLine_first::after { | 311 | .linkLine_first::after { |
| ... | @@ -306,18 +316,20 @@ export default { | ... | @@ -306,18 +316,20 @@ export default { |
| 306 | height: calc(100% + 14px); | 316 | height: calc(100% + 14px); |
| 307 | width: 1px; | 317 | width: 1px; |
| 308 | left: 7px; | 318 | left: 7px; |
| 309 | background: url('../../assets/images/colline.png'); | 319 | opacity: .5; |
| 320 | background: url('../../assets/images/colline1.png'); | ||
| 310 | background-position-x: center; | 321 | background-position-x: center; |
| 311 | } | 322 | } |
| 312 | // 上半截 | 323 | // 上半截 |
| 313 | .linkLine_half_top::after { | 324 | .linkLine_half_top::after { |
| 314 | content: ""; | 325 | content: ""; |
| 315 | position: absolute; | 326 | position: absolute; |
| 316 | height: 24px; | 327 | height: 23px; |
| 317 | top: -14px; | 328 | top: -14px; |
| 318 | width: 1px; | 329 | width: 1px; |
| 319 | left: 7px; | 330 | left: 7px; |
| 320 | background: url('../../assets/images/colline.png'); | 331 | opacity: .5; |
| 332 | background: url('../../assets/images/colline1.png'); | ||
| 321 | background-position-x: center; | 333 | background-position-x: center; |
| 322 | } | 334 | } |
| 323 | .linkLine_last::after { | 335 | .linkLine_last::after { |
| ... | @@ -327,28 +339,33 @@ export default { | ... | @@ -327,28 +339,33 @@ export default { |
| 327 | width: 1px; | 339 | width: 1px; |
| 328 | left: 7px; | 340 | left: 7px; |
| 329 | top: 0px; | 341 | top: 0px; |
| 330 | background: url('../../assets/images/colline.png'); | 342 | opacity: .5; |
| 343 | background: url('../../assets/images/colline1.png'); | ||
| 331 | background-position-x: center; | 344 | background-position-x: center; |
| 332 | } | 345 | } |
| 333 | .reTree_collapse_icon { | 346 | .reTree_collapse_icon { |
| 347 | // opacity: .5; | ||
| 334 | background: url("../../assets/images/reTree_collapse_.svg") no-repeat center | 348 | background: url("../../assets/images/reTree_collapse_.svg") no-repeat center |
| 335 | center; | 349 | center; |
| 336 | background-size: contain; | 350 | background-size: contain; |
| 337 | } | 351 | } |
| 338 | 352 | ||
| 339 | .reTree_default_icon { | 353 | .reTree_default_icon { |
| 354 | // opacity: .5; | ||
| 340 | background: url("../../assets/images/reTree_default_.svg") no-repeat center | 355 | background: url("../../assets/images/reTree_default_.svg") no-repeat center |
| 341 | center; | 356 | center; |
| 342 | background-size: contain; | 357 | background-size: contain; |
| 343 | } | 358 | } |
| 344 | 359 | ||
| 345 | .reTree_expand_icon { | 360 | .reTree_expand_icon { |
| 361 | // opacity: .5; | ||
| 346 | background: url("../../assets/images/reTree_expand_.svg") no-repeat center | 362 | background: url("../../assets/images/reTree_expand_.svg") no-repeat center |
| 347 | center; | 363 | center; |
| 348 | background-size: contain; | 364 | background-size: contain; |
| 349 | } | 365 | } |
| 350 | 366 | ||
| 351 | .reTree_focus_icon { | 367 | .reTree_focus_icon { |
| 368 | // opacity: .5; | ||
| 352 | background: url("../../assets/images/reTree_focus_.svg") no-repeat center | 369 | background: url("../../assets/images/reTree_focus_.svg") no-repeat center |
| 353 | center; | 370 | center; |
| 354 | background-size: contain; | 371 | background-size: contain; | ... | ... |
| ... | @@ -27,7 +27,7 @@ | ... | @@ -27,7 +27,7 @@ |
| 27 | reTree_collapse_icon: item.expand && item.children.length > 0, | 27 | reTree_collapse_icon: item.expand && item.children.length > 0, |
| 28 | reTree_expand_icon: !item.expand && item.children.length > 0, | 28 | reTree_expand_icon: !item.expand && item.children.length > 0, |
| 29 | }" | 29 | }" |
| 30 | ></div> | 30 | ></div> |
| 31 | <div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)">{{ item.mc }}</div> | 31 | <div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)">{{ item.mc }}</div> |
| 32 | </div> | 32 | </div> |
| 33 | 33 | ||
| ... | @@ -62,7 +62,8 @@ | ... | @@ -62,7 +62,8 @@ |
| 62 | <li v-show="isZD">导入属性</li> | 62 | <li v-show="isZD">导入属性</li> |
| 63 | <li v-show="!isZD">导入楼盘</li> | 63 | <li v-show="!isZD">导入楼盘</li> |
| 64 | <li>重叠分析</li> | 64 | <li>重叠分析</li> |
| 65 | <li v-show="isZD" @click="openCreateDialog">添加定着物</li> | 65 | <li v-show="isZD && (zdQszt == '1' || zdQszt == '2')" @click="openCreateDialog">添加定着物</li> |
| 66 | <li v-show="isZD && (zdQszt != '1' && zdQszt != '2')" class="noEdit">添加定着物</li> | ||
| 66 | <li @click="deleteByBsm()">删除</li> | 67 | <li @click="deleteByBsm()">删除</li> |
| 67 | </ul> | 68 | </ul> |
| 68 | <ul | 69 | <ul |
| ... | @@ -93,7 +94,6 @@ | ... | @@ -93,7 +94,6 @@ |
| 93 | <import-geo :property-info="zdData" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> | 94 | <import-geo :property-info="zdData" :geo-info="currentClickZdGeo" @closeImportDialog="closeImportDialog"></import-geo> |
| 94 | </el-dialog> | 95 | </el-dialog> |
| 95 | <!-- 添加定着物弹框 --> | 96 | <!-- 添加定着物弹框 --> |
| 96 | |||
| 97 | <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> | 97 | <el-dialog title="新建" :visible.sync="dialogVisible" width="40%"> |
| 98 | <Create @closeDialog="closeDialog" :auth="true"></Create> | 98 | <Create @closeDialog="closeDialog" :auth="true"></Create> |
| 99 | </el-dialog> | 99 | </el-dialog> |
| ... | @@ -141,7 +141,9 @@ export default { | ... | @@ -141,7 +141,9 @@ export default { |
| 141 | //控制新建宗地菜单 | 141 | //控制新建宗地菜单 |
| 142 | createVisible:false, | 142 | createVisible:false, |
| 143 | //多幢 | 143 | //多幢 |
| 144 | dzVisible:false | 144 | dzVisible:false, |
| 145 | //宗地权属状态 | ||
| 146 | zdQszt:null, | ||
| 145 | }; | 147 | }; |
| 146 | }, | 148 | }, |
| 147 | watch: { | 149 | watch: { |
| ... | @@ -149,7 +151,7 @@ export default { | ... | @@ -149,7 +151,7 @@ export default { |
| 149 | this.formatData = this.preDealData(n); | 151 | this.formatData = this.preDealData(n); |
| 150 | console.log(this.formatData); | 152 | console.log(this.formatData); |
| 151 | }, | 153 | }, |
| 152 | 154 | ||
| 153 | lpbvisible(value) { | 155 | lpbvisible(value) { |
| 154 | if (value) { | 156 | if (value) { |
| 155 | document.body.addEventListener("click", this.closeMenu); | 157 | document.body.addEventListener("click", this.closeMenu); |
| ... | @@ -185,7 +187,8 @@ export default { | ... | @@ -185,7 +187,8 @@ export default { |
| 185 | this.visible = data; | 187 | this.visible = data; |
| 186 | }, | 188 | }, |
| 187 | changeZdData(data) { | 189 | changeZdData(data) { |
| 188 | this.zdData = data | 190 | this.zdData = data; |
| 191 | this.zdQszt = data.qszt; | ||
| 189 | }, | 192 | }, |
| 190 | changeTop(data) { | 193 | changeTop(data) { |
| 191 | this.top = data; | 194 | this.top = data; |
| ... | @@ -301,7 +304,7 @@ export default { | ... | @@ -301,7 +304,7 @@ export default { |
| 301 | }, | 304 | }, |
| 302 | //楼盘表右键菜单项打开父组件弹框 | 305 | //楼盘表右键菜单项打开父组件弹框 |
| 303 | openLpbDialog(type){ | 306 | openLpbDialog(type){ |
| 304 | this.$parent.openLpbDialog(this.zdData,type); | 307 | this.$parent.openLpbDialog(this.zdData,type); |
| 305 | }, | 308 | }, |
| 306 | detailDoubleClick(data) { | 309 | detailDoubleClick(data) { |
| 307 | clearTimeout(this.timer); | 310 | clearTimeout(this.timer); |
| ... | @@ -310,102 +313,131 @@ export default { | ... | @@ -310,102 +313,131 @@ export default { |
| 310 | }, | 313 | }, |
| 311 | //右键菜单的删除 | 314 | //右键菜单的删除 |
| 312 | deleteByBsm(){ | 315 | deleteByBsm(){ |
| 313 | var self = this; | 316 | let name=''; |
| 314 | let params={"bsm":this.zdData.bsm,"type":this.zdData.type}; | 317 | switch (this.zdData.type) { |
| 315 | if(this.zdData.type=='zd'){ | 318 | case 'zd': |
| 316 | params={"bsm":this.zdData.zdbsm,"type":this.zdData.type}; | 319 | name = '宗地' |
| 320 | break; | ||
| 321 | case 'dz': | ||
| 322 | name = '多幢' | ||
| 323 | break; | ||
| 324 | case 'zrz': | ||
| 325 | name = '自然幢' | ||
| 326 | break; | ||
| 327 | |||
| 328 | default: | ||
| 329 | break; | ||
| 317 | } | 330 | } |
| 318 | deleteZdInfoByBsm(params) | 331 | this.$confirm('是否确定删除该'+name+'?', '提示', { |
| 319 | .then((res) => { | 332 | confirmButtonText: '确定', |
| 320 | if(res.code=200){ | 333 | cancelButtonText: '取消', |
| 321 | this.$message({ | 334 | type: 'warning' |
| 322 | message: res.message, | 335 | }).then(() => { |
| 323 | type: "success", | 336 | let params={"bsm":this.zdData.bsm,"type":this.zdData.type}; |
| 324 | }); | 337 | deleteZdInfoByBsm(params) |
| 325 | } else { | 338 | .then((res) => { |
| 326 | this.$message({ | 339 | console.log(res); |
| 327 | message: res.message, | 340 | if(res.success){ |
| 328 | type: "warning", | 341 | this.$message({ |
| 329 | }); | 342 | type: 'success', |
| 330 | } | 343 | message: '删除成功!' |
| 331 | }) | 344 | }); |
| 332 | .catch((error) => {}); | 345 | this.$router.push("/panel"); |
| 333 | //删除图形相关信息 | 346 | } else { |
| 334 | var type = this.zdData.type; | 347 | this.$message({ |
| 335 | this.queryGeoByBsm(BSM,type,function (features){ | 348 | message: res.message, |
| 336 | if(features && features.length > 0){ | 349 | type: "warning", |
| 337 | var layer = null; | 350 | }); |
| 338 | if(type == 'zd'){ | 351 | } |
| 339 | layer = self.getLayerByName("ZDJBXX"); | 352 | }) |
| 340 | }else{ | 353 | .catch((error) => {}); |
| 341 | layer = self.getLayerByName("ZRZ"); | 354 | }).catch(() => { |
| 342 | 355 | ||
| 343 | } | ||
| 344 | var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer"); | ||
| 345 | featureUrl += "/"+layer.id; | ||
| 346 | self.delGraphic(featureUrl,features[0],null); | ||
| 347 | } | ||
| 348 | }); | 356 | }); |
| 357 | var self = this; | ||
| 358 | var BSM = ""; | ||
| 359 | var type = this.zdData.type; | ||
| 360 | if(type == "zd"){ | ||
| 361 | BSM = this.zdData.zdbsm; | ||
| 362 | }else { | ||
| 363 | BSM = this.zdData.bsm; | ||
| 364 | } | ||
| 365 | //删除图形相关信息 | ||
| 366 | var type = this.zdData.type; | ||
| 367 | this.queryGeoByBsm(BSM,type,function (features){ | ||
| 368 | if(features && features.length > 0){ | ||
| 369 | var layer = null; | ||
| 370 | if(type == 'zd'){ | ||
| 371 | layer = self.getLayerByName("ZDJBXX"); | ||
| 372 | }else{ | ||
| 373 | layer = self.getLayerByName("ZRZ"); | ||
| 374 | |||
| 375 | } | ||
| 376 | var featureUrl = layer.layerUrl.replace("MapServer","FeatureServer"); | ||
| 377 | featureUrl += "/"+layer.id; | ||
| 378 | self.delGraphic(featureUrl,features[0],null); | ||
| 379 | } | ||
| 380 | }); | ||
| 349 | }, | 381 | }, |
| 350 | /* | 382 | /* |
| 351 | * 导入图形 | 383 | * 导入图形 |
| 352 | * */ | 384 | * */ |
| 353 | importGeo(){ | 385 | importGeo(){ |
| 354 | var self = this; | 386 | var self = this; |
| 355 | var BSM = ""; | 387 | var BSM = ""; |
| 356 | //先这么写着 后面返回类型 根据类型判断 | 388 | //先这么写着 后面返回类型 根据类型判断 |
| 357 | var type = this.zdData.type; | 389 | var type = this.zdData.type; |
| 358 | if(type == "zd"){ | 390 | if(type == "zd"){ |
| 359 | BSM = this.zdData.zdbsm; | 391 | BSM = this.zdData.zdbsm; |
| 360 | }else { | ||
| 361 | BSM = this.zdData.bsm; | ||
| 362 | } | ||
| 363 | this.queryGeoByBsm(BSM,type,function (features){ | ||
| 364 | if(features && features.length > 0){ | ||
| 365 | if(features[0].geometry){ | ||
| 366 | self.$confirm('该条数据有地块信息，是否继续导入?', '提示', { | ||
| 367 | confirmButtonText: '继续', | ||
| 368 | cancelButtonText: '取消', | ||
| 369 | type: 'warning' | ||
| 370 | }).then(() => { | ||
| 371 | self.improtDialog = true; | ||
| 372 | self.currentClickZdGeo = features[0]; | ||
| 373 | }).catch(() => { | ||
| 374 | self.$message({ | ||
| 375 | type: 'info', | ||
| 376 | message: '已取消' | ||
| 377 | }); | ||
| 378 | }); | ||
| 379 | }else { | 392 | }else { |
| 380 | self.currentClickZdGeo = features[0]; | 393 | BSM = this.zdData.bsm; |
| 381 | self.improtDialog = true; | ||
| 382 | } | 394 | } |
| 395 | this.queryGeoByBsm(BSM,type,function (features){ | ||
| 396 | if(features && features.length > 0){ | ||
| 397 | if(features[0].geometry){ | ||
| 398 | self.$confirm('该条数据有地块信息，是否继续导入?', '提示', { | ||
| 399 | confirmButtonText: '继续', | ||
| 400 | cancelButtonText: '取消', | ||
| 401 | type: 'warning' | ||
| 402 | }).then(() => { | ||
| 403 | self.improtDialog = true; | ||
| 404 | self.currentClickZdGeo = features[0]; | ||
| 405 | }).catch(() => { | ||
| 406 | self.$message({ | ||
| 407 | type: 'info', | ||
| 408 | message: '已取消' | ||
| 409 | }); | ||
| 410 | }); | ||
| 411 | }else { | ||
| 412 | self.currentClickZdGeo = features[0]; | ||
| 413 | self.improtDialog = true; | ||
| 414 | } | ||
| 383 | 415 | ||
| 384 | }else{ | 416 | }else{ |
| 385 | self.currentClickZdGeo = null; | 417 | self.currentClickZdGeo = null; |
| 386 | self.improtDialog = true; | 418 | self.improtDialog = true; |
| 387 | } | 419 | } |
| 388 | }); | 420 | }); |
| 389 | }, | 421 | }, |
| 390 | //导出 | 422 | //导出 |
| 391 | exportToShp(){ | 423 | exportToShp(){ |
| 392 | var self = this; | 424 | var self = this; |
| 393 | var BSM = this.zdData.zdbsm; | 425 | var BSM = this.zdData.zdbsm; |
| 394 | var type = this.zdData.type; | 426 | var type = this.zdData.type; |
| 395 | this.queryGeoByBsm(BSM,type,function (features){ | 427 | this.queryGeoByBsm(BSM,type,function (features){ |
| 396 | var data = JSON.stringify(features[0]); | 428 | var data = JSON.stringify(features[0]); |
| 397 | if(features && features.length > 0){ | 429 | if(features && features.length > 0){ |
| 398 | window.location.href = "/api/tx/shpUtils/writeShp?strObj="+encodeURI(data) | 430 | window.location.href = "/api/tx/shpUtils/writeShp?strObj="+encodeURI(data) |
| 399 | /*exportShp({ | 431 | /*exportShp({ |
| 400 | "strObj":encodeURI(data) | 432 | "strObj":encodeURI(data) |
| 401 | }).then(res => { | 433 | }).then(res => { |
| 402 | debugger | 434 | debugger |
| 403 | });*/ | 435 | });*/ |
| 404 | }else{ | 436 | }else{ |
| 405 | self.$message.warning("暂无空间信息!!!!"); | 437 | self.$message.warning("暂无空间信息!!!!"); |
| 406 | } | 438 | } |
| 407 | }); | 439 | }); |
| 408 | }, | 440 | }, |
| 409 | //图形定位 | 441 | //图形定位 |
| 410 | postionToMap(){ | 442 | postionToMap(){ |
| 411 | var curretRouterInfo = { | 443 | var curretRouterInfo = { |
| ... | @@ -475,7 +507,6 @@ export default { | ... | @@ -475,7 +507,6 @@ export default { |
| 475 | position: relative; | 507 | position: relative; |
| 476 | color: #ffffff; | 508 | color: #ffffff; |
| 477 | cursor: pointer; | 509 | cursor: pointer; |
| 478 | moz-user-select: -moz-none; | ||
| 479 | -moz-user-select: none; | 510 | -moz-user-select: none; |
| 480 | -o-user-select: none; | 511 | -o-user-select: none; |
| 481 | -khtml-user-select: none; | 512 | -khtml-user-select: none; | ... | ... |
src/components/moveH/moveH.vue
0 → 100644
| 1 | <template> | ||
| 2 | <div> | ||
| 3 | <el-dialog | ||
| 4 | title="移动户" | ||
| 5 | :visible.sync="isVisible" | ||
| 6 | width="50%" | ||
| 7 | @close="close" | ||
| 8 | :modal-append-to-body="false" | ||
| 9 | center> | ||
| 10 | <div> | ||
| 11 | <div class="bottom-radio"> | ||
| 12 | <el-radio-group v-model="moveHdata.sxzylx"> | ||
| 13 | <el-radio label="up">向上</el-radio> | ||
| 14 | <el-radio label="down">向下</el-radio> | ||
| 15 | <el-radio label="left">向左</el-radio> | ||
| 16 | <el-radio label="right">向右</el-radio> | ||
| 17 | </el-radio-group> | ||
| 18 | </div> | ||
| 19 | <div class="bottom-buttom"> | ||
| 20 | <el-button type="primary" @click="save">确认</el-button> | ||
| 21 | <el-button type="primary" @click="cacel">取消</el-button> | ||
| 22 | </div> | ||
| 23 | </div> | ||
| 24 | </el-dialog> | ||
| 25 | </div> | ||
| 26 | </template> | ||
| 27 | |||
| 28 | <script> | ||
| 29 | import {moveH} from './../../api/lpb' | ||
| 30 | import {Message} from 'element-ui' | ||
| 31 | |||
| 32 | export default { | ||
| 33 | name: "moveH", | ||
| 34 | data() { | ||
| 35 | return { | ||
| 36 | isVisible: false, | ||
| 37 | moveHdata: { | ||
| 38 | hbsm: "", | ||
| 39 | sxzylx: "", | ||
| 40 | type: "" | ||
| 41 | } | ||
| 42 | } | ||
| 43 | }, | ||
| 44 | props: { | ||
| 45 | moveHvisible: { | ||
| 46 | type: Boolean, | ||
| 47 | default: false | ||
| 48 | }, | ||
| 49 | hbsm: { | ||
| 50 | type: String | ||
| 51 | }, | ||
| 52 | type: { | ||
| 53 | type: String | ||
| 54 | } | ||
| 55 | }, | ||
| 56 | methods: { | ||
| 57 | loading: function () { | ||
| 58 | this.$emit('loading') | ||
| 59 | }, | ||
| 60 | save() { | ||
| 61 | this.moveHdata.hbsm = this.hbsm | ||
| 62 | this.moveHdata.type = this.type | ||
| 63 | moveH(this.moveHdata).then(res => { | ||
| 64 | console.log(res) | ||
| 65 | if (res.success) { | ||
| 66 | this.loading(); | ||
| 67 | this.close(); | ||
| 68 | Message.success("移动成功") | ||
| 69 | } else { | ||
| 70 | Message.error(res.message) | ||
| 71 | } | ||
| 72 | }) | ||
| 73 | }, | ||
| 74 | cacel() { | ||
| 75 | this.close() | ||
| 76 | }, | ||
| 77 | close() { | ||
| 78 | this.$emit('close'); | ||
| 79 | } | ||
| 80 | }, | ||
| 81 | watch: { | ||
| 82 | moveHvisible(val) { | ||
| 83 | this.isVisible = val | ||
| 84 | } | ||
| 85 | } | ||
| 86 | } | ||
| 87 | </script> | ||
| 88 | |||
| 89 | <style scoped lang="less"> | ||
| 90 | .bottom-radio{ | ||
| 91 | text-align: center; | ||
| 92 | } | ||
| 93 | .el-radio{ | ||
| 94 | padding: 20px; | ||
| 95 | } | ||
| 96 | .bottom-buttom { | ||
| 97 | margin-top: 20px; | ||
| 98 | text-align: center; | ||
| 99 | } | ||
| 100 | </style> |
| ... | @@ -10,51 +10,51 @@ | ... | @@ -10,51 +10,51 @@ |
| 10 | <div> | 10 | <div> |
| 11 | <table border="1"> | 11 | <table border="1"> |
| 12 | <tr> | 12 | <tr> |
| 13 | <td>层建筑面积</td> | 13 | <td>层建筑面积(㎡)</td> |
| 14 | <td> | 14 | <td> |
| 15 | <input type="text" v-model="qlcData.cjzmj" class="inputtitle"/> | 15 | <el-input v-model="qlcData.cjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层建筑面积(㎡)"></el-input> |
| 16 | </td> | 16 | </td> |
| 17 | <td> | 17 | <td> |
| 18 | 层套内建筑面积 | 18 | 层套内建筑面积(㎡) |
| 19 | </td> | 19 | </td> |
| 20 | <td> | 20 | <td> |
| 21 | <input text="text" v-model="qlcData.ctnjzmj" class="inputtitle"/> | 21 | <el-input v-model="qlcData.ctnjzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层套内建筑面积(㎡)" ></el-input> |
| 22 | </td> | 22 | </td> |
| 23 | </tr> | 23 | </tr> |
| 24 | <tr> | 24 | <tr> |
| 25 | <td>层阳台面积</td> | 25 | <td>层阳台面积(㎡)</td> |
| 26 | <td> | 26 | <td> |
| 27 | <input type="text" v-model="qlcData.cytmj" class="inputtitle"/> | 27 | <el-input v-model="qlcData.cytmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层阳台面积(㎡)"></el-input> |
| 28 | </td> | 28 | </td> |
| 29 | <td> | 29 | <td> |
| 30 | 层半墙面积 | 30 | 层半墙面积(㎡) |
| 31 | </td> | 31 | </td> |
| 32 | <td> | 32 | <td> |
| 33 | <input text="text" v-model="qlcData.cbqmj" class="inputtitle"/> | 33 | <el-input v-model="qlcData.cbqmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层半墙面积(㎡)"></el-input> |
| 34 | </td> | 34 | </td> |
| 35 | </tr> | 35 | </tr> |
| 36 | <tr> | 36 | <tr> |
| 37 | <td>层共有建筑面积(㎡)</td> | 37 | <td>层共有建筑面积(㎡)</td> |
| 38 | <td> | 38 | <td> |
| 39 | <input type="text" v-model="qlcData.cgyjzmj" class="inputtitle"/> | 39 | <el-input v-model="qlcData.cgyjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层共有建筑面积(㎡)"></el-input> |
| 40 | </td> | 40 | </td> |
| 41 | <td> | 41 | <td> |
| 42 | 层分摊建筑面积(㎡) | 42 | 层分摊建筑面积(㎡) |
| 43 | </td> | 43 | </td> |
| 44 | <td> | 44 | <td> |
| 45 | <input text="text" v-model="qlcData.cftjzmj" class="inputtitle"/> | 45 | <el-input v-model="qlcData.cftjzmj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层分摊建筑面积(㎡)"></el-input> |
| 46 | </td> | 46 | </td> |
| 47 | </tr> | 47 | </tr> |
| 48 | <tr> | 48 | <tr> |
| 49 | <td>层高</td> | 49 | <td>层高(m)</td> |
| 50 | <td> | 50 | <td> |
| 51 | <input type="text" v-model="qlcData.cg" class="inputtitle"/> | 51 | <el-input v-model="qlcData.cg" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="层高(m)"></el-input> |
| 52 | </td> | 52 | </td> |
| 53 | <td> | 53 | <td> |
| 54 | 水平投影面积(㎡) | 54 | 水平投影面积(㎡) |
| 55 | </td> | 55 | </td> |
| 56 | <td> | 56 | <td> |
| 57 | <input text="text" v-model="qlcData.sptymj" class="inputtitle"/> | 57 | <el-input v-model="qlcData.sptymj" class="" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="水平投影面积(㎡)"></el-input> |
| 58 | </td> | 58 | </td> |
| 59 | </tr> | 59 | </tr> |
| 60 | </table> | 60 | </table> |
| ... | @@ -101,12 +101,16 @@ | ... | @@ -101,12 +101,16 @@ |
| 101 | } | 101 | } |
| 102 | }, | 102 | }, |
| 103 | methods: { | 103 | methods: { |
| 104 | lodding:function(){ | ||
| 105 | this.$emit('lodding') | ||
| 106 | }, | ||
| 104 | save: function () { | 107 | save: function () { |
| 105 | this.qlcData['bsms'] = this.bsms | 108 | this.qlcData['bsms'] = this.bsms |
| 106 | updatePlc(this.qlcData).then(res => { | 109 | updatePlc(this.qlcData).then(res => { |
| 107 | console.log(res) | 110 | console.log(res) |
| 108 | if (res.success) { | 111 | if (res.success) { |
| 109 | Message.success("保存成功") | 112 | Message.success("保存成功") |
| 113 | this.lodding() | ||
| 110 | this.close() | 114 | this.close() |
| 111 | } else { | 115 | } else { |
| 112 | Message.error(res.message) | 116 | Message.error(res.message) | ... | ... |
| ... | @@ -313,6 +313,9 @@ | ... | @@ -313,6 +313,9 @@ |
| 313 | } | 313 | } |
| 314 | }, | 314 | }, |
| 315 | methods: { | 315 | methods: { |
| 316 | lodding:function(){ | ||
| 317 | this.$emit('lodding') | ||
| 318 | }, | ||
| 316 | addYtInfo(){ | 319 | addYtInfo(){ |
| 317 | this.form.fwytList.push({ | 320 | this.form.fwytList.push({ |
| 318 | glbsm:'', | 321 | glbsm:'', |
| ... | @@ -367,6 +370,7 @@ | ... | @@ -367,6 +370,7 @@ |
| 367 | console.log(this.form) | 370 | console.log(this.form) |
| 368 | batchUpdateQjH(this.form).then((res)=>{ | 371 | batchUpdateQjH(this.form).then((res)=>{ |
| 369 | if(res.code===200){ | 372 | if(res.code===200){ |
| 373 | this.lodding() | ||
| 370 | this.$message.success("保存成功！") | 374 | this.$message.success("保存成功！") |
| 371 | } | 375 | } |
| 372 | }) | 376 | }) | ... | ... |
| ... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
| 12 | <table border="1"> | 12 | <table border="1"> |
| 13 | <tr> | 13 | <tr> |
| 14 | <td>室号前缀</td> | 14 | <td>室号前缀</td> |
| 15 | <td>单元号</td> | 15 | <td>幢单元号</td> |
| 16 | <td>分割符A</td> | 16 | <td>分割符A</td> |
| 17 | <td>层号前自动补0</td> | 17 | <td>层号前自动补0</td> |
| 18 | <td>层</td> | 18 | <td>层</td> |
| ... | @@ -25,13 +25,13 @@ | ... | @@ -25,13 +25,13 @@ |
| 25 | <input type="text" class="inputtitle" v-model="plshData.shqz"/> | 25 | <input type="text" class="inputtitle" v-model="plshData.shqz"/> |
| 26 | </td> | 26 | </td> |
| 27 | <td> | 27 | <td> |
| 28 | <el-checkbox v-model="plshData.isSelectDyh"></el-checkbox> | 28 | <el-checkbox v-model="plshData.selectDyh"></el-checkbox> |
| 29 | </td> | 29 | </td> |
| 30 | <td> | 30 | <td> |
| 31 | <input type="text" class="inputtitle" v-model="plshData.fgfA"/> | 31 | <input type="text" class="inputtitle" v-model="plshData.fgfA"/> |
| 32 | </td> | 32 | </td> |
| 33 | <td> | 33 | <td> |
| 34 | <el-checkbox v-model="plshData.isChqbl"></el-checkbox> | 34 | <el-checkbox v-model="plshData.chqbl"></el-checkbox> |
| 35 | </td> | 35 | </td> |
| 36 | <td> | 36 | <td> |
| 37 | <el-select v-model="plshData.c"> | 37 | <el-select v-model="plshData.c"> |
| ... | @@ -112,9 +112,9 @@ | ... | @@ -112,9 +112,9 @@ |
| 112 | xlVisible: false, | 112 | xlVisible: false, |
| 113 | plshData: { | 113 | plshData: { |
| 114 | shqz: '', | 114 | shqz: '', |
| 115 | isSelectDyh: false, | 115 | selectDyh: false, |
| 116 | fgfA: '', | 116 | fgfA: '', |
| 117 | isChqbl: false, | 117 | chqbl: false, |
| 118 | c: '', | 118 | c: '', |
| 119 | fgfB: '', | 119 | fgfB: '', |
| 120 | shhz: '' | 120 | shhz: '' |
| ... | @@ -133,6 +133,9 @@ | ... | @@ -133,6 +133,9 @@ |
| 133 | } | 133 | } |
| 134 | }, | 134 | }, |
| 135 | methods: { | 135 | methods: { |
| 136 | lodding:function(){ | ||
| 137 | this.$emit('lodding') | ||
| 138 | }, | ||
| 136 | xl: function () { | 139 | xl: function () { |
| 137 | this.xlVisible = true; | 140 | this.xlVisible = true; |
| 138 | }, | 141 | }, |
| ... | @@ -144,9 +147,9 @@ | ... | @@ -144,9 +147,9 @@ |
| 144 | result: function () { | 147 | result: function () { |
| 145 | this.plshData = { | 148 | this.plshData = { |
| 146 | shqz: '', | 149 | shqz: '', |
| 147 | isSelectDyh: false, | 150 | selectDyh: false, |
| 148 | fgfA: '', | 151 | fgfA: '', |
| 149 | isChqbl: false, | 152 | chqbl: false, |
| 150 | c: '', | 153 | c: '', |
| 151 | fgfB: '', | 154 | fgfB: '', |
| 152 | shhz: '' | 155 | shhz: '' |
| ... | @@ -154,10 +157,11 @@ | ... | @@ -154,10 +157,11 @@ |
| 154 | }, | 157 | }, |
| 155 | save: function () { | 158 | save: function () { |
| 156 | this.plshData['bsms'] = this.bsms | 159 | this.plshData['bsms'] = this.bsms |
| 157 | console.log(this.plshData) | ||
| 158 | updateSh(this.plshData).then(res => { | 160 | updateSh(this.plshData).then(res => { |
| 159 | if (res.success) { | 161 | if (res.success) { |
| 162 | this.lodding(); | ||
| 160 | this.close(); | 163 | this.close(); |
| 164 | |||
| 161 | } else { | 165 | } else { |
| 162 | Message.error(res.message) | 166 | Message.error(res.message) |
| 163 | } | 167 | } |
| ... | @@ -173,7 +177,7 @@ | ... | @@ -173,7 +177,7 @@ |
| 173 | if (this.plshData.shqz != "") { | 177 | if (this.plshData.shqz != "") { |
| 174 | gz += this.plshData.shqz | 178 | gz += this.plshData.shqz |
| 175 | } | 179 | } |
| 176 | if (this.plshData.isSelectDyh) { | 180 | if (this.plshData.selectDyh) { |
| 177 | gz += "[单元号]" | 181 | gz += "[单元号]" |
| 178 | } | 182 | } |
| 179 | if (this.plshData.fgfA != "") { | 183 | if (this.plshData.fgfA != "") { | ... | ... |
| ... | @@ -196,10 +196,14 @@ | ... | @@ -196,10 +196,14 @@ |
| 196 | } | 196 | } |
| 197 | }, | 197 | }, |
| 198 | methods: { | 198 | methods: { |
| 199 | lodding:function(){ | ||
| 200 | this.$emit('lodding') | ||
| 201 | }, | ||
| 199 | save: function () { | 202 | save: function () { |
| 200 | this.plzlData['bsms'] = this.bsms; | 203 | this.plzlData['bsms'] = this.bsms; |
| 201 | updateZl(this.plzlData).then(res => { | 204 | updateZl(this.plzlData).then(res => { |
| 202 | if (res.success) { | 205 | if (res.success) { |
| 206 | this.lodding() | ||
| 203 | this.close(); | 207 | this.close(); |
| 204 | } else { | 208 | } else { |
| 205 | Message.error(res.message) | 209 | Message.error(res.message) | ... | ... |
| ... | @@ -107,7 +107,7 @@ | ... | @@ -107,7 +107,7 @@ |
| 107 | bdcqzh: "", | 107 | bdcqzh: "", |
| 108 | dylxs: ['zd'], | 108 | dylxs: ['zd'], |
| 109 | qlrmc: "", | 109 | qlrmc: "", |
| 110 | qszt: "2", | 110 | qszt: ["2"], |
| 111 | xmmc: "", | 111 | xmmc: "", |
| 112 | zddm: "", | 112 | zddm: "", |
| 113 | zl: "", | 113 | zl: "", |
| ... | @@ -151,7 +151,7 @@ | ... | @@ -151,7 +151,7 @@ |
| 151 | bdcdyh: "", | 151 | bdcdyh: "", |
| 152 | bdcqzh: "", | 152 | bdcqzh: "", |
| 153 | qlrmc: "", | 153 | qlrmc: "", |
| 154 | qszt: "2", | 154 | qszt: ["2"], |
| 155 | xmmc: "", | 155 | xmmc: "", |
| 156 | zddm: "", | 156 | zddm: "", |
| 157 | zl: "", | 157 | zl: "", | ... | ... |
| ... | @@ -103,7 +103,7 @@ export default { | ... | @@ -103,7 +103,7 @@ export default { |
| 103 | bdcqzh: "", | 103 | bdcqzh: "", |
| 104 | dylxs: [], | 104 | dylxs: [], |
| 105 | qlrmc: "", | 105 | qlrmc: "", |
| 106 | qszt: "", | 106 | qszt: [], |
| 107 | xmmc: "", | 107 | xmmc: "", |
| 108 | zddm: "", | 108 | zddm: "", |
| 109 | zl: "", | 109 | zl: "", |
| ... | @@ -131,7 +131,7 @@ export default { | ... | @@ -131,7 +131,7 @@ export default { |
| 131 | bdcqzh: "", | 131 | bdcqzh: "", |
| 132 | dylxs: [], | 132 | dylxs: [], |
| 133 | qlrmc: "", | 133 | qlrmc: "", |
| 134 | qszt: "", | 134 | qszt: [], |
| 135 | xmmc: "", | 135 | xmmc: "", |
| 136 | zddm: "", | 136 | zddm: "", |
| 137 | zl: "", | 137 | zl: "", | ... | ... |
src/components/zdQueryData/zdQueryData.vue
0 → 100644
| 1 | <template> | ||
| 2 | <div> | ||
| 3 | <el-dialog | ||
| 4 | title="新增" | ||
| 5 | :visible.sync="isVisible" | ||
| 6 | width="50%" | ||
| 7 | @close="close" | ||
| 8 | :modal-append-to-body="false" | ||
| 9 | center> | ||
| 10 | <div class="search"> | ||
| 11 | <el-button type="primary" @click="search">查询</el-button> | ||
| 12 | <el-button type="primary" @click="result">重置</el-button> | ||
| 13 | <el-row :gutter="10" class="shop"> | ||
| 14 | <el-col :span="4" class="inputtitle"> | ||
| 15 | 宗地编码: | ||
| 16 | </el-col> | ||
| 17 | <el-col :span="8" class=""> | ||
| 18 | <el-input v-model="queryData.zddm"></el-input> | ||
| 19 | </el-col> | ||
| 20 | <el-col :span="4" class="inputtitle"> | ||
| 21 | 不动产权证号: | ||
| 22 | </el-col> | ||
| 23 | <el-col :span="8" class=""> | ||
| 24 | <el-input v-model="queryData.bdcqzh"></el-input> | ||
| 25 | </el-col> | ||
| 26 | </el-row> | ||
| 27 | <el-row :gutter="10"> | ||
| 28 | <el-col :span="4" class="inputtitle"> | ||
| 29 | 不动产权单元号: | ||
| 30 | </el-col> | ||
| 31 | <el-col :span="8"> | ||
| 32 | <el-input v-model="queryData.bdcdyh"></el-input> | ||
| 33 | </el-col> | ||
| 34 | <el-col :span="4" class="inputtitle"> | ||
| 35 | 权利人: | ||
| 36 | </el-col> | ||
| 37 | <el-col :span="8"> | ||
| 38 | <el-input v-model="queryData.qlrmc"></el-input> | ||
| 39 | </el-col> | ||
| 40 | </el-row> | ||
| 41 | <el-row :gutter="10"> | ||
| 42 | <el-col :span="4" class="inputtitle"> | ||
| 43 | 坐落: | ||
| 44 | </el-col> | ||
| 45 | <el-col :span="8"> | ||
| 46 | <el-input v-model="queryData.zl"></el-input> | ||
| 47 | </el-col> | ||
| 48 | </el-row> | ||
| 49 | <table border="1"> | ||
| 50 | <tr> | ||
| 51 | <td>序号</td> | ||
| 52 | <td>操作</td> | ||
| 53 | <td>宗地代码</td> | ||
| 54 | <td>不动产单元号</td> | ||
| 55 | <td>项目名称</td> | ||
| 56 | <td>不动产权证号</td> | ||
| 57 | <td>权利人</td> | ||
| 58 | <td>坐落</td> | ||
| 59 | </tr> | ||
| 60 | <tr v-if="Data.length==0"> | ||
| 61 | <td colspan="8"> | ||
| 62 | <span class="noData">暂无数据</span> | ||
| 63 | </td> | ||
| 64 | </tr> | ||
| 65 | <tr v-else v-for="(item,index) in Data" :key="index"> | ||
| 66 | <td>{{index+1}}</td> | ||
| 67 | <td @click="addData(item)" class="xz"> | ||
| 68 | <span>选择</span> | ||
| 69 | </td> | ||
| 70 | <td>{{item.zddm}}</td> | ||
| 71 | <td>{{item.bdcdyh}}</td> | ||
| 72 | <td>{{item.xmmc}}</td> | ||
| 73 | <td>{{item.bdcqzh}}</td> | ||
| 74 | <td>{{item.qlr}}</td> | ||
| 75 | <td>{{item.zl}}</td> | ||
| 76 | </tr> | ||
| 77 | |||
| 78 | </table> | ||
| 79 | </div> | ||
| 80 | <span slot="footer" class="dialog-footer"> | ||
| 81 | </span> | ||
| 82 | <div class="page"> | ||
| 83 | <el-pagination | ||
| 84 | background | ||
| 85 | layout="prev, pager, next,total" | ||
| 86 | :page-size="queryData.pageSize" | ||
| 87 | :total="total" | ||
| 88 | @current-change="currentChange" | ||
| 89 | > | ||
| 90 | </el-pagination> | ||
| 91 | </div> | ||
| 92 | </el-dialog> | ||
| 93 | |||
| 94 | </div> | ||
| 95 | </template> | ||
| 96 | |||
| 97 | <script> | ||
| 98 | import {zdlist} from './../../api/search' | ||
| 99 | |||
| 100 | export default { | ||
| 101 | name: "zdQueryData", | ||
| 102 | data() { | ||
| 103 | return { | ||
| 104 | total:1, | ||
| 105 | queryData: { | ||
| 106 | bdcdyh: "", | ||
| 107 | bdcqzh: "", | ||
| 108 | dylxs: ['zd'], | ||
| 109 | qlrmc: "", | ||
| 110 | qszt: ["2"], | ||
| 111 | xmmc: "", | ||
| 112 | zddm: "", | ||
| 113 | zl: "", | ||
| 114 | pageNo: 1, | ||
| 115 | pageSize: 10, | ||
| 116 | }, | ||
| 117 | Data: [], | ||
| 118 | isVisible: false | ||
| 119 | } | ||
| 120 | }, | ||
| 121 | props: { | ||
| 122 | centerDialogVisible: { | ||
| 123 | type: Boolean, | ||
| 124 | default: function () { | ||
| 125 | return false | ||
| 126 | } | ||
| 127 | }, | ||
| 128 | qszt:{ | ||
| 129 | type:Array, | ||
| 130 | default:function () { | ||
| 131 | return ['2'] | ||
| 132 | } | ||
| 133 | }, | ||
| 134 | isZdClose:{ | ||
| 135 | type:Boolean, | ||
| 136 | default:false | ||
| 137 | } | ||
| 138 | }, | ||
| 139 | mounted() { | ||
| 140 | this.getData(this.queryData) | ||
| 141 | }, | ||
| 142 | created() { | ||
| 143 | }, | ||
| 144 | methods: { | ||
| 145 | currentChange: function (val) { | ||
| 146 | this.queryData.pageNo = val; | ||
| 147 | this.getData(this.queryData); | ||
| 148 | }, | ||
| 149 | result: function () { | ||
| 150 | this.queryData = { | ||
| 151 | bdcdyh: "", | ||
| 152 | bdcqzh: "", | ||
| 153 | qlrmc: "", | ||
| 154 | qszt: ["2"], | ||
| 155 | xmmc: "", | ||
| 156 | zddm: "", | ||
| 157 | zl: "", | ||
| 158 | pageNo: 1, | ||
| 159 | pageSize: 10 | ||
| 160 | }; | ||
| 161 | this.getData(this.queryData) | ||
| 162 | }, | ||
| 163 | getData: function (data) { | ||
| 164 | data['dylxs'] = this.dylxs; | ||
| 165 | zdlist(data).then(res => { | ||
| 166 | this.Data = res.result.records | ||
| 167 | this.total = res.result.total; | ||
| 168 | }) | ||
| 169 | }, | ||
| 170 | search: function () { | ||
| 171 | this.getData(this.queryData) | ||
| 172 | }, | ||
| 173 | addData: function (val) { | ||
| 174 | this.$emit("getData", val) | ||
| 175 | if (this.isZdClose) { | ||
| 176 | this.close(); | ||
| 177 | } | ||
| 178 | }, | ||
| 179 | close: function () { | ||
| 180 | this.$emit('close') | ||
| 181 | this.result(); | ||
| 182 | } | ||
| 183 | }, | ||
| 184 | watch: { | ||
| 185 | centerDialogVisible(val) { | ||
| 186 | this.isVisible = val | ||
| 187 | } | ||
| 188 | } | ||
| 189 | } | ||
| 190 | </script> | ||
| 191 | |||
| 192 | <style scoped lang="less"> | ||
| 193 | |||
| 194 | .main { | ||
| 195 | box-sizing: border-box; | ||
| 196 | padding: 18px; | ||
| 197 | height: auto; | ||
| 198 | width: 80%; | ||
| 199 | } | ||
| 200 | |||
| 201 | table { | ||
| 202 | margin-top: 10px; | ||
| 203 | background-color: #fff; | ||
| 204 | font-size: 14px; | ||
| 205 | width: 100%; | ||
| 206 | tr:hover{ | ||
| 207 | background-color: #F5F7FA; | ||
| 208 | } | ||
| 209 | } | ||
| 210 | |||
| 211 | td { | ||
| 212 | text-align: center; | ||
| 213 | height: 36px; | ||
| 214 | min-width: 50px; | ||
| 215 | } | ||
| 216 | |||
| 217 | table:hover { | ||
| 218 | cursor: pointer; | ||
| 219 | } | ||
| 220 | |||
| 221 | .inputtitle { | ||
| 222 | line-height: 40px; | ||
| 223 | } | ||
| 224 | |||
| 225 | .shop { | ||
| 226 | margin-top: 20px; | ||
| 227 | } | ||
| 228 | |||
| 229 | .xz { | ||
| 230 | color: blue; | ||
| 231 | } | ||
| 232 | |||
| 233 | .noData { | ||
| 234 | color: #b2b2b2; | ||
| 235 | } | ||
| 236 | |||
| 237 | </style> |
| ... | @@ -168,9 +168,12 @@ export default { | ... | @@ -168,9 +168,12 @@ export default { |
| 168 | this.getTreeList(); | 168 | this.getTreeList(); |
| 169 | } | 169 | } |
| 170 | }, | 170 | }, |
| 171 | // "$store.state.zdbsm": function(bsm) { | 171 | "$store.state.zdbsm": function(bsm) { |
| 172 | // this.getRightTree(bsm); | 172 | this.getRightTree(bsm); |
| 173 | // }, | 173 | }, |
| 174 | }, | ||
| 175 | mounted(){ | ||
| 176 | |||
| 174 | }, | 177 | }, |
| 175 | created() { | 178 | created() { |
| 176 | if (this.$route.meta) { | 179 | if (this.$route.meta) { |
| ... | @@ -228,7 +231,7 @@ export default { | ... | @@ -228,7 +231,7 @@ export default { |
| 228 | } | 231 | } |
| 229 | //刷新页面后根据不同路由高亮相对应的导航 | 232 | //刷新页面后根据不同路由高亮相对应的导航 |
| 230 | if(this.$route.path == '/zrz' || this.$route.path == '/zd' || this.$route.path == '/dz'){ | 233 | if(this.$route.path == '/zrz' || this.$route.path == '/zd' || this.$route.path == '/dz'){ |
| 231 | 234 | ||
| 232 | }else{ | 235 | }else{ |
| 233 | this.headTop.forEach(item=>{ | 236 | this.headTop.forEach(item=>{ |
| 234 | if (item.path == this.$route.path) { | 237 | if (item.path == this.$route.path) { |
| ... | @@ -271,7 +274,7 @@ export default { | ... | @@ -271,7 +274,7 @@ export default { |
| 271 | }, | 274 | }, |
| 272 | async getDicData(name) { | 275 | async getDicData(name) { |
| 273 | return await getDdicByMC(name).then((res)=> { | 276 | return await getDdicByMC(name).then((res)=> { |
| 274 | return res.result | 277 | return res.result |
| 275 | }); | 278 | }); |
| 276 | }, | 279 | }, |
| 277 | getRightTree(bsm) { | 280 | getRightTree(bsm) { |
| ... | @@ -451,7 +454,7 @@ export default { | ... | @@ -451,7 +454,7 @@ export default { |
| 451 | color: #006cff; | 454 | color: #006cff; |
| 452 | border-left: 1px solid #EAEAEA; | 455 | border-left: 1px solid #EAEAEA; |
| 453 | border-right: 1px solid #EAEAEA; | 456 | border-right: 1px solid #EAEAEA; |
| 454 | height: 59px; | 457 | height: 58px; |
| 455 | border-bottom: 1px solid #FFF; | 458 | border-bottom: 1px solid #FFF; |
| 456 | } | 459 | } |
| 457 | } | 460 | } | ... | ... |
| ... | @@ -10,22 +10,22 @@ | ... | @@ -10,22 +10,22 @@ |
| 10 | <tr height="30"> | 10 | <tr height="30"> |
| 11 | <td colspan="2" align="center" >宗地代码</td> | 11 | <td colspan="2" align="center" >宗地代码</td> |
| 12 | <td colspan="4" > | 12 | <td colspan="4" > |
| 13 | <el-input v-model="form.zddm"></el-input> | 13 | <input class="formInput" v-model="form.zddm"> |
| 14 | </td> | 14 | </td> |
| 15 | <td colspan="2" align="center" >不动产单元号</td> | 15 | <td colspan="2" align="center" >不动产单元号</td> |
| 16 | <td colspan="4" > | 16 | <td colspan="4" class="psr"> |
| 17 | <el-input v-model="form.bdcdyh" style="width: 70%"></el-input> | 17 | <input class="formInput percent80" v-model="form.bdcdyh"> |
| 18 | <el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:25%;margin-left:3%">生成</el-button> | 18 | <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button> |
| 19 | </td> | 19 | </td> |
| 20 | </tr> | 20 | </tr> |
| 21 | <tr height="30"> | 21 | <tr height="30"> |
| 22 | <td colspan="2" align="center" >项目名称</td> | 22 | <td colspan="2" align="center" >项目名称</td> |
| 23 | <td colspan="4" > | 23 | <td colspan="4" > |
| 24 | <el-input v-model="form.xmmc"></el-input> | 24 | <input class="formInput" v-model="form.xmmc"> |
| 25 | </td> | 25 | </td> |
| 26 | <td colspan="2" align="center" >房屋性质</td> | 26 | <td colspan="2" align="center" >房屋性质</td> |
| 27 | <td colspan="4" > | 27 | <td colspan="4" > |
| 28 | <el-select v-model="form.fwxzbsm" placeholder="请选择" > | 28 | <el-select class="formSelect" v-model="form.fwxzbsm" placeholder="请选择" > |
| 29 | <el-option | 29 | <el-option |
| 30 | v-for="item in $store.state.fwxzOptions" | 30 | v-for="item in $store.state.fwxzOptions" |
| 31 | :key="item.bsm" | 31 | :key="item.bsm" |
| ... | @@ -39,7 +39,7 @@ | ... | @@ -39,7 +39,7 @@ |
| 39 | <tr height="30"> | 39 | <tr height="30"> |
| 40 | <td colspan="2" align="center" >房屋类型</td> | 40 | <td colspan="2" align="center" >房屋类型</td> |
| 41 | <td colspan="4" > | 41 | <td colspan="4" > |
| 42 | <el-select v-model="form.fwlxbsm" placeholder="请选择" > | 42 | <el-select class="formSelect" v-model="form.fwlxbsm" placeholder="请选择" > |
| 43 | <el-option | 43 | <el-option |
| 44 | v-for="item in $store.state.fwlxList" | 44 | v-for="item in $store.state.fwlxList" |
| 45 | :key="item.bsm" | 45 | :key="item.bsm" |
| ... | @@ -61,7 +61,7 @@ | ... | @@ -61,7 +61,7 @@ |
| 61 | <tr height="30"> | 61 | <tr height="30"> |
| 62 | <td colspan="2" align="center" >产别</td> | 62 | <td colspan="2" align="center" >产别</td> |
| 63 | <td colspan="4" > | 63 | <td colspan="4" > |
| 64 | <el-select v-model="form.fwcbbsm" placeholder="请选择" > | 64 | <el-select class="formSelect" v-model="form.fwcbbsm" placeholder="请选择" > |
| 65 | <el-option | 65 | <el-option |
| 66 | v-for="item in $store.state.cbOptions" | 66 | v-for="item in $store.state.cbOptions" |
| 67 | :key="item.bsm" | 67 | :key="item.bsm" |
| ... | @@ -72,7 +72,7 @@ | ... | @@ -72,7 +72,7 @@ |
| 72 | </td> | 72 | </td> |
| 73 | <td colspan="2" align="center" >产权来源</td> | 73 | <td colspan="2" align="center" >产权来源</td> |
| 74 | <td colspan="4" > | 74 | <td colspan="4" > |
| 75 | <el-select v-model="form.fwcqlybsm" placeholder="请选择" > | 75 | <el-select class="formSelect" v-model="form.fwcqlybsm" placeholder="请选择" > |
| 76 | <el-option | 76 | <el-option |
| 77 | v-for="item in $store.state.cqlyOptions" | 77 | v-for="item in $store.state.cqlyOptions" |
| 78 | :key="item.bsm" | 78 | :key="item.bsm" |
| ... | @@ -127,26 +127,23 @@ | ... | @@ -127,26 +127,23 @@ |
| 127 | <tr height="30"> | 127 | <tr height="30"> |
| 128 | <td colspan="2" align="center" >共有土地面积（㎡）</td> | 128 | <td colspan="2" align="center" >共有土地面积（㎡）</td> |
| 129 | <td colspan="2" > | 129 | <td colspan="2" > |
| 130 | <el-input v-model="form.zdmj"></el-input> | 130 | <input class="formInput" v-model="form.zdmj"> |
| 131 | </td> | 131 | </td> |
| 132 | <td colspan="2" align="center" >分摊土地面积（㎡）</td> | 132 | <td colspan="2" align="center" >分摊土地面积（㎡）</td> |
| 133 | <td colspan="2" > | 133 | <td colspan="2" > |
| 134 | <el-input v-model="form.fttdsymj"></el-input> | 134 | <input class="formInput" v-model="form.fttdsymj"> |
| 135 | </td> | 135 | </td> |
| 136 | <td colspan="2" align="center" >多幢独用土地面积（㎡）</td> | 136 | <td colspan="2" align="center" >多幢独用土地面积（㎡）</td> |
| 137 | <td colspan="2" > | 137 | <td colspan="2" > |
| 138 | <el-input v-model="form.dlsytdmj"></el-input> | 138 | <input class="formInput" v-model="form.dlsytdmj"> |
| 139 | </td> | 139 | </td> |
| 140 | </tr> | 140 | </tr> |
| 141 | 141 | ||
| 142 | <tr> | 142 | <tr> |
| 143 | <td colspan="12" rowspan="4" align="center"> | 143 | <td colspan="12" align="center"> |
| 144 | <Qlxz ref="qlxzModule"></Qlxz> | 144 | <Qlxz ref="qlxzModule" :formData="form"></Qlxz> |
| 145 | </td> | 145 | </td> |
| 146 | </tr> | 146 | </tr> |
| 147 | <tr></tr> | ||
| 148 | <tr></tr> | ||
| 149 | <tr></tr> | ||
| 150 | 147 | ||
| 151 | 148 | ||
| 152 | <tr height="30"> | 149 | <tr height="30"> |
| ... | @@ -154,7 +151,7 @@ | ... | @@ -154,7 +151,7 @@ |
| 154 | <span>坐落</span> | 151 | <span>坐落</span> |
| 155 | </td> | 152 | </td> |
| 156 | <td colspan="10" > | 153 | <td colspan="10" > |
| 157 | <el-input v-model="form.zl"></el-input> | 154 | <input class="formInput" v-model="form.zl"> |
| 158 | </td> | 155 | </td> |
| 159 | </tr> | 156 | </tr> |
| 160 | 157 | ||
| ... | @@ -163,7 +160,7 @@ | ... | @@ -163,7 +160,7 @@ |
| 163 | <span>附加说明</span> | 160 | <span>附加说明</span> |
| 164 | </td> | 161 | </td> |
| 165 | <td colspan="10" rowspan="2" > | 162 | <td colspan="10" rowspan="2" > |
| 166 | <el-input v-model="form.bz" type="textarea"></el-input> | 163 | <input class="formInput" v-model="form.bz" type="textarea"> |
| 167 | </td> | 164 | </td> |
| 168 | </tr> | 165 | </tr> |
| 169 | <tr height="30"> | 166 | <tr height="30"> |
| ... | @@ -174,7 +171,7 @@ | ... | @@ -174,7 +171,7 @@ |
| 174 | <span>调查意见</span> | 171 | <span>调查意见</span> |
| 175 | </td> | 172 | </td> |
| 176 | <td colspan="10" > | 173 | <td colspan="10" > |
| 177 | <el-input v-model="form.name"></el-input> | 174 | <input class="formInput" v-model="form.name"> |
| 178 | </td> | 175 | </td> |
| 179 | </tr> | 176 | </tr> |
| 180 | 177 | ||
| ... | @@ -183,7 +180,7 @@ | ... | @@ -183,7 +180,7 @@ |
| 183 | <span>审查员</span> | 180 | <span>审查员</span> |
| 184 | </td> | 181 | </td> |
| 185 | <td colspan="2" > | 182 | <td colspan="2" > |
| 186 | <el-input v-model="form.name"></el-input> | 183 | <input class="formInput" v-model="form.name"> |
| 187 | </td> | 184 | </td> |
| 188 | <td colspan="2" rowspan="2" align="right" style="width:8.33%;padding-right:10px"> | 185 | <td colspan="2" rowspan="2" align="right" style="width:8.33%;padding-right:10px"> |
| 189 | <span>审查日期</span> | 186 | <span>审查日期</span> |
| ... | @@ -481,10 +478,6 @@ | ... | @@ -481,10 +478,6 @@ |
| 481 | box-sizing: border-box; | 478 | box-sizing: border-box; |
| 482 | padding: 18px; | 479 | padding: 18px; |
| 483 | padding-bottom: 0; | 480 | padding-bottom: 0; |
| 484 | /deep/.el-input__inner{ | ||
| 485 | width: 100%; | ||
| 486 | border: 0; | ||
| 487 | } | ||
| 488 | 481 | ||
| 489 | /deep/textarea{ | 482 | /deep/textarea{ |
| 490 | width: 100%; | 483 | width: 100%; |
| ... | @@ -503,13 +496,12 @@ | ... | @@ -503,13 +496,12 @@ |
| 503 | } | 496 | } |
| 504 | 497 | ||
| 505 | td{ | 498 | td{ |
| 506 | //bgcolor:#F1F4FC; | 499 | height: 36px; |
| 507 | bgcolor:#fff; | 500 | width:8.33%; |
| 508 | width:8.33% | ||
| 509 | } | 501 | } |
| 510 | 502 | ||
| 511 | .el-select{ | 503 | .el-select{ |
| 512 | display:block; | 504 | width: 100%; |
| 513 | } | 505 | } |
| 514 | 506 | ||
| 515 | table{ | 507 | table{ |
| ... | @@ -518,6 +510,15 @@ | ... | @@ -518,6 +510,15 @@ |
| 518 | 510 | ||
| 519 | .dzTable{ | 511 | .dzTable{ |
| 520 | margin-top: 10px; | 512 | margin-top: 10px; |
| 513 | /deep/.el-input__inner { | ||
| 514 | margin: 0; | ||
| 515 | height: 36px; | ||
| 516 | outline: none; | ||
| 517 | border: none; | ||
| 518 | color: #606764; | ||
| 519 | overflow: visible; | ||
| 520 | text-align: center; | ||
| 521 | } | ||
| 521 | } | 522 | } |
| 522 | } | 523 | } |
| 523 | </style> | 524 | </style> |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -61,7 +61,7 @@ | ... | @@ -61,7 +61,7 @@ |
| 61 | total: 0, | 61 | total: 0, |
| 62 | pageNo: 1, | 62 | pageNo: 1, |
| 63 | pageSize: 10, | 63 | pageSize: 10, |
| 64 | qszt: 1, | 64 | qszt: ['1', '2'], |
| 65 | queryData: {}, | 65 | queryData: {}, |
| 66 | formData: { | 66 | formData: { |
| 67 | user: "", | 67 | user: "", |
| ... | @@ -80,8 +80,8 @@ | ... | @@ -80,8 +80,8 @@ |
| 80 | pageSize: this.pageSize, | 80 | pageSize: this.pageSize, |
| 81 | }) | 81 | }) |
| 82 | this.$nextTick(() => { | 82 | this.$nextTick(() => { |
| 83 | this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255; | 83 | this.tableHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 255; |
| 84 | }); | 84 | }); |
| 85 | }, | 85 | }, |
| 86 | methods: { | 86 | methods: { |
| 87 | handleCurrentChange(val) { | 87 | handleCurrentChange(val) { | ... | ... |
This diff is collapsed.
Click to expand it.
This diff is collapsed.
Click to expand it.
| ... | @@ -69,7 +69,7 @@ export default { | ... | @@ -69,7 +69,7 @@ export default { |
| 69 | props: {}, | 69 | props: {}, |
| 70 | data() { | 70 | data() { |
| 71 | return { | 71 | return { |
| 72 | qszt: 2, | 72 | qszt: ['2'], |
| 73 | total: 0, | 73 | total: 0, |
| 74 | pageNo: 1, | 74 | pageNo: 1, |
| 75 | pageSize: 10, | 75 | pageSize: 10, |
| ... | @@ -121,56 +121,60 @@ export default { | ... | @@ -121,56 +121,60 @@ export default { |
| 121 | }, | 121 | }, |
| 122 | //点击办理 | 122 | //点击办理 |
| 123 | handleClick(row) { | 123 | handleClick(row) { |
| 124 | console.log("fwsxbg"); | 124 | let params = { bsm: row.glbsm, type: row.dylx }; |
| 125 | console.log(row); | 125 | this.$confirm('是否确定范围属性变更?', '提示', { |
| 126 | var params = { bsm: row.glbsm, type: row.dylx }; | 126 | confirmButtonText: '确定', |
| 127 | fwsxbgbl(params) | 127 | cancelButtonText: '取消', |
| 128 | .then((res) => { | 128 | type: 'warning' |
| 129 | if (res.code == 200) { | 129 | }).then(() => { |
| 130 | this.$message({ | 130 | fwsxbgbl(params) |
| 131 | message: res.message, | 131 | .then((res) => { |
| 132 | type: "success", | 132 | if (res.code == 200) { |
| 133 | }); | 133 | this.$message({ |
| 134 | var newGlbsm=res.result; | 134 | message: res.message, |
| 135 | 135 | type: "变更成功", | |
| 136 | let path = ""; | 136 | }); |
| 137 | switch (row.dylx) { | 137 | let path = ""; |
| 138 | case "zrz": | 138 | switch (row.dylx) { |
| 139 | this.$store.state.zrzbsm = newGlbsm; | 139 | case "zrz": |
| 140 | path = "/zrz"; | 140 | this.$store.state.zrzbsm = res.result; |
| 141 | break; | 141 | path = "/zrz"; |
| 142 | case "zd": | 142 | break; |
| 143 | this.$store.state.zdbsm = newGlbsm; | 143 | case "zd": |
| 144 | path = "/zd"; | 144 | this.$store.state.zdbsm = res.result; |
| 145 | break; | 145 | path = "/zd"; |
| 146 | case "dz": | 146 | break; |
| 147 | this.$store.state.dzbsm = newGlbsm; | 147 | case "dz": |
| 148 | path = "/dz"; | 148 | this.$store.state.dzbsm = res.result; |
| 149 | break; | 149 | path = "/dz"; |
| 150 | default: | 150 | break; |
| 151 | break; | 151 | default: |
| 152 | } | 152 | break; |
| 153 | this.$router.push({ | ||
| 154 | path: path, | ||
| 155 | query: { | ||
| 156 | bsm: newGlbsm, | ||
| 157 | source: 2 | ||
| 158 | } | 153 | } |
| 159 | }); | 154 | this.$router.push({ |
| 160 | } else { | 155 | path: path, |
| 161 | this.$message({ | 156 | query: { |
| 162 | message: res.message, | 157 | bsm: newGlbsm, |
| 163 | type: "warning", | 158 | source: 2 |
| 164 | }); | 159 | } |
| 165 | } | 160 | }); |
| 166 | }) | 161 | } else { |
| 162 | this.$message({ | ||
| 163 | message: res.message, | ||
| 164 | type: "warning", | ||
| 165 | }); | ||
| 166 | } | ||
| 167 | }) | ||
| 167 | .catch((error) => { | 168 | .catch((error) => { |
| 168 | this.$message({ | 169 | this.$message({ |
| 169 | message: res.message, | 170 | message: res.message, |
| 170 | type: "error", | 171 | type: "error", |
| 171 | }); | 172 | }); |
| 172 | }); | 173 | }); |
| 173 | 174 | }).catch(() => { | |
| 175 | |||
| 176 | }); | ||
| 177 | |||
| 174 | }, | 178 | }, |
| 175 | }, | 179 | }, |
| 176 | computed: {}, | 180 | computed: {}, | ... | ... |
This diff is collapsed.
Click to expand it.
| ... | @@ -144,13 +144,13 @@ export default { | ... | @@ -144,13 +144,13 @@ export default { |
| 144 | djq: [], | 144 | djq: [], |
| 145 | djzq: [], | 145 | djzq: [], |
| 146 | ruleForm:{ | 146 | ruleForm:{ |
| 147 | "djqbsm": "", | 147 | djqbsm: "", |
| 148 | "djzqbsm": "", | 148 | djzqbsm: "", |
| 149 | "syqlxbsm": "", | 149 | syqlxbsm: "", |
| 150 | "userbsm": "", | 150 | userbsm: "", |
| 151 | "xmmc": "", | 151 | xmmc: "", |
| 152 | "xzqbsm": "", | 152 | xzqbsm: "", |
| 153 | "zdtzmbsm": "" | 153 | zdtzmbsm: "" |
| 154 | }, | 154 | }, |
| 155 | ruleForm1:{ | 155 | ruleForm1:{ |
| 156 | zdbsm:'', | 156 | zdbsm:'', |
| ... | @@ -216,6 +216,12 @@ export default { | ... | @@ -216,6 +216,12 @@ export default { |
| 216 | this.activeName = this.auth ? 'zrz':'zd' | 216 | this.activeName = this.auth ? 'zrz':'zd' |
| 217 | }, | 217 | }, |
| 218 | methods: { | 218 | methods: { |
| 219 | // 重置 | ||
| 220 | result(){ | ||
| 221 | this.$refs['ruleForm'].resetFields() | ||
| 222 | this.$refs["ruleForm1"].resetFields() | ||
| 223 | this.$refs["ruleForm2"].resetFields() | ||
| 224 | }, | ||
| 219 | handleClick(tab, event) { | 225 | handleClick(tab, event) { |
| 220 | console.log(tab, event); | 226 | console.log(tab, event); |
| 221 | console.log(tab.name); | 227 | console.log(tab.name); |
| ... | @@ -280,7 +286,7 @@ export default { | ... | @@ -280,7 +286,7 @@ export default { |
| 280 | return false; | 286 | return false; |
| 281 | } | 287 | } |
| 282 | }); | 288 | }); |
| 283 | 289 | ||
| 284 | }, | 290 | }, |
| 285 | newDz() { | 291 | newDz() { |
| 286 | //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm | 292 | //todo 在新增时，如果是点击顶部新建里面的自然幢则不传zdbsm 如果是点击右键里面的添加定着物则传zdbsm |
| ... | @@ -364,6 +370,7 @@ export default { | ... | @@ -364,6 +370,7 @@ export default { |
| 364 | }, | 370 | }, |
| 365 | close() { | 371 | close() { |
| 366 | this.$emit("closeDialog"); | 372 | this.$emit("closeDialog"); |
| 373 | this.result(); | ||
| 367 | }, | 374 | }, |
| 368 | }, | 375 | }, |
| 369 | computed: {}, | 376 | computed: {}, | ... | ... |
| ... | @@ -96,7 +96,7 @@ export default { | ... | @@ -96,7 +96,7 @@ export default { |
| 96 | }, | 96 | }, |
| 97 | { name: "新办房屋", img: require("../../assets/images/xbfw.png") }, | 97 | { name: "新办房屋", img: require("../../assets/images/xbfw.png") }, |
| 98 | { name: "重新落宗", img: require("../../assets/images/cxlz.png") }, | 98 | { name: "重新落宗", img: require("../../assets/images/cxlz.png") }, |
| 99 | { name: "添加", img: require("../../assets/images/cxlz.png") }, | 99 | { name: "添加", img: require("../../assets/images/tj.png") }, |
| 100 | ], | 100 | ], |
| 101 | tableData: [], | 101 | tableData: [], |
| 102 | tableHeight: 0, | 102 | tableHeight: 0, |
| ... | @@ -106,7 +106,7 @@ export default { | ... | @@ -106,7 +106,7 @@ export default { |
| 106 | }, | 106 | }, |
| 107 | mounted() { | 107 | mounted() { |
| 108 | this.$nextTick(() => { | 108 | this.$nextTick(() => { |
| 109 | this.tableHeight = this.$refs.notice.offsetHeight - 53; | 109 | this.tableHeight = this.$refs.notice.offsetHeight - 54; |
| 110 | }); | 110 | }); |
| 111 | }, | 111 | }, |
| 112 | methods: { | 112 | methods: { |
| ... | @@ -217,25 +217,27 @@ export default { | ... | @@ -217,25 +217,27 @@ export default { |
| 217 | } | 217 | } |
| 218 | } | 218 | } |
| 219 | } | 219 | } |
| 220 | .el-card__body { | 220 | /deep/ .el-card__body { |
| 221 | padding: 40px; | 221 | padding: 50px 20px; |
| 222 | } | 222 | } |
| 223 | } | 223 | } |
| 224 | .notice { | 224 | .notice { |
| 225 | padding: 0; | 225 | padding: 0; |
| 226 | height: calc(100% - 225px); | 226 | height: calc(100% - 285px); |
| 227 | @flex(); | 227 | @flex(); |
| 228 | .news { | 228 | .news { |
| 229 | float: left; | 229 | float: left; |
| 230 | float: left; | 230 | float: left; |
| 231 | margin-right: 20px; | 231 | margin-right: 20px; |
| 232 | flex: 1; | 232 | flex: 1; |
| 233 | border: 1px solid #E6E6E6; | ||
| 233 | /deep/ .el-card__body{ | 234 | /deep/ .el-card__body{ |
| 234 | padding: 0; | 235 | padding: 0; |
| 235 | } | 236 | } |
| 236 | } | 237 | } |
| 237 | .download { | 238 | .download { |
| 238 | width: 50%; | 239 | width: 50%; |
| 240 | border: 1px solid #E6E6E6; | ||
| 239 | /deep/ .el-card__body{ | 241 | /deep/ .el-card__body{ |
| 240 | padding: 0; | 242 | padding: 0; |
| 241 | } | 243 | } | ... | ... |
| ... | @@ -12,7 +12,7 @@ | ... | @@ -12,7 +12,7 @@ |
| 12 | <el-table-column label="操作" width="100"> | 12 | <el-table-column label="操作" width="100"> |
| 13 | <template slot-scope="scope"> | 13 | <template slot-scope="scope"> |
| 14 | <el-button @click="handleClick(scope.row)" type="text" size="small" | 14 | <el-button @click="handleClick(scope.row)" type="text" size="small" |
| 15 | >办理 | 15 | >更正 |
| 16 | </el-button | 16 | </el-button |
| 17 | > | 17 | > |
| 18 | <el-button type="text" size="small">定位</el-button> | 18 | <el-button type="text" size="small">定位</el-button> |
| ... | @@ -60,7 +60,7 @@ | ... | @@ -60,7 +60,7 @@ |
| 60 | props: {}, | 60 | props: {}, |
| 61 | data() { | 61 | data() { |
| 62 | return { | 62 | return { |
| 63 | qszt: 1, | 63 | qszt: ['1'], |
| 64 | total: 0, | 64 | total: 0, |
| 65 | pageNo: 1, | 65 | pageNo: 1, |
| 66 | pageSize: 10, | 66 | pageSize: 10, |
| ... | @@ -116,44 +116,61 @@ | ... | @@ -116,44 +116,61 @@ |
| 116 | }, | 116 | }, |
| 117 | //点击办理 | 117 | //点击办理 |
| 118 | handleClick(row) { | 118 | handleClick(row) { |
| 119 | console.log(row); | 119 | let type;name; |
| 120 | let path = ""; | ||
| 121 | var type; | ||
| 122 | var id = row.bsm; | ||
| 123 | switch (row.dylx) { | 120 | switch (row.dylx) { |
| 124 | case "自然幢": | ||
| 125 | path = "/zrz"; | ||
| 126 | type = "1"; | ||
| 127 | this.$store.state.zrzbsm = row.glbsm; | ||
| 128 | break; | ||
| 129 | case "zd": | 121 | case "zd": |
| 130 | path = "/zd"; | ||
| 131 | type = "0"; | 122 | type = "0"; |
| 123 | name = '宗地'; | ||
| 132 | this.$store.state.zdbsm = row.glbsm | 124 | this.$store.state.zdbsm = row.glbsm |
| 133 | break; | 125 | break; |
| 134 | case "户": | 126 | case "zrz": |
| 135 | path = "h"; | 127 | type = "1"; |
| 136 | this.$store.state.hbsm = row.glbsm | 128 | name = '自然幢'; |
| 129 | this.$store.state.zrzbsm = row.glbsm; | ||
| 130 | break; | ||
| 131 | case "h": | ||
| 132 | case "h0": | ||
| 133 | case "h1": | ||
| 137 | type = "2"; | 134 | type = "2"; |
| 135 | name = "户" | ||
| 136 | this.$store.state.hbsm = row.glbsm; | ||
| 137 | case "dz": | ||
| 138 | type = "3"; | ||
| 139 | name = "多幢"; | ||
| 140 | this.$store.state.dzbsm = row.glbsm; | ||
| 138 | default: | 141 | default: |
| 139 | break; | 142 | break; |
| 140 | } | 143 | } |
| 141 | var data = {"id": id, "type": type}; | 144 | let data = {"id": row.bsm, "type": type}; |
| 142 | updateQsztByBsm(data) | 145 | this.$confirm('是否确定更正该'+name+'？', '提示', { |
| 143 | .then((res => { | 146 | confirmButtonText: '确定', |
| 144 | if (res.code == 200) { | 147 | cancelButtonText: '取消', |
| 148 | type: 'warning' | ||
| 149 | }).then(() => { | ||
| 150 | updateQsztByBsm(data) | ||
| 151 | .then((res => { | ||
| 152 | if (res.code == 200) { | ||
| 153 | this.$message({ | ||
| 154 | type: 'success', | ||
| 155 | message: '更正成功!' | ||
| 156 | }); | ||
| 157 | this.$router.push("/"+path); | ||
| 158 | } else { | ||
| 159 | this.$message({ | ||
| 160 | message: res.message, | ||
| 161 | type: "warning", | ||
| 162 | }); | ||
| 163 | } | ||
| 164 | })).catch(() => { | ||
| 145 | this.$message({ | 165 | this.$message({ |
| 146 | message: res.message, | 166 | message: res.message, |
| 147 | type: "success", | 167 | type: "error", |
| 148 | }); | 168 | }); |
| 149 | } else { | 169 | }); |
| 150 | this.$message({ | 170 | |
| 151 | message: res.message, | 171 | }).catch(() => { |
| 152 | type: "warning", | 172 | |
| 153 | }); | 173 | }); |
| 154 | } | ||
| 155 | })) | ||
| 156 | this.$router.push(path); | ||
| 157 | }, | 174 | }, |
| 158 | }, | 175 | }, |
| 159 | computed: {}, | 176 | computed: {}, | ... | ... |
| ... | @@ -101,7 +101,6 @@ | ... | @@ -101,7 +101,6 @@ |
| 101 | //户保存 | 101 | //户保存 |
| 102 | hbjSaveInfo() { | 102 | hbjSaveInfo() { |
| 103 | this.$refs.hbj.onSave(this.hbsm, this.tabPosition); | 103 | this.$refs.hbj.onSave(this.hbsm, this.tabPosition); |
| 104 | this.hbjVisible = false; | ||
| 105 | this.getData({pageSize:15}); | 104 | this.getData({pageSize:15}); |
| 106 | }, | 105 | }, |
| 107 | //户编辑表单重置 | 106 | //户编辑表单重置 | ... | ... |
| 1 | <template> | 1 | <template> |
| 2 | <div class="">历史回溯</div> | 2 | <div class="">历史回溯 |
| 3 | <div id="mountNode"></div> | ||
| 4 | </div> | ||
| 3 | </template> | 5 | </template> |
| 4 | 6 | ||
| 5 | <script> | 7 | <script> |
| 8 | |||
| 9 | import G6 from '@antv/g6'; | ||
| 10 | import insertCss from 'insert-css'; | ||
| 11 | import { getLshs } from "./../../../../src/api/fwsxbg"; | ||
| 12 | |||
| 6 | export default { | 13 | export default { |
| 7 | name:"", | 14 | name:"", |
| 8 | components:{}, | 15 | components:{}, |
| 9 | props:{}, | 16 | props:{}, |
| 10 | data(){ | 17 | data(){ |
| 18 | insertCss(` | ||
| 19 | .g6-tooltip { | ||
| 20 | border-radius: 6px; | ||
| 21 | font-size: 12px; | ||
| 22 | color: #fff; | ||
| 23 | background-color: #000; | ||
| 24 | padding: 2px 8px; | ||
| 25 | text-align: center; | ||
| 26 | } | ||
| 27 | `); | ||
| 11 | return { | 28 | return { |
| 29 | data : {} | ||
| 30 | } | ||
| 31 | }, | ||
| 32 | created(){ | ||
| 33 | |||
| 34 | }, | ||
| 35 | mounted(){ | ||
| 36 | this.getLshsData(); | ||
| 37 | }, | ||
| 38 | methods: { | ||
| 39 | initG6() { | ||
| 40 | const data = this.data; | ||
| 41 | G6.registerNode( | ||
| 42 | 'sql', | ||
| 43 | { | ||
| 44 | drawShape(cfg, group) { | ||
| 45 | const rect = group.addShape('rect', { | ||
| 46 | attrs: { | ||
| 47 | x: -75, | ||
| 48 | y: -25, | ||
| 49 | width: 150, | ||
| 50 | height: 50, | ||
| 51 | radius: 10, | ||
| 52 | stroke: '#5B8FF9', | ||
| 53 | fill: '#C6E5FF', | ||
| 54 | lineWidth: 1, | ||
| 55 | }, | ||
| 56 | name: 'rect-shape', | ||
| 57 | }); | ||
| 58 | if (cfg.name) { | ||
| 59 | group.addShape('text', { | ||
| 60 | attrs: { | ||
| 61 | text: cfg.name, | ||
| 62 | x: 0, | ||
| 63 | y: 0, | ||
| 64 | fill: '#00287E', | ||
| 65 | fontSize: 14, | ||
| 66 | textAlign: 'center', | ||
| 67 | textBaseline: 'middle', | ||
| 68 | fontWeight: 'bold', | ||
| 69 | }, | ||
| 70 | name: 'text-shape', | ||
| 71 | }); | ||
| 72 | } | ||
| 73 | return rect; | ||
| 74 | }, | ||
| 75 | }, | ||
| 76 | 'single-node', | ||
| 77 | ); | ||
| 78 | |||
| 79 | const container = document.getElementById('mountNode'); | ||
| 80 | |||
| 81 | const graph = new G6.Graph({ | ||
| 82 | container: 'mountNode', | ||
| 83 | width:1000, | ||
| 84 | height:800, | ||
| 85 | layout: { | ||
| 86 | type: 'dagre', | ||
| 87 | nodesepFunc: (d) => { | ||
| 88 | if (d.id === '3') { | ||
| 89 | return 500; | ||
| 90 | } | ||
| 91 | return 50; | ||
| 92 | }, | ||
| 93 | ranksep: 70, | ||
| 94 | controlPoints: true, | ||
| 95 | }, | ||
| 96 | defaultNode: { | ||
| 97 | type: 'sql', | ||
| 98 | }, | ||
| 99 | defaultEdge: { | ||
| 100 | type: 'polyline', | ||
| 101 | style: { | ||
| 102 | radius: 20, | ||
| 103 | offset: 45, | ||
| 104 | endArrow: true, | ||
| 105 | lineWidth: 2, | ||
| 106 | stroke: '#C2C8D5', | ||
| 107 | }, | ||
| 108 | }, | ||
| 109 | nodeStateStyles: { | ||
| 110 | selected: { | ||
| 111 | stroke: '#d9d9d9', | ||
| 112 | fill: '#5394ef', | ||
| 113 | }, | ||
| 114 | }, | ||
| 115 | |||
| 116 | modes: { | ||
| 117 | default: [ | ||
| 118 | 'drag-canvas', | ||
| 119 | 'zoom-canvas', | ||
| 120 | 'click-select', | ||
| 121 | { | ||
| 122 | type: 'tooltip', | ||
| 123 | formatText(model) { | ||
| 124 | const cfg = model.conf; | ||
| 125 | const text = []; | ||
| 126 | cfg.forEach((row) => { | ||
| 127 | text.push(row.label + ':' + row.value + '<br>'); | ||
| 128 | }); | ||
| 129 | return text.join('\n'); | ||
| 130 | }, | ||
| 131 | offset: 30, | ||
| 132 | }, | ||
| 133 | ], | ||
| 134 | }, | ||
| 135 | fitView: true, | ||
| 136 | }); | ||
| 137 | |||
| 138 | graph.data(data); | ||
| 139 | graph.render(); | ||
| 140 | |||
| 141 | if (typeof window !== 'undefined') | ||
| 142 | window.onresize = () => { | ||
| 143 | if (!graph || graph.get('destroyed')) return; | ||
| 144 | if (!container || !container.scrollWidth || !container.scrollHeight) return; | ||
| 145 | graph.changeSize(container.scrollWidth, container.scrollHeight); | ||
| 146 | }; | ||
| 147 | |||
| 148 | }, | ||
| 149 | |||
| 150 | getLshsData(){ | ||
| 151 | let _this = this; | ||
| 152 | const data = { | ||
| 153 | "bsm": "c0818d9e4286b35b8ee9b96d90b522aa", | ||
| 154 | "type": "zd" | ||
| 155 | }; | ||
| 156 | getLshs(data).then((res)=>{ | ||
| 157 | if(res.code===200){ | ||
| 158 | _this.data=res.result; | ||
| 159 | this.initG6(); | ||
| 160 | } | ||
| 161 | }) | ||
| 12 | } | 162 | } |
| 13 | }, | 163 | }, |
| 14 | created(){}, | ||
| 15 | mounted(){}, | ||
| 16 | methods:{}, | ||
| 17 | computed: {}, | 164 | computed: {}, |
| 18 | watch: {}, | 165 | watch: {}, |
| 19 | } | 166 | } |
| 20 | </script> | 167 | </script> |
| 21 | <style scoped lang="less"> | 168 | <style scoped lang="less"> |
| 169 | |||
| 22 | </style> | 170 | </style> |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -22,29 +22,41 @@ | ... | @@ -22,29 +22,41 @@ |
| 22 | </table> | 22 | </table> |
| 23 | <table border="1"> | 23 | <table border="1"> |
| 24 | <tr> | 24 | <tr> |
| 25 | <td @click="addRow" class="cz">+</td> | 25 | <td class="cz"><el-button |
| 26 | type="primary" | ||
| 27 | class="changeBtn outAdd addMinus" | ||
| 28 | @click="addRow" | ||
| 29 | >+</el-button | ||
| 30 | ></td> | ||
| 26 | <td class="dzwdm">定着物代码</td> | 31 | <td class="dzwdm">定着物代码</td> |
| 27 | <td class="syqmj">土地所有权/使用权面积(㎡)</td> | 32 | <td class="syqmj">土地所有权/使用权面积(㎡)</td> |
| 28 | <td class="dytdmj">独有独用土地面积(㎡)</td> | 33 | <td class="dytdmj">独有独用土地面积(㎡)</td> |
| 29 | <td class="fttjmj">分摊土地面积(㎡)</td> | 34 | <td class="fttjmj">分摊土地面积(㎡)</td> |
| 30 | </tr> | 35 | </tr> |
| 31 | <tr v-for="(item,i) in mjftData.list" :key="i"> | 36 | <tr v-for="(item,i) in mjftData.list" :key="i"> |
| 32 | <td @click="delRow(i)" class="cz">-</td> | 37 | <td class="cz"> |
| 38 | <el-button | ||
| 39 | type="primary" | ||
| 40 | class="changeBtn outMinus addMinus" | ||
| 41 | @click="delRow(i)" | ||
| 42 | >-</el-button | ||
| 43 | > | ||
| 44 | </td> | ||
| 33 | <td class="dzwdm"> | 45 | <td class="dzwdm"> |
| 34 | <el-input v-model="item.dzwdm" > | 46 | <el-input v-model="item.dzwdm" placeholder="请输入定着物代码"> |
| 35 | </el-input> | 47 | </el-input> |
| 36 | </td> | 48 | </td> |
| 37 | <td class="syqmj"> | 49 | <td class="syqmj"> |
| 38 | <el-input | 50 | <el-input placeholder="请输入使用所有权面积" style="ime-mode:inactive" |
| 39 | oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+4)}" | 51 | oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" |
| 40 | v-model="item.tdsyqsyqmj" | 52 | v-model="item.tdsyqsyqmj" |
| 41 | ></el-input> | 53 | ></el-input> |
| 42 | </td> | 54 | </td> |
| 43 | <td class="dytdmj"> | 55 | <td class="dytdmj"> |
| 44 | <el-input v-model="item.dydytdmj" oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+4)}"></el-input> | 56 | <el-input v-model="item.dydytdmj" style="ime-mode:inactive" placeholder="请输入独有独用土地面积" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> |
| 45 | </td> | 57 | </td> |
| 46 | <td class="fttjmj"> | 58 | <td class="fttjmj"> |
| 47 | <el-input v-model="item.fttdmj" oninput="if(isNaN(value)) { value = null } if(value.indexOf('.')>0){value=value.slice(0,value.indexOf('.')+4)}"></el-input> | 59 | <el-input v-model="item.fttdmj" style="ime-mode:inactive" placeholder="请输入分摊土地面积" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null"></el-input> |
| 48 | </td> | 60 | </td> |
| 49 | </tr> | 61 | </tr> |
| 50 | <tr> | 62 | <tr> |
| ... | @@ -119,16 +131,6 @@ | ... | @@ -119,16 +131,6 @@ |
| 119 | console.log(error) | 131 | console.log(error) |
| 120 | }) | 132 | }) |
| 121 | }, | 133 | }, |
| 122 | oninput(e) { | ||
| 123 | /* e.target.value = (e.target.value.match(/^(1|2|3|4|5|6|7|8|9|0)*(\.?\d{0,2})/g)[0]) || null*/ | ||
| 124 | let value = e.target.value | ||
| 125 | if (isNaN(value)) { | ||
| 126 | value = null | ||
| 127 | } | ||
| 128 | if (value.indexOf('.') > 0) { | ||
| 129 | value = value.slice(0, value.indexOf('.') + 4) | ||
| 130 | } | ||
| 131 | }, | ||
| 132 | addRow() { | 134 | addRow() { |
| 133 | this.mjftData.list.push({ | 135 | this.mjftData.list.push({ |
| 134 | dydytdmj: '', | 136 | dydytdmj: '', | ... | ... |
| ... | @@ -21,24 +21,20 @@ | ... | @@ -21,24 +21,20 @@ |
| 21 | <tr> | 21 | <tr> |
| 22 | <td colspan="2">行政区</td> | 22 | <td colspan="2">行政区</td> |
| 23 | <td colspan="2"> | 23 | <td colspan="2"> |
| 24 | <el-form :rules="rules" ref="ruleForm" :inline="true" > | 24 | <el-select |
| 25 | <el-form-item > | 25 | :disabled="formData.qszt!='0'" |
| 26 | <el-select | 26 | class="formSelect" |
| 27 | :disabled="formData.qszt!='0'" | 27 | v-model="formData.xzqbsm" |
| 28 | class="formSelect" | 28 | @change="changeXzq(formData.xzqbsm)" |
| 29 | v-model="formData.xzqbsm" | 29 | > |
| 30 | @change="changeXzq(formData.xzqbsm)" | 30 | <el-option |
| 31 | > | 31 | v-for="item in $store.state.xzqList" |
| 32 | <el-option | 32 | :key="item.bsm" |
| 33 | v-for="item in $store.state.xzqList" | 33 | :label="item.mc" |
| 34 | :key="item.bsm" | 34 | :value="item.bsm" |
| 35 | :label="item.mc" | 35 | > |
| 36 | :value="item.bsm" | 36 | </el-option> |
| 37 | > | 37 | </el-select> |
| 38 | </el-option> | ||
| 39 | </el-select> | ||
| 40 | </el-form-item> | ||
| 41 | </el-form> | ||
| 42 | </td> | 38 | </td> |
| 43 | <td colspan="2">地籍区</td> | 39 | <td colspan="2">地籍区</td> |
| 44 | <td colspan="2"> | 40 | <td colspan="2"> |
| ... | @@ -113,10 +109,10 @@ | ... | @@ -113,10 +109,10 @@ |
| 113 | <td colspan="4" class="psr"> | 109 | <td colspan="4" class="psr"> |
| 114 | <input :disabled="formData.qszt!='0'" | 110 | <input :disabled="formData.qszt!='0'" |
| 115 | type="text" placeholder="请输入" | 111 | type="text" placeholder="请输入" |
| 116 | class="formInput percent78" | 112 | class="formInput percent80" |
| 117 | v-model="formData.zddm" | 113 | v-model="formData.zddm" |
| 118 | /> | 114 | /> |
| 119 | <el-button type="primary" class="createBtn" @click="generatorCode" | 115 | <el-button type="warning" class="createBtn" @click="generatorCode" |
| 120 | >生成 | 116 | >生成 |
| 121 | </el-button> | 117 | </el-button> |
| 122 | </td> | 118 | </td> |
| ... | @@ -131,10 +127,10 @@ | ... | @@ -131,10 +127,10 @@ |
| 131 | <td colspan="4" class="psr"> | 127 | <td colspan="4" class="psr"> |
| 132 | <input | 128 | <input |
| 133 | type="text" :disabled="formData.qszt!='0'" | 129 | type="text" :disabled="formData.qszt!='0'" |
| 134 | class="formInput percent78" | 130 | class="formInput percent80" |
| 135 | v-model="formData.bdcdyh" | 131 | v-model="formData.bdcdyh" |
| 136 | /> | 132 | /> |
| 137 | <el-button type="primary" class="createBtn">生成</el-button> | 133 | <el-button type="warning" class="createBtn">生成</el-button> |
| 138 | </td> | 134 | </td> |
| 139 | </tr> | 135 | </tr> |
| 140 | <tr> | 136 | <tr> |
| ... | @@ -375,30 +371,30 @@ export default { | ... | @@ -375,30 +371,30 @@ export default { |
| 375 | props: {}, | 371 | props: {}, |
| 376 | data() { | 372 | data() { |
| 377 | return { | 373 | return { |
| 378 | rules: { | 374 | // rules: { |
| 379 | hdmc: [ | 375 | // hdmc: [ |
| 380 | { required: true, message: '请输入活动名称', trigger: 'blur' }, | 376 | // { required: true, message: '请输入活动名称', trigger: 'blur' }, |
| 381 | { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } | 377 | // { min: 3, max: 5, message: '长度在 3 到 5 个字符', trigger: 'blur' } |
| 382 | ], | 378 | // ], |
| 383 | xzq: [ | 379 | // xzq: [ |
| 384 | { required: true, message: '请选择活行政区', trigger: 'change' } | 380 | // { required: true, message: '请选择活行政区', trigger: 'change' } |
| 385 | ], | 381 | // ], |
| 386 | date1: [ | 382 | // date1: [ |
| 387 | { type: 'date', required: true, message: '请选择日期', trigger: 'change' } | 383 | // { type: 'date', required: true, message: '请选择日期', trigger: 'change' } |
| 388 | ], | 384 | // ], |
| 389 | date2: [ | 385 | // date2: [ |
| 390 | { type: 'date', required: true, message: '请选择时间', trigger: 'change' } | 386 | // { type: 'date', required: true, message: '请选择时间', trigger: 'change' } |
| 391 | ], | 387 | // ], |
| 392 | type: [ | 388 | // type: [ |
| 393 | { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' } | 389 | // { type: 'array', required: true, message: '请至少选择一个活动性质', trigger: 'change' } |
| 394 | ], | 390 | // ], |
| 395 | resource: [ | 391 | // resource: [ |
| 396 | { required: true, message: '请选择活动资源', trigger: 'change' } | 392 | // { required: true, message: '请选择活动资源', trigger: 'change' } |
| 397 | ], | 393 | // ], |
| 398 | desc: [ | 394 | // desc: [ |
| 399 | { required: true, message: '请填写活动形式', trigger: 'blur' } | 395 | // { required: true, message: '请填写活动形式', trigger: 'blur' } |
| 400 | ] | 396 | // ] |
| 401 | }, | 397 | // }, |
| 402 | rjl:'', | 398 | rjl:'', |
| 403 | jzmd:'', | 399 | jzmd:'', |
| 404 | jzxg:'', | 400 | jzxg:'', |
| ... | @@ -483,10 +479,9 @@ export default { | ... | @@ -483,10 +479,9 @@ export default { |
| 483 | } | 479 | } |
| 484 | }); | 480 | }); |
| 485 | 481 | ||
| 486 | console.log(this.formData.syqlxbsm); | ||
| 487 | this.dpdm = this.dpdm + this.formData.syqlxbsm; | 482 | this.dpdm = this.dpdm + this.formData.syqlxbsm; |
| 488 | this.$store.state.zdtzmList.forEach((item)=>{ | 483 | this.$store.state.zdtzmList.forEach((item)=>{ |
| 489 | if(item.zdtzmbsm === this.formData.zdtzmbsm){ | 484 | if(item.bsm === this.formData.zdtzmbsm){ |
| 490 | this.dpdm = this.dpdm + item.dm; | 485 | this.dpdm = this.dpdm + item.dm; |
| 491 | } | 486 | } |
| 492 | }); | 487 | }); |
| ... | @@ -567,7 +562,7 @@ export default { | ... | @@ -567,7 +562,7 @@ export default { |
| 567 | type: "success", | 562 | type: "success", |
| 568 | }); | 563 | }); |
| 569 | // 保存成功再次查询 | 564 | // 保存成功再次查询 |
| 570 | this.getZdjbxxData(); | 565 | this.getZdjbxxData(this.$store.state.zdbsm); |
| 571 | } else { | 566 | } else { |
| 572 | this.$message({ | 567 | this.$message({ |
| 573 | message: res.message, | 568 | message: res.message, |
| ... | @@ -673,7 +668,7 @@ export default { | ... | @@ -673,7 +668,7 @@ export default { |
| 673 | this.$store.state.zddm = val; | 668 | this.$store.state.zddm = val; |
| 674 | }, | 669 | }, |
| 675 | zdbsm:function (val) { | 670 | zdbsm:function (val) { |
| 676 | this.getZdjbxxData() | 671 | this.getZdjbxxData(val) |
| 677 | } | 672 | } |
| 678 | }, | 673 | }, |
| 679 | }; | 674 | }; |
| ... | @@ -710,10 +705,6 @@ export default { | ... | @@ -710,10 +705,6 @@ export default { |
| 710 | overflow: visible; | 705 | overflow: visible; |
| 711 | text-align: center; | 706 | text-align: center; |
| 712 | } | 707 | } |
| 713 | .percent78 { | ||
| 714 | width: 78%; | ||
| 715 | float: left; | ||
| 716 | } | ||
| 717 | .percent68 { | 708 | .percent68 { |
| 718 | width: 68% !important; | 709 | width: 68% !important; |
| 719 | float: left; | 710 | float: left; |
| ... | @@ -734,13 +725,6 @@ export default { | ... | @@ -734,13 +725,6 @@ export default { |
| 734 | width: 30% !important; | 725 | width: 30% !important; |
| 735 | float: left; | 726 | float: left; |
| 736 | } | 727 | } |
| 737 | .createBtn { | ||
| 738 | position: absolute; | ||
| 739 | width: 50px; | ||
| 740 | padding: 6px 4px; | ||
| 741 | right: 4px; | ||
| 742 | top: 4px; | ||
| 743 | } | ||
| 744 | .el-input__icon { | 728 | .el-input__icon { |
| 745 | line-height: 37px; | 729 | line-height: 37px; |
| 746 | } | 730 | } | ... | ... |
| ... | @@ -20,9 +20,9 @@ | ... | @@ -20,9 +20,9 @@ |
| 20 | <tr height="30"> | 20 | <tr height="30"> |
| 21 | <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td> | 21 | <td colspan="2" align="center" >不动产单元号<i class="requisite">*</i></td> |
| 22 | <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号--> | 22 | <!-- todo 此处暂时存放的是不动产单元号标识码，而不是不动产单元号--> |
| 23 | <td colspan="4" > | 23 | <td colspan="4" class="psr"> |
| 24 | <el-input v-model="form.bdcdyh" style="width: 82%" disabled></el-input> | 24 | <el-input v-model="form.bdcdyh" class="percent80" disabled></el-input> |
| 25 | <el-button @click.prevent="generatorCode" size="mini" type="primary" style="width:17%;margin-left:1%">生成</el-button> | 25 | <el-button @click.prevent="generatorCode" size="mini" class="createBtn" type="warning">生成</el-button> |
| 26 | </td> | 26 | </td> |
| 27 | <td colspan="2" align="center" >原不动产单元</td> | 27 | <td colspan="2" align="center" >原不动产单元</td> |
| 28 | <td colspan="4" > | 28 | <td colspan="4" > |
| ... | @@ -215,12 +215,23 @@ | ... | @@ -215,12 +215,23 @@ |
| 215 | 215 | ||
| 216 | <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> | 216 | <tr height="30" v-for="(item1,index) in form.fwytList" :key="index"> |
| 217 | <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> | 217 | <td v-if="index===0" colspan="2" :rowspan="ytTitleRowspan" align="center" id="ytTitle"> |
| 218 | <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> | 218 | <el-button |
| 219 | type="primary" | ||
| 220 | style="margin-right: 10px" | ||
| 221 | class="changeBtn addMinus inAdd" | ||
| 222 | @click="addYtInfo" | ||
| 223 | >+</el-button | ||
| 224 | > | ||
| 219 | <span>用途<i class="requisite">*</i></span> | 225 | <span>用途<i class="requisite">*</i></span> |
| 220 | </td> | 226 | </td> |
| 221 | 227 | ||
| 222 | <td width="30" colspan="1" align="center" > | 228 | <td width="30" colspan="1" align="center" > |
| 223 | <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> | 229 | <el-button |
| 230 | type="primary" | ||
| 231 | class="changeBtn addMinus inMinus" | ||
| 232 | @click="deleteYtInfo(index)" | ||
| 233 | >-</el-button | ||
| 234 | > | ||
| 224 | 规划用途 | 235 | 规划用途 |
| 225 | </td> | 236 | </td> |
| 226 | <td width="30" colspan="4" align="center" > | 237 | <td width="30" colspan="4" align="center" > |
| ... | @@ -256,7 +267,14 @@ | ... | @@ -256,7 +267,14 @@ |
| 256 | 267 | ||
| 257 | <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> | 268 | <tr height="30" v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> |
| 258 | <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" > | 269 | <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" align="center" > |
| 259 | <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> | 270 | <!-- <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> --> |
| 271 | <el-button | ||
| 272 | type="primary" | ||
| 273 | style="margin-right: 10px" | ||
| 274 | class="changeBtn addMinus inAdd" | ||
| 275 | @click="addFwjgInfo" | ||
| 276 | >+</el-button | ||
| 277 | > | ||
| 260 | <span>房屋结构<i class="requisite">*</i></span> | 278 | <span>房屋结构<i class="requisite">*</i></span> |
| 261 | </td> | 279 | </td> |
| 262 | <td colspan="1" align="center" > | 280 | <td colspan="1" align="center" > |
| ... | @@ -808,7 +826,6 @@ | ... | @@ -808,7 +826,6 @@ |
| 808 | 826 | ||
| 809 | td{ | 827 | td{ |
| 810 | //bgcolor:#F1F4FC; | 828 | //bgcolor:#F1F4FC; |
| 811 | bgcolor:#fff; | ||
| 812 | width:8.33% | 829 | width:8.33% |
| 813 | } | 830 | } |
| 814 | 831 | ||
| ... | @@ -824,4 +841,11 @@ | ... | @@ -824,4 +841,11 @@ |
| 824 | .hTable{ | 841 | .hTable{ |
| 825 | margin-top: 10px; | 842 | margin-top: 10px; |
| 826 | } | 843 | } |
| 844 | |||
| 845 | /deep/.el-select-tree{ | ||
| 846 | width: 100%; | ||
| 847 | .el-input__inner{ | ||
| 848 | height: 30px !important; | ||
| 849 | } | ||
| 850 | } | ||
| 827 | </style> | 851 | </style> |
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -3,7 +3,7 @@ | ... | @@ -3,7 +3,7 @@ |
| 3 | <div class="tab-header"> | 3 | <div class="tab-header"> |
| 4 | <el-row class="searchContent"> | 4 | <el-row class="searchContent"> |
| 5 | <el-col :span="8"> | 5 | <el-col :span="8"> |
| 6 | <el-radio-group v-model="tabPosition"> | 6 | <el-radio-group v-model="scyclx" @change="scyclxChange"> |
| 7 | <el-radio-button label="1">实测</el-radio-button> | 7 | <el-radio-button label="1">实测</el-radio-button> |
| 8 | <el-radio-button label="0">预测</el-radio-button> | 8 | <el-radio-button label="0">预测</el-radio-button> |
| 9 | </el-radio-group> | 9 | </el-radio-group> |
| ... | @@ -34,28 +34,28 @@ | ... | @@ -34,28 +34,28 @@ |
| 34 | class="radioBtn" | 34 | class="radioBtn" |
| 35 | label="3" | 35 | label="3" |
| 36 | border | 36 | border |
| 37 | @click="plhVisible = true" | 37 | @click="openPl('h')" |
| 38 | >批量户</el-button | 38 | >批量户</el-button |
| 39 | > | 39 | > |
| 40 | <el-button | 40 | <el-button |
| 41 | class="radioBtn" | 41 | class="radioBtn" |
| 42 | label="4" | 42 | label="4" |
| 43 | border | 43 | border |
| 44 | @click="plcVisible = true" | 44 | @click="openPlC" |
| 45 | >批量层</el-button | 45 | >批量层</el-button |
| 46 | > | 46 | > |
| 47 | <el-button | 47 | <el-button |
| 48 | class="radioBtn" | 48 | class="radioBtn" |
| 49 | label="5" | 49 | label="5" |
| 50 | border | 50 | border |
| 51 | @click="plShVisible = true" | 51 | @click="openPl('sh')" |
| 52 | >批量室号</el-button | 52 | >批量室号</el-button |
| 53 | > | 53 | > |
| 54 | <el-button | 54 | <el-button |
| 55 | class="radioBtn" | 55 | class="radioBtn" |
| 56 | label="6" | 56 | label="6" |
| 57 | border | 57 | border |
| 58 | @click="plzlVisible = true" | 58 | @click="openPl('zl')" |
| 59 | >批量坐落</el-button | 59 | >批量坐落</el-button |
| 60 | > | 60 | > |
| 61 | <el-button class="radioBtn" label="7" border @click="addBdcdyh" | 61 | <el-button class="radioBtn" label="7" border @click="addBdcdyh" |
| ... | @@ -236,10 +236,10 @@ | ... | @@ -236,10 +236,10 @@ |
| 236 | </div> | 236 | </div> |
| 237 | </el-dialog> | 237 | </el-dialog> |
| 238 | <!-- 批量操作弹出框 --> | 238 | <!-- 批量操作弹出框 --> |
| 239 | <pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose"></pl-h> | 239 | <pl-h :plh-visible="plhVisible" :bsms="bsms" @close="plhClose" @lodding="lodding"></pl-h> |
| 240 | <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose"></pl-zl> | 240 | <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl> |
| 241 | <pl-c :plc-visible="plcVisible" :bsms="bsms" @close="plcClose"></pl-c> | 241 | <pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c> |
| 242 | <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose"></pl-sh> | 242 | <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh> |
| 243 | <h-cxlz | 243 | <h-cxlz |
| 244 | :h-cxlz-visble="hcxlzVisible" | 244 | :h-cxlz-visble="hcxlzVisible" |
| 245 | :bsms="bsms" | 245 | :bsms="bsms" |
| ... | @@ -258,6 +258,7 @@ | ... | @@ -258,6 +258,7 @@ |
| 258 | </template> | 258 | </template> |
| 259 | 259 | ||
| 260 | <script> | 260 | <script> |
| 261 | import {Message} from "element-ui" | ||
| 261 | import HCxlz from "./../../../../components/hCxlz/hCxlz"; | 262 | import HCxlz from "./../../../../components/hCxlz/hCxlz"; |
| 262 | import PlC from "./../../../../components/plc/plC"; | 263 | import PlC from "./../../../../components/plc/plC"; |
| 263 | import PlSh from "./../../../../components/plsh/plSh"; | 264 | import PlSh from "./../../../../components/plsh/plSh"; |
| ... | @@ -289,7 +290,7 @@ export default { | ... | @@ -289,7 +290,7 @@ export default { |
| 289 | props: {}, | 290 | props: {}, |
| 290 | data() { | 291 | data() { |
| 291 | return { | 292 | return { |
| 292 | bsms: ["123", "321", "231"], | 293 | bsms: [], |
| 293 | hbsm: "", | 294 | hbsm: "", |
| 294 | dialogVisible: false, | 295 | dialogVisible: false, |
| 295 | plcVisible: false, | 296 | plcVisible: false, |
| ... | @@ -298,7 +299,7 @@ export default { | ... | @@ -298,7 +299,7 @@ export default { |
| 298 | plzlVisible: false, | 299 | plzlVisible: false, |
| 299 | hbjVisible: false, | 300 | hbjVisible: false, |
| 300 | hcxlzVisible:false, | 301 | hcxlzVisible:false, |
| 301 | tabPosition: "1", //1是实测 0是预测 | 302 | scyclx: "1", //1是实测 0是预测 |
| 302 | radio1: "", | 303 | radio1: "", |
| 303 | radio2: "", | 304 | radio2: "", |
| 304 | createFlag: false, | 305 | createFlag: false, |
| ... | @@ -372,6 +373,7 @@ export default { | ... | @@ -372,6 +373,7 @@ export default { |
| 372 | lpbContentwidth: "", | 373 | lpbContentwidth: "", |
| 373 | time: "", | 374 | time: "", |
| 374 | dyztBsmList: {}, //单元状态bsmList | 375 | dyztBsmList: {}, //单元状态bsmList |
| 376 | cbsmList:[], // 层bsmlist | ||
| 375 | }; | 377 | }; |
| 376 | }, | 378 | }, |
| 377 | created() { | 379 | created() { |
| ... | @@ -391,6 +393,35 @@ export default { | ... | @@ -391,6 +393,35 @@ export default { |
| 391 | }, 100); | 393 | }, 100); |
| 392 | }, | 394 | }, |
| 393 | methods: { | 395 | methods: { |
| 396 | openPlC(){ | ||
| 397 | if (this.cbsmList.length <= 0) { | ||
| 398 | Message.warning("请选择层") | ||
| 399 | return | ||
| 400 | } | ||
| 401 | this.plcVisible=true | ||
| 402 | }, | ||
| 403 | openPl(val){ | ||
| 404 | if (this.bsms.length <= 0) { | ||
| 405 | Message.warning("请选择操作户") | ||
| 406 | return | ||
| 407 | } | ||
| 408 | switch (val) { | ||
| 409 | case 'h': | ||
| 410 | this.plhVisible=true; | ||
| 411 | break; | ||
| 412 | case 'zl': | ||
| 413 | this.plzlVisible=true; | ||
| 414 | break; | ||
| 415 | case 'sh': | ||
| 416 | this.plShVisible=true; | ||
| 417 | break; | ||
| 418 | default: | ||
| 419 | break; | ||
| 420 | } | ||
| 421 | }, | ||
| 422 | lodding(){ | ||
| 423 | this.getlpbData(); | ||
| 424 | }, | ||
| 394 | hcxlzClose() { | 425 | hcxlzClose() { |
| 395 | this.hcxlzVisible = false; | 426 | this.hcxlzVisible = false; |
| 396 | }, | 427 | }, |
| ... | @@ -406,6 +437,18 @@ export default { | ... | @@ -406,6 +437,18 @@ export default { |
| 406 | plshClose() { | 437 | plshClose() { |
| 407 | this.plShVisible = false; | 438 | this.plShVisible = false; |
| 408 | }, | 439 | }, |
| 440 | //改变是预测数据类型 | ||
| 441 | scyclxChange(val){ | ||
| 442 | //清空已选中层户 | ||
| 443 | this.cbsmList = []; | ||
| 444 | this.bsms = []; | ||
| 445 | console.log(this.$refs.lpbContent.$refs.hBsm,'this.$refs.lpbContent'); | ||
| 446 | this.$refs.lpbContent.$refs.hBsm.forEach(item=>{ | ||
| 447 | if (item.className == "tdSelect") { | ||
| 448 | item.className = ""; | ||
| 449 | } | ||
| 450 | }) | ||
| 451 | }, | ||
| 409 | //获取高度计算lpb内容区高度 | 452 | //获取高度计算lpb内容区高度 |
| 410 | getHeight() { | 453 | getHeight() { |
| 411 | this.lpbContentHight = window.innerHeight - 285; | 454 | this.lpbContentHight = window.innerHeight - 285; |
| ... | @@ -484,6 +527,11 @@ export default { | ... | @@ -484,6 +527,11 @@ export default { |
| 484 | } | 527 | } |
| 485 | console.log(this.bsms); | 528 | console.log(this.bsms); |
| 486 | }, | 529 | }, |
| 530 | //获取选中层bsmlist | ||
| 531 | getCbsm(data){ | ||
| 532 | this.cbsmList = data; | ||
| 533 | console.log(this.cbsmList); | ||
| 534 | }, | ||
| 487 | //不动产单元号输入框事件 | 535 | //不动产单元号输入框事件 |
| 488 | inputFocus() { | 536 | inputFocus() { |
| 489 | this.inputWidth = 200; | 537 | this.inputWidth = 200; |
| ... | @@ -554,7 +602,7 @@ export default { | ... | @@ -554,7 +602,7 @@ export default { |
| 554 | getDyztBsmList() { | 602 | getDyztBsmList() { |
| 555 | let data = { | 603 | let data = { |
| 556 | zrzbsm: this.$store.state.zrzbsm, | 604 | zrzbsm: this.$store.state.zrzbsm, |
| 557 | syclx: "0", | 605 | scyclx: "0", |
| 558 | }; | 606 | }; |
| 559 | getLpbTj(data).then((res) => { | 607 | getLpbTj(data).then((res) => { |
| 560 | if (res.code === 200) { | 608 | if (res.code === 200) { |
| ... | @@ -603,7 +651,7 @@ export default { | ... | @@ -603,7 +651,7 @@ export default { |
| 603 | getLpbFwytAndQlxz(){ | 651 | getLpbFwytAndQlxz(){ |
| 604 | let data = { | 652 | let data = { |
| 605 | zrzbsm: this.$store.state.zrzbsm, | 653 | zrzbsm: this.$store.state.zrzbsm, |
| 606 | syclx: "0", | 654 | scyclx: "0", |
| 607 | }; | 655 | }; |
| 608 | getLpbFwytAndQlxz(data).then((res) => { | 656 | getLpbFwytAndQlxz(data).then((res) => { |
| 609 | if (res.code === 200) { | 657 | if (res.code === 200) { | ... | ... |
| ... | @@ -30,13 +30,13 @@ | ... | @@ -30,13 +30,13 @@ |
| 30 | <el-input v-model="form.ljzmc"></el-input> | 30 | <el-input v-model="form.ljzmc"></el-input> |
| 31 | </td> | 31 | </td> |
| 32 | <td colspan="2" align="center">不动产单元号</td> | 32 | <td colspan="2" align="center">不动产单元号</td> |
| 33 | <td colspan="4"> | 33 | <td colspan="4" class="psr"> |
| 34 | <el-input v-model="form.bdcdyh" style="width: 70%"></el-input> | 34 | <el-input v-model="form.bdcdyh" class="percent80"></el-input> |
| 35 | <el-button | 35 | <el-button |
| 36 | @click.prevent="" | 36 | @click.prevent="" |
| 37 | size="mini" | 37 | size="mini" |
| 38 | type="primary" | 38 | type="warning" |
| 39 | style="width:25%;margin-left:3%" | 39 | class="createBtn" |
| 40 | >生成</el-button | 40 | >生成</el-button |
| 41 | > | 41 | > |
| 42 | </td> | 42 | </td> | ... | ... |
This diff is collapsed.
Click to expand it.
| ... | @@ -44,6 +44,7 @@ export default { | ... | @@ -44,6 +44,7 @@ export default { |
| 44 | height: 100%; | 44 | height: 100%; |
| 45 | box-sizing: border-box; | 45 | box-sizing: border-box; |
| 46 | padding:18px; | 46 | padding:18px; |
| 47 | padding-bottom: 0; | ||
| 47 | -webkit-user-select:none; | 48 | -webkit-user-select:none; |
| 48 | -moz-user-select:none; | 49 | -moz-user-select:none; |
| 49 | -ms-user-select:none; | 50 | -ms-user-select:none; | ... | ... |
| ... | @@ -13,7 +13,14 @@ | ... | @@ -13,7 +13,14 @@ |
| 13 | </table> | 13 | </table> |
| 14 | <table border="1"> | 14 | <table border="1"> |
| 15 | <tr> | 15 | <tr> |
| 16 | <td @click="addRow">+</td> | 16 | <td> |
| 17 | <el-button | ||
| 18 | type="primary" | ||
| 19 | class="changeBtn outAdd addMinus" | ||
| 20 | @click="addRow" | ||
| 21 | >+</el-button | ||
| 22 | > | ||
| 23 | </td> | ||
| 17 | <td>建(构)筑物编号</td> | 24 | <td>建(构)筑物编号</td> |
| 18 | <td>建(构)筑物数量</td> | 25 | <td>建(构)筑物数量</td> |
| 19 | <td>建(构)筑物面积(㎡)</td> | 26 | <td>建(构)筑物面积(㎡)</td> |
| ... | @@ -22,13 +29,20 @@ | ... | @@ -22,13 +29,20 @@ |
| 22 | <td>附记</td> | 29 | <td>附记</td> |
| 23 | </tr> | 30 | </tr> |
| 24 | <tr v-for="(item,i) in Data.list" :key="i"> | 31 | <tr v-for="(item,i) in Data.list" :key="i"> |
| 25 | <td @click="delRow(i)">-</td> | 32 | <td> |
| 26 | <td><input type="text" class="formInput" v-model="item.jgzwbh"/></td> | 33 | <el-button |
| 27 | <td><input type="number" class="formInput" v-model="item.jgzsl" @keydown="oninput"/></td> | 34 | type="primary" |
| 28 | <td><input type="number" class="formInput" v-model.number="item.jgzmj" @keydown="oninput"/></td> | 35 | class="changeBtn outMinus addMinus" |
| 29 | <td><input type="number" class="formInput" v-model.number="item.zdmj" @keydown="oninput"/></td> | 36 | @click="delRow(i)" |
| 30 | <td><input type="number" class="formInput" v-model.number="item.fttdmj" @keydown="oninput"/></td> | 37 | >-</el-button |
| 31 | <td><input type="text" class="formInput" v-model="item.fj"/></td> | 38 | > |
| 39 | </td> | ||
| 40 | <td><el-input v-model="item.jgzwbh" placeholder="请输入建(构)筑物编号"></el-input></td> | ||
| 41 | <td><el-input v-model="item.jgzsl" oninput="value = (value.match(/^\d*/g)) || null" placeholder="请输入建(构)筑物数量"></el-input></td> | ||
| 42 | <td><el-input v-model="item.jgzmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入建(构)筑物面积(㎡)"></el-input></td> | ||
| 43 | <td><el-input v-model="item.zdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入占地面积(㎡)"></el-input></td> | ||
| 44 | <td><el-input v-model="item.fttdmj" oninput="value = (value.match(/^\d*(\.?\d{0,3})/g)[0]) || null" placeholder="请输入分摊土地面积(㎡)"></el-input></td> | ||
| 45 | <td><el-input v-model="item.fj" placeholder="请输入附记"></el-input></td> | ||
| 32 | </tr> | 46 | </tr> |
| 33 | <!-- <tr> | 47 | <!-- <tr> |
| 34 | <td>统计</td> | 48 | <td>统计</td> |
| ... | @@ -94,9 +108,6 @@ | ... | @@ -94,9 +108,6 @@ |
| 94 | } | 108 | } |
| 95 | }) | 109 | }) |
| 96 | }, | 110 | }, |
| 97 | oninput(e) { | ||
| 98 | e.target.value = (e.target.value.match(/^\d*(\.?\d{0,2})/g)[0]) || null | ||
| 99 | }, | ||
| 100 | addRow() { | 111 | addRow() { |
| 101 | this.Data.list.push({ | 112 | this.Data.list.push({ |
| 102 | jgzwbh: '', // 建(构)筑物编号 | 113 | jgzwbh: '', // 建(构)筑物编号 | ... | ... |
| ... | @@ -13,19 +13,19 @@ | ... | @@ -13,19 +13,19 @@ |
| 13 | <input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm"> | 13 | <input v-show="false" :disabled="form.qszt!='0'" class="formInput" v-model="form.zdbsm"> |
| 14 | </td> | 14 | </td> |
| 15 | <td colspan="2" >自然幢号<i class="requisite">*</i></td> | 15 | <td colspan="2" >自然幢号<i class="requisite">*</i></td> |
| 16 | <td colspan="4" > | 16 | <td colspan="4" class="psr"> |
| 17 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.zrzh"> | 17 | <input class="formInput percent80" :disabled="form.qszt!='0'" v-model="form.zrzh"> |
| 18 | <el-button @click.prevent="generatorCode" type="warning" class="createBtn" size="mini">生成</el-button> | ||
| 18 | </td> | 19 | </td> |
| 19 | </tr> | 20 | </tr> |
| 20 | <tr> | 21 | <tr> |
| 21 | <td colspan="2" >项目名称<i class="requisite">*</i></td> | 22 | <td colspan="2" >项目名称<i class="requisite">*</i></td> |
| 22 | <td colspan="4" > | 23 | <td colspan="4" > |
| 23 | <input class="formInput" :disabled="form.qszt!='0'" v-model="form.xmmc"> | 24 | <input class="formInput " :disabled="form.qszt!='0'" v-model="form.xmmc"> |
| 24 | </td> | 25 | </td> |
| 25 | <td colspan="2" >不动产单元号<i class="requisite">*</i></td> | 26 | <td colspan="2" >不动产单元号<i class="requisite">*</i></td> |
| 26 | <td colspan="4" > | 27 | <td colspan="4"> |
| 27 | <input class="formInput percent78" :disabled="form.qszt!='0'" v-model="form.bdcdyh" style="width: 70%"> | 28 | <input class="formInput " :disabled="form.qszt!='0'" v-model="form.bdcdyh"> |
| 28 | <el-button @click.prevent="generatorCode" type="primary" size="mini" style="width:25%;margin-left:3%">生成</el-button> | ||
| 29 | </td> | 29 | </td> |
| 30 | </tr> | 30 | </tr> |
| 31 | 31 | ||
| ... | @@ -145,12 +145,12 @@ | ... | @@ -145,12 +145,12 @@ |
| 145 | 145 | ||
| 146 | <tr v-for="(item1,index) in form.fwytList" :key="index"> | 146 | <tr v-for="(item1,index) in form.fwytList" :key="index"> |
| 147 | <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" id="ytTitle"> | 147 | <td colspan="2" v-if="index===0" :rowspan="ytTitleRowspan" id="ytTitle"> |
| 148 | <el-button type="primary" size="mini" style="margin-right: 10px" @click="addYtInfo">添加</el-button> | 148 | <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addYtInfo">+</el-button> |
| 149 | <span>用途<i class="requisite">*</i></span> | 149 | <span> 用途<i class="requisite">*</i></span> |
| 150 | </td> | 150 | </td> |
| 151 | 151 | ||
| 152 | <td colspan="1" style="min-width:120px"> | 152 | <td colspan="1" style="min-width:120px"> |
| 153 | <el-button type="info" size="mini" style="" @click="deleteYtInfo(index)" circle>删除</el-button> | 153 | <el-button type="info" class="inMinus addMinus" size="mini" style="" @click="deleteYtInfo(index)" circle>-</el-button> |
| 154 | 规划用途 | 154 | 规划用途 |
| 155 | </td> | 155 | </td> |
| 156 | <td colspan="3" > | 156 | <td colspan="3" > |
| ... | @@ -186,11 +186,12 @@ | ... | @@ -186,11 +186,12 @@ |
| 186 | 186 | ||
| 187 | <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> | 187 | <tr v-for="(item1,index) in form.fwjgList" :key="'jg'+index"> |
| 188 | <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" > | 188 | <td colspan="2" v-if="index===0" :rowspan="fwjgTitleRowspan" > |
| 189 | <el-button type="primary" size="mini" style="margin-right: 10px" @click="addFwjgInfo">添加</el-button> | 189 | <el-button type="primary" class="outAdd addMinus" size="mini" style="margin-right: 10px" @click="addFwjgInfo">+</el-button> |
| 190 | <span>房屋结构<i class="requisite">*</i></span> | 190 | <span>房屋结构<i class="requisite">*</i></span> |
| 191 | </td> | 191 | </td> |
| 192 | <td colspan="1" > | 192 | <td colspan="1" > |
| 193 | <span @click="deleteFwjgInfo(index)">删除</span> | 193 | <el-button type="primary" class="inMinus addMinus" size="mini" style="margin-right: 10px" @click="deleteFwjgInfo(index)">-</el-button> |
| 194 | <span> 删除</span> | ||
| 194 | </td> | 195 | </td> |
| 195 | <td colspan="9" > | 196 | <td colspan="9" > |
| 196 | <el-select class="persent78" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" > | 197 | <el-select class="persent78" :disabled="form.qszt!='0'" v-model="item1.fwjgzdbsm" placeholder="请选择" > |
| ... | @@ -205,13 +206,10 @@ | ... | @@ -205,13 +206,10 @@ |
| 205 | </tr> | 206 | </tr> |
| 206 | 207 | ||
| 207 | <tr> | 208 | <tr> |
| 208 | <td colspan="12" rowspan="4" align="center"> | 209 | <td colspan="12" align="center"> |
| 209 | <Qlxz ref="qlxzModule" :formData="form"></Qlxz> | 210 | <Qlxz ref="qlxzModule" :formData="form"></Qlxz> |
| 210 | </td> | 211 | </td> |
| 211 | </tr> | 212 | </tr> |
| 212 | <tr></tr> | ||
| 213 | <tr></tr> | ||
| 214 | <tr></tr> | ||
| 215 | 213 | ||
| 216 | <tr> | 214 | <tr> |
| 217 | <td colspan="2" > | 215 | <td colspan="2" > |
| ... | @@ -262,7 +260,7 @@ | ... | @@ -262,7 +260,7 @@ |
| 262 | </el-date-picker> | 260 | </el-date-picker> |
| 263 | </td> | 261 | </td> |
| 264 | </tr> | 262 | </tr> |
| 265 | 263 | ||
| 266 | </table> | 264 | </table> |
| 267 | <div style="min-height: 40px;text-align: center;margin-top: 10px"> | 265 | <div style="min-height: 40px;text-align: center;margin-top: 10px"> |
| 268 | <el-button type="success" @click="onSave">保存</el-button> | 266 | <el-button type="success" @click="onSave">保存</el-button> |
| ... | @@ -274,7 +272,7 @@ | ... | @@ -274,7 +272,7 @@ |
| 274 | 272 | ||
| 275 | <script> | 273 | <script> |
| 276 | import Qlr from "../../../components/formMenu/qlr"; | 274 | import Qlr from "../../../components/formMenu/qlr"; |
| 277 | import Qlxz from "../../../components/formMenu/qlxz"; | 275 | import Qlxz from "../../../components/formMenu/qlxz_simple"; |
| 278 | import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" | 276 | import {getBdcdyh,saveZrzInfo,getZrzDetailByBsm} from "../../../api/zrz" |
| 279 | import {getQjZdjbxxDetailById} from "../../../api/zd" | 277 | import {getQjZdjbxxDetailById} from "../../../api/zd" |
| 280 | import {submit} from "../../../api/common" | 278 | import {submit} from "../../../api/common" |
| ... | @@ -605,10 +603,6 @@ | ... | @@ -605,10 +603,6 @@ |
| 605 | text-align: center; | 603 | text-align: center; |
| 606 | cursor: text; | 604 | cursor: text; |
| 607 | } | 605 | } |
| 608 | .percent78 { | ||
| 609 | width: 78%; | ||
| 610 | float: left; | ||
| 611 | } | ||
| 612 | .percent68 { | 606 | .percent68 { |
| 613 | width: 68% !important; | 607 | width: 68% !important; |
| 614 | float: left; | 608 | float: left; |
| ... | @@ -629,13 +623,6 @@ | ... | @@ -629,13 +623,6 @@ |
| 629 | width: 30% !important; | 623 | width: 30% !important; |
| 630 | float: left; | 624 | float: left; |
| 631 | } | 625 | } |
| 632 | .createBtn { | ||
| 633 | position: absolute; | ||
| 634 | width: 50px; | ||
| 635 | padding: 6px 4px; | ||
| 636 | right: 4px; | ||
| 637 | top: 4px; | ||
| 638 | } | ||
| 639 | .el-input__icon { | 626 | .el-input__icon { |
| 640 | line-height: 37px; | 627 | line-height: 37px; |
| 641 | } | 628 | } |
| ... | @@ -644,4 +631,4 @@ | ... | @@ -644,4 +631,4 @@ |
| 644 | } | 631 | } |
| 645 | } | 632 | } |
| 646 | } | 633 | } |
| 647 | </style> | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 634 | </style> | ... | ... |
-
Please register or sign in to post a comment