Skip to content

任超 / js.CadastralSystem

Go to a project
Toggle navigation
Toggle navigation pinning
4e2c62ef by zhaoqian
Options

Merge remote-tracking branch 'origin/master'

2 parents 74ea6241 f35f0f09
Expand all
Inline Side-by-side
Showing 5 changed files with 25 additions and 22 deletions
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
5 :visible.sync="isVisible" 5 :visible.sync="isVisible"
6 width="70%" 6 width="70%"
7 @close="close" 7 @close="close"
8 :modal-append-to-body="false" 8 append-to-body
9 > 9 >
10 <div class="search"> 10 <div class="search">
11 <el-row> 11 <el-row>
......
...@@ -313,7 +313,7 @@ export default { ...@@ -313,7 +313,7 @@ export default {
313 this.tableHeight = 313 this.tableHeight =
314 (document.documentElement.clientHeight || document.body.clientHeight) - 314 (document.documentElement.clientHeight || document.body.clientHeight) -
315 392; 315 392;
316 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 205; 316 this.lpbContentHeight = (document.documentElement.clientHeight || document.body.clientHeight) - 208;
317 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6; 317 this.lpbContentwidth = this.$refs.lpbContentWrap.clientWidth - 34 - 6;
318 }); 318 });
319 }, 319 },
......
...@@ -252,17 +252,11 @@ ...@@ -252,17 +252,11 @@
252 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl> 252 <pl-zl :pl-zl-visible="plzlVisible" :bsms="bsms" @close="plZlClose" @lodding="lodding"></pl-zl>
253 <pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c> 253 <pl-c :plc-visible="plcVisible" :bsms="cbsmList" @close="plcClose" @lodding="lodding"></pl-c>
254 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh> 254 <pl-sh :plShVisible="plShVisible" :bsms="bsms" @close="plshClose" @lodding="lodding"></pl-sh>
255 <h-cxlz
256 :h-cxlz-visble="hcxlzVisible"
257 :bsms="bsms"
258 @close="hcxlzClose"
259 ></h-cxlz>
260 </div> 255 </div>
261 </template> 256 </template>
262 257
263 <script> 258 <script>
264 import {Message} from "element-ui" 259 import {Message} from "element-ui"
265 import HCxlz from "@components/hCxlz/hCxlz";
266 import PlC from "@components/plc/plC"; 260 import PlC from "@components/plc/plC";
267 import PlSh from "@components/plsh/plSh"; 261 import PlSh from "@components/plsh/plSh";
268 import PlH from "@components/plh/plH"; 262 import PlH from "@components/plh/plH";
...@@ -286,7 +280,6 @@ export default { ...@@ -286,7 +280,6 @@ export default {
286 PlSh, 280 PlSh,
287 PlH, 281 PlH,
288 PlZl, 282 PlZl,
289 HCxlz,
290 }, 283 },
291 props: {}, 284 props: {},
292 data() { 285 data() {
...@@ -297,8 +290,6 @@ export default { ...@@ -297,8 +290,6 @@ export default {
297 plhVisible: false, 290 plhVisible: false,
298 plShVisible: false, 291 plShVisible: false,
299 plzlVisible: false, 292 plzlVisible: false,
300 hbjVisible: false,
301 hcxlzVisible:false,
302 scyclx: "0", //1是实测 0是预测 293 scyclx: "0", //1是实测 0是预测
303 radio1: "", 294 radio1: "",
304 radio2: "", 295 radio2: "",
...@@ -404,13 +395,6 @@ export default { ...@@ -404,13 +395,6 @@ export default {
404 } 395 }
405 }) 396 })
406 }, 397 },
407 hcxlz(){
408 if (this.bsms.length <= 0) {
409 Message.warning("请选择操作户")
410 return
411 }
412 this.hcxlzVisible = true
413 },
414 loading(){ 398 loading(){
415 this.getLpbMenuTree(this.$store.state.zrzbsm); 399 this.getLpbMenuTree(this.$store.state.zrzbsm);
416 }, 400 },
...@@ -443,9 +427,6 @@ export default { ...@@ -443,9 +427,6 @@ export default {
443 lodding(){ 427 lodding(){
444 this.getlpbData(); 428 this.getlpbData();
445 }, 429 },
446 hcxlzClose() {
447 this.hcxlzVisible = false;
448 },
449 plZlClose() { 430 plZlClose() {
450 this.plzlVisible = false; 431 this.plzlVisible = false;
451 }, 432 },
......
...@@ -304,6 +304,8 @@ ...@@ -304,6 +304,8 @@
304 <li v-show="rightClickFlag == 'fg'" @click="handleFg">户分割</li> 304 <li v-show="rightClickFlag == 'fg'" @click="handleFg">户分割</li>
305 <!-- 范围属性变更 --> 305 <!-- 范围属性变更 -->
306 <li v-show="rightClickFlag == 'fwsxbg'" @click="handleFwsxbg">变更信息</li> 306 <li v-show="rightClickFlag == 'fwsxbg'" @click="handleFwsxbg">变更信息</li>
307 <!-- 重新落宗 -->
308 <li v-show="rightClickFlag == 'cxlz'" @click="handleCxlz">重新落宗</li>
307 309
308 310
309 </ul> 311 </ul>
...@@ -368,10 +370,17 @@ ...@@ -368,10 +370,17 @@
368 <el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="80%" > 370 <el-dialog v-dialogDrag :close-on-click-modal="false" title="户编辑" class="hbjDialog" :visible.sync="hbjVisible" width="80%" >
369 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj> 371 <hbj ref="hbj" :bsm="hbsm" :scyclx="scyclx"></hbj>
370 </el-dialog> 372 </el-dialog>
373 <!-- 户重新落宗 -->
374 <h-cxlz
375 :h-cxlz-visble="hcxlzVisible"
376 :bsms="hbsmList"
377 @close="hcxlzVisible = false"
378 ></h-cxlz>
371 </div> 379 </div>
372 </template> 380 </template>
373 <script> 381 <script>
374 import moveH from "@components/moveH/moveH"; 382 import moveH from "@components/moveH/moveH";
383 import HCxlz from "@components/hCxlz/hCxlz";
375 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb"; 384 import { getLpb, insertUpDownC, deleteCByBsm } from "@api/lpb";
376 import { hhb,hfg } from "@api/h"; 385 import { hhb,hfg } from "@api/h";
377 import { Message } from 'element-ui'; 386 import { Message } from 'element-ui';
...@@ -379,7 +388,7 @@ import { fwsxbgbl } from "@api/common"; ...@@ -379,7 +388,7 @@ import { fwsxbgbl } from "@api/common";
379 import hbj from "../hbj/index"; 388 import hbj from "../hbj/index";
380 export default { 389 export default {
381 name: "", 390 name: "",
382 components: { moveH,hbj }, 391 components: { moveH,hbj,HCxlz, },
383 props: { 392 props: {
384 zrzbsm:{ 393 zrzbsm:{
385 type:String, 394 type:String,
...@@ -403,6 +412,7 @@ export default { ...@@ -403,6 +412,7 @@ export default {
403 zdys: [], 412 zdys: [],
404 }, 413 },
405 hbjVisible:false, 414 hbjVisible:false,
415 hcxlzVisible:false,
406 lpbContentWidth: "", 416 lpbContentWidth: "",
407 ljzWidth: 10000, 417 ljzWidth: 10000,
408 zdyWidth: 1000, 418 zdyWidth: 1000,
...@@ -708,6 +718,10 @@ export default { ...@@ -708,6 +718,10 @@ export default {
708 this.rightClickFlag = 'fwsxbg'; 718 this.rightClickFlag = 'fwsxbg';
709 this.lpbChVisible = true; 719 this.lpbChVisible = true;
710 break; 720 break;
721 case 'isCxlz':
722 this.rightClickFlag = 'cxlz';
723 this.lpbChVisible = true;
724 break;
711 case 'isLpb': 725 case 'isLpb':
712 this.rightClickFlag = type; 726 this.rightClickFlag = type;
713 this.lpbChVisible = true; 727 this.lpbChVisible = true;
...@@ -904,6 +918,14 @@ export default { ...@@ -904,6 +918,14 @@ export default {
904 }).catch(() => { 918 }).catch(() => {
905 919
906 }); 920 });
921 },
922 //户重新落宗
923 handleCxlz(){
924 if (this.hbsmList.length <= 0) {
925 Message.warning("请选择操作户")
926 return
927 }
928 this.hcxlzVisible = true
907 } 929 }
908 }, 930 },
909 computed: { 931 computed: {
......