Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
c0d9c30c by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents e5b0ff8a 8a077920
Inline Side-by-side
Showing 6 changed files with 302 additions and 89 deletions
...@@ -50,7 +50,7 @@ export function getLpb (data,lx) { ...@@ -50,7 +50,7 @@ export function getLpb (data,lx) {
50 method: 'get', 50 method: 'get',
51 params: { 51 params: {
52 zrzbsm:data, 52 zrzbsm:data,
53 syclx:lx, 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 }
......
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>
...@@ -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">
...@@ -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:'',
......
...@@ -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="syclx" @change="syclxChange"> 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>
...@@ -299,7 +299,7 @@ export default { ...@@ -299,7 +299,7 @@ export default {
299 plzlVisible: false, 299 plzlVisible: false,
300 hbjVisible: false, 300 hbjVisible: false,
301 hcxlzVisible:false, 301 hcxlzVisible:false,
302 syclx: "1", //1是实测 0是预测 302 scyclx: "1", //1是实测 0是预测
303 radio1: "", 303 radio1: "",
304 radio2: "", 304 radio2: "",
305 createFlag: false, 305 createFlag: false,
...@@ -438,7 +438,7 @@ export default { ...@@ -438,7 +438,7 @@ export default {
438 this.plShVisible = false; 438 this.plShVisible = false;
439 }, 439 },
440 //改变是预测数据类型 440 //改变是预测数据类型
441 syclxChange(val){ 441 scyclxChange(val){
442 //清空已选中层户 442 //清空已选中层户
443 this.cbsmList = []; 443 this.cbsmList = [];
444 this.bsms = []; 444 this.bsms = [];
...@@ -602,7 +602,7 @@ export default { ...@@ -602,7 +602,7 @@ export default {
602 getDyztBsmList() { 602 getDyztBsmList() {
603 let data = { 603 let data = {
604 zrzbsm: this.$store.state.zrzbsm, 604 zrzbsm: this.$store.state.zrzbsm,
605 syclx: "0", 605 scyclx: "0",
606 }; 606 };
607 getLpbTj(data).then((res) => { 607 getLpbTj(data).then((res) => {
608 if (res.code === 200) { 608 if (res.code === 200) {
...@@ -651,7 +651,7 @@ export default { ...@@ -651,7 +651,7 @@ export default {
651 getLpbFwytAndQlxz(){ 651 getLpbFwytAndQlxz(){
652 let data = { 652 let data = {
653 zrzbsm: this.$store.state.zrzbsm, 653 zrzbsm: this.$store.state.zrzbsm,
654 syclx: "0", 654 scyclx: "0",
655 }; 655 };
656 getLpbFwytAndQlxz(data).then((res) => { 656 getLpbFwytAndQlxz(data).then((res) => {
657 if (res.code === 200) { 657 if (res.code === 200) {
......
1 <template> 1 <template>
2 <div class="lpbContent-wrap" ref="lpbContentWrap"> 2 <div class="lpbContent-wrap" ref="lpbContentWrap">
3 <div class="lpbContent" ref="lpbContent" v-loading='loading'> 3 <div :class="lpbData.ljzs.length == 0 ? 'column-reverse lpbContent':'lpbContent'" ref="lpbContent" v-loading='loading'>
4 <div :class="(lpbData.cs.length == 0 && lpbData.zdys.length == 0) ? 'bottom40 ljz-wrap':'ljz-wrap'" :style="{'width':ljzWidth+'px'}" v-show="lpbData.ljzs.length>0"> 4 <div :class="(lpbData.cs.length == 0 && lpbData.zdys.length == 0) ? 'bottom40 ljz-wrap':'ljz-wrap'" :style="{'width':ljzWidth+'px'}" v-show="lpbData.ljzs.length>0">
5 <!-- 循环逻辑幢数据 --> 5 <!-- 循环逻辑幢数据 -->
6 <div class="ljz" ref="ljz" v-for="(ljzs,ljzIndex) in lpbData.ljzs" :key="ljzIndex"> 6 <div class="ljz" ref="ljz" v-for="(ljzs,ljzIndex) in lpbData.ljzs" :key="ljzIndex">
...@@ -90,20 +90,41 @@ ...@@ -90,20 +90,41 @@
90 <li v-show='rightClickFlag=="h"' @click="handleMoveH">移动</li> 90 <li v-show='rightClickFlag=="h"' @click="handleMoveH">移动</li>
91 <li v-show='rightClickFlag=="h"' @click="handleDeleteH">删除</li> 91 <li v-show='rightClickFlag=="h"' @click="handleDeleteH">删除</li>
92 <li v-show='rightClickFlag=="h"' @click="handleSyczh">实预测转换</li> 92 <li v-show='rightClickFlag=="h"' @click="handleSyczh">实预测转换</li>
93 <li v-show='rightClickFlag=="c"' @click="handleUpAddC">向上添加层</li> 93 <li v-show='rightClickFlag=="c"' @click="handleAddC('up')">向上添加层</li>
94 <li v-show='rightClickFlag=="c"' @click="handleDownAddC">向下添加层</li> 94 <li v-show='rightClickFlag=="c"' @click="handleAddC('down')">向下添加层</li>
95 <li v-show='rightClickFlag=="c"' @click="handleDeleteC">删除层</li> 95 <li v-show='rightClickFlag=="c"' @click="handleDeleteC">删除层</li>
96 </ul> 96 </ul>
97 <!-- 层操作弹框 -->
98 <el-dialog :title="addCData.title" :visible.sync="addCVisible" width="50%" center>
99 <el-form :model="addCData">
100 <el-form-item label="层号" :label-width="formLabelWidth">
101 <el-input disabled v-model="addCData.sjc" autocomplete="off"></el-input>
102 </el-form-item>
103 <el-form-item label="实际层" :label-width="formLabelWidth">
104 <el-input disabled v-model="addCData.sjc" autocomplete="off"></el-input>
105 </el-form-item>
106 <el-form-item label="添加的户数" :label-width="formLabelWidth">
107 <el-input v-model="addCData.hcount" autocomplete="off"></el-input>
108 </el-form-item>
109 </el-form>
110 <div class="btnGroup">
111 <el-button type="primary" @click="saveAddC">保存</el-button>
112 <el-button type="primary" @click="addCVisible = false">取消</el-button>
113 </div>
114 </el-dialog>
115 <move-h :hbsm="chData.bsm" @close="moveHClose" :move-hvisible="moveHvisible" :type="scyclx" @loading="loadingData"></move-h>
97 </div> 116 </div>
98 </template> 117 </template>
99 <script> 118 <script>
100 import { getLpb } from "../../../../../api/lpb"; 119 import moveH from "./../../../../../components/moveH/moveH"
120 import { getLpb,insertUpDownC,deleteCByBsm } from "../../../../../api/lpb";
101 export default { 121 export default {
102 name: "", 122 name: "",
103 components: {}, 123 components: {moveH},
104 props: {}, 124 props: {},
105 data() { 125 data() {
106 return { 126 return {
127 moveHvisible:false,
107 lpbData: { 128 lpbData: {
108 ljzs: [], 129 ljzs: [],
109 cs: [], 130 cs: [],
...@@ -128,12 +149,22 @@ export default { ...@@ -128,12 +149,22 @@ export default {
128 lpbChTop:100, 149 lpbChTop:100,
129 //右键层户数据 150 //右键层户数据
130 chData:'', 151 chData:'',
131 rightClickFlag:"" 152 rightClickFlag:"",
153 //层操作数据
154 addCVisible:false,
155 addCData:{
156 title:"",
157 cbsm:"",//层标识码
158 hcount:"",//添加户数
159 scyclx:"",//实测预测类型
160 sjc:"", //当前的层的SJC +1
161 },
162 formLabelWidth: '120px'
132 }; 163 };
133 }, 164 },
134 created() {}, 165 created() {},
135 mounted() { 166 mounted() {
136 this.getLpb(this.$store.state.zrzbsm,this.$parent.syclx); 167 this.getLpb(this.$store.state.zrzbsm,this.$parent.scyclx);
137 setTimeout(() => { 168 setTimeout(() => {
138 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight 169 //tab-content宽度 - 右侧图例宽度 - lp-overview滚动条宽度 - lpbContent的pandingRight
139 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20; 170 this.lpbContentWidth = this.$store.state.contentWidth - 34 - 20;
...@@ -145,9 +176,12 @@ export default { ...@@ -145,9 +176,12 @@ export default {
145 }, 200); 176 }, 200);
146 }, 177 },
147 methods: { 178 methods: {
179 loadingData(){
180 this.getLpb(this.$store.state.zrzbsm,this.$parent.scyclx);
181 },
148 //获取楼盘表数据 182 //获取楼盘表数据
149 getLpb(zrzbsm,syclx) { 183 getLpb(zrzbsm,scyclx) {
150 getLpb(zrzbsm,syclx).then((res) => { 184 getLpb(zrzbsm,scyclx).then((res) => {
151 if (res.code == 200) { 185 if (res.code == 200) {
152 this.loading = false; 186 this.loading = false;
153 this.lpbData = res.result == null ? this.lpbData : res.result; 187 this.lpbData = res.result == null ? this.lpbData : res.result;
...@@ -241,7 +275,7 @@ export default { ...@@ -241,7 +275,7 @@ export default {
241 // this.zdyWidth = 124; 275 // this.zdyWidth = 124;
242 } 276 }
243 277
244 278
245 }, 279 },
246 //户单击事件 280 //户单击事件
247 handleTdClick(e, bsm) { 281 handleTdClick(e, bsm) {
...@@ -321,7 +355,13 @@ export default { ...@@ -321,7 +355,13 @@ export default {
321 355
322 }, 356 },
323 handleMoveH(){ 357 handleMoveH(){
324 358 // 移动户
359 console.log(this.chData,"chData")
360 console.log(this.$parent.scyclx,"实预测类型")
361 this.moveHvisible=true;
362 },
363 moveHClose(){
364 this.moveHvisible=false;
325 }, 365 },
326 handleDeleteH(){ 366 handleDeleteH(){
327 367
...@@ -331,32 +371,61 @@ export default { ...@@ -331,32 +371,61 @@ export default {
331 }, 371 },
332 //end 372 //end
333 // 层右键菜单 start 373 // 层右键菜单 start
334 handleUpAddC(){ 374 //添加
335 ///fw/lpbright/insertUpDownC 375 handleAddC(type){
336 //注：应该增加一个弹出窗口，输入新增户数 376 this.addCData.title = type == "up" ? "向上添加层" : "向下添加层";
337 // { 377 this.addCVisible = true;
338 // "cbsm": "63147d2d9766db01ead0cd53f23de908",//层标识码 378 this.addCData.sjc = type == "up" ? Number(this.chData.sjc) + 1 : Number(this.chData.sjc) - 1;
339 // "hcount": 3,//添加户数 379 this.addCData.cbsm = this.chData.bsm;
340 // "scyclx": "1",//实测预测类型 380 this.addCData.scyclx = this.$parent.scyclx;
341 // "sjc": 4//当前的层的SJC +1
342 // }
343 },
344 handleDownAddC(){
345 ///fw/lpbright/insertUpDownC
346 //注：应该增加一个弹出窗口，输入新增户数
347 // {
348 // "cbsm": "63147d2d9766db01ead0cd53f23de908",//层标识码
349 // "hcount": 3,//添加户数
350 // "scyclx": "1",//实测预测类型
351 // "sjc": 4//当前的层的SJC -1
352 // }
353 }, 381 },
382 //删除
354 handleDeleteC(){ 383 handleDeleteC(){
355 // 层右键菜单 /fw/lpbright/deleteCByBsm 384 let params = {
356 // 删除层：{ 385 cbsm:this.chData.bsm,
357 // "bsm": "c0818d9e4286b35b8ee9b96d90b522aa", 386 scyclx:this.$parent.scyclx
358 // "scyclx": "1" 387 }
359 // } 388 this.$confirm('是否确认删除该层?', '提示', {
389 confirmButtonText: '确定',
390 cancelButtonText: '取消',
391 type: 'warning'
392 }).then(() => {
393 deleteCByBsm(params).then((res) => {
394 if (res.code == 200) {
395 this.$message({
396 message: "删除成功",
397 type: "success",
398 });
399 this.getLpb(this.$store.state.zrzbsm,this.$parent.scyclx);
400 }else{
401 this.$message({
402 message: res.message,
403 type: "warning",
404 });
405 }
406 });
407 }).catch(() => {
408
409 });
410
411 },
412 //确认添加
413 saveAddC(){
414 insertUpDownC(this.addCData).then((res) => {
415 if (res.code == 200) {
416 this.$message({
417 message: "添加成功",
418 type: "success",
419 });
420 this.getLpb(this.$store.state.zrzbsm,this.$parent.scyclx);
421 this.addCVisible = false;
422 }else{
423 this.$message({
424 message: res.message,
425 type: "warning",
426 });
427 }
428 });
360 }, 429 },
361 //end 430 //end
362 }, 431 },
...@@ -367,12 +436,12 @@ export default { ...@@ -367,12 +436,12 @@ export default {
367 legendToggleFlagChange() { 436 legendToggleFlagChange() {
368 return this.$parent.legendToggleFlag; 437 return this.$parent.legendToggleFlag;
369 }, 438 },
370 syclx(){ 439 scyclx(){
371 return this.$parent.syclx 440 return this.$parent.scyclx
372 } 441 }
373 }, 442 },
374 watch: { 443 watch: {
375 syclx(n){ 444 scyclx(n){
376 this.getLpb(this.$store.state.zrzbsm,n) 445 this.getLpb(this.$store.state.zrzbsm,n)
377 }, 446 },
378 createFlagChange: function(val) { 447 createFlagChange: function(val) {
...@@ -550,6 +619,10 @@ export default { ...@@ -550,6 +619,10 @@ export default {
550 } 619 }
551 // end 620 // end
552 } 621 }
622 .column-reverse {
623 display: flex;
624 flex-direction: column-reverse;
625 }
553 .zrz { 626 .zrz {
554 height: 60px; 627 height: 60px;
555 line-height: 60px; 628 line-height: 60px;
...@@ -559,5 +632,10 @@ export default { ...@@ -559,5 +632,10 @@ export default {
559 text-align: center; 632 text-align: center;
560 transition: 0.5s; 633 transition: 0.5s;
561 } 634 }
635
636 .btnGroup {
637 margin: 20px auto 0;
638 width: 150px;
639 }
562 } 640 }
563 </style> 641 </style>
......
...@@ -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;
......