Skip to content

任超 / js.CadastralSystem

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

Merge remote-tracking branch 'origin/master'

2 parents 22a2d544 362c8bd7
Inline Side-by-side
Showing 9 changed files with 131 additions and 76 deletions
...@@ -327,7 +327,7 @@ export default { ...@@ -327,7 +327,7 @@ export default {
327 .basic_layer { 327 .basic_layer {
328 width: 100%; 328 width: 100%;
329 position: relative; 329 position: relative;
330 color: #ffffff; 330 color: #4a4a4a;
331 cursor: pointer; 331 cursor: pointer;
332 .layer_text { 332 .layer_text {
333 flex: 1; 333 flex: 1;
......
...@@ -709,7 +709,7 @@ export default { ...@@ -709,7 +709,7 @@ export default {
709 .basic_layer { 709 .basic_layer {
710 width: 100%; 710 width: 100%;
711 position: relative; 711 position: relative;
712 color: #ffffff; 712 color: #4a4a4a;
713 cursor: pointer; 713 cursor: pointer;
714 -moz-user-select: none; 714 -moz-user-select: none;
715 -o-user-select: none; 715 -o-user-select: none;
......
...@@ -7,9 +7,24 @@ ...@@ -7,9 +7,24 @@
7 class="logo-img" 7 class="logo-img"
8 src="@/assets/images/logo-realestate.png" 8 src="@/assets/images/logo-realestate.png"
9 alt="" 9 alt=""
10 @click="toHome"
10 /> 11 />
11 <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span> 12 <span class="logo-text" v-show="!textLogo">不动产权籍调查系统</span>
12 </div> 13 </div>
14
15 <div class="search-box">
16 <el-input
17 maxlength="28"
18 v-model="treeKey"
19 class="searchInput"
20 placeholder="请输入关键字"
21 ><i
22 slot="suffix"
23 class="el-input__icon el-icon-search"
24 @click="inputChange"
25 ></i
26 ></el-input>
27 </div>
13 <div class="treeModule" :style="{height:treeHeight+'px'}"> 28 <div class="treeModule" :style="{height:treeHeight+'px'}">
14 <LineTree :pd="pd" v-if="lineTreeVisible" @itemClick="itemClick"></LineTree> 29 <LineTree :pd="pd" v-if="lineTreeVisible" @itemClick="itemClick"></LineTree>
15 </div> 30 </div>
...@@ -17,25 +32,26 @@ ...@@ -17,25 +32,26 @@
17 <el-container class="calcWidth"> 32 <el-container class="calcWidth">
18 <el-header> 33 <el-header>
19 <div class="header-top"> 34 <div class="header-top">
20 <div class="top-items" @click="toggleClick"> 35 <!-- <div class="top-items" @click="toggleClick">
21 <i class="iconfont iconsuojin" v-show="!isActive"></i> 36 <i class="iconfont iconsuojin" v-show="!isActive"></i>
22 <i class="iconfont iconzhankai" v-show="isActive"></i> 37 <i class="iconfont iconzhankai" v-show="isActive"></i>
23 </div> 38 </div> -->
24 <div 39 <div
25 class="top-items" 40 class="top-items"
26 v-for="(item, index) in headTop" 41 v-for="(item, index) in headTop"
27 :key="index + '1'" 42 :key="index + '1'"
28 :class="{ 'is-active': item.select }" 43 :class="{ 'is-active': item.select }"
29 :style="{'height':item.name == '首页' && item.select ? '70'+'px' : '71'+'px'}" 44 :style="{'height':item.name == '首页' && item.select ? '64'+'px' : '65'+'px'}"
30 @click="selectTopItems(index)" 45 @click="selectTopItems(index)"
31 > 46 >
32 <i :class="item.icon"></i> 47 <i :class="item.icon"></i>
33 <span>{{ item.name }}</span> 48 <span>{{ item.name }}</span>
34 </div> 49 </div>
35 50 </div>
36 <div class="top-items tuOrShu" > 51 <div class="right-tools">
37 <i class="iconfont icondiqiu" style="color:#006CFF;font-size:30px" title="图形管理" v-if="!isMap" @click="goMap"></i> 52 <div class="tuOrShu">
38 <i class="iconfont iconxinxi" style="color:#006CFF;font-size:30px" title="属性管理" v-else @click="goBack"></i> 53 <i class="iconfont icondiqiu" title="图形管理" v-if="!isMap" @click="goMap"></i>
54 <i class="iconfont iconxinxi" title="属性管理" v-else @click="goBack"></i>
39 </div> 55 </div>
40 </div> 56 </div>
41 <!-- <div class="header-bottom"> 57 <!-- <div class="header-bottom">
...@@ -131,6 +147,7 @@ export default { ...@@ -131,6 +147,7 @@ export default {
131 treeHeight:0, 147 treeHeight:0,
132 routerInfo:null, 148 routerInfo:null,
133 lineTreeVisible:false, 149 lineTreeVisible:false,
150 treeKey:'',
134 }; 151 };
135 }, 152 },
136 computed: { 153 computed: {
...@@ -253,7 +270,7 @@ export default { ...@@ -253,7 +270,7 @@ export default {
253 }) 270 })
254 } 271 }
255 this.$nextTick(()=>{ 272 this.$nextTick(()=>{
256 this.treeHeight = this.$el.clientHeight - 120; 273 this.treeHeight = this.$el.clientHeight - 117;
257 }); 274 });
258 }, 275 },
259 methods: { 276 methods: {
...@@ -388,45 +405,51 @@ export default { ...@@ -388,45 +405,51 @@ export default {
388 this.$store.state.newZdbsm = ''; 405 this.$store.state.newZdbsm = '';
389 }) 406 })
390 }, 407 },
391 goBack(){ 408 goBack(){
392 this.isMap = false; 409 this.isMap = false;
393 var curretRouterInfo = JSON.parse(sessionStorage.getItem("curretRouterInfo")); 410 var curretRouterInfo = JSON.parse(sessionStorage.getItem("curretRouterInfo"));
394 //this.$router.back(-1); 411 //this.$router.back(-1);
395 if(curretRouterInfo){ 412 if(curretRouterInfo){
413 this.$router.push({
414 path: curretRouterInfo.path,
415 query: curretRouterInfo.query
416 });
417 }else {
418 this.$router.back(-1);
419 }
420
421 },
422 goMap(){
423 var curretRouterInfo = {
424 path:this.$route.path,
425 query:this.$route.query
426 }
427 sessionStorage.setItem('curretRouterInfo',JSON.stringify(curretRouterInfo));
428 this.isMap = true;
429 var routerQuery = null;
430 var path = this.$route.path;
431 if(path == "/zd"){
432 routerQuery = {
433 bsm:this.$route.query.bsm,
434 type:"zd"
435 };
436 }else if(path == "/zrz"){
437 routerQuery = {
438 bsm:this.$route.query.bsm,
439 type:"zrz"
440 }
441 }
396 this.$router.push({ 442 this.$router.push({
397 path: curretRouterInfo.path, 443 path: "/viewMap",
398 query: curretRouterInfo.query 444 query: routerQuery
399 }); 445 });
400 }else { 446 },
401 this.$router.back(-1); 447 toHome(){
402 } 448 this.$router.push({ path: "/panel" });
449 },
450 inputChange(){
403 451
404 },
405 goMap(){
406 var curretRouterInfo = {
407 path:this.$route.path,
408 query:this.$route.query
409 } 452 }
410 sessionStorage.setItem('curretRouterInfo',JSON.stringify(curretRouterInfo));
411 this.isMap = true;
412 var routerQuery = null;
413 var path = this.$route.path;
414 if(path == "/zd"){
415 routerQuery = {
416 bsm:this.$route.query.bsm,
417 type:"zd"
418 };
419 }else if(path == "/zrz"){
420 routerQuery = {
421 bsm:this.$route.query.bsm,
422 type:"zrz"
423 }
424 }
425 this.$router.push({
426 path: "/viewMap",
427 query: routerQuery
428 });
429 }
430 }, 453 },
431 }; 454 };
432 </script> 455 </script>
...@@ -446,20 +469,26 @@ export default { ...@@ -446,20 +469,26 @@ export default {
446 .el-header { 469 .el-header {
447 background-color: #fff; 470 background-color: #fff;
448 padding: 0 !important; 471 padding: 0 !important;
449 height: 72px!important; 472 height: 66px!important;
473 position: relative;
450 .header-top { 474 .header-top {
451 height: 72px; 475 height: 66px;
452 // border-bottom: 1px solid#EAEAEA; 476 // border-bottom: 1px solid#EAEAEA;
453 box-sizing: border-box; 477 box-sizing: border-box;
478 background-image: url('../assets/images/banner.png');
479 display: flex;
480 flex-grow: 1;
481 justify-content: center;
482 align-items: center;
454 .top-items { 483 .top-items {
455 cursor: pointer; 484 cursor: pointer;
456 height: 72px; 485 height: 66px;
457 padding: 0 30px; 486 padding: 0 30px;
458 font-size: 18px; 487 font-size: 18px;
459 line-height: 72px; 488 line-height: 66px;
460 float: left; 489 float: left;
461 position: relative; 490 position: relative;
462 color: #4a4a4a; 491 color: #ffffff;
463 // border-left: 1px solid #EAEAEA; 492 // border-left: 1px solid #EAEAEA;
464 /*border-right: 1px solid #EAEAEA;*/ 493 /*border-right: 1px solid #EAEAEA;*/
465 i { 494 i {
...@@ -474,10 +503,11 @@ export default { ...@@ -474,10 +503,11 @@ export default {
474 color: #000; 503 color: #000;
475 } 504 }
476 } 505 }
506 .top-items:hover{
507 background: hsla(0,0%,100%,.2);
508 }
477 .top-items.is-active { 509 .top-items.is-active {
478 color: #006cff; 510 background: hsla(0,0%,100%,.2);
479 height: 71px;
480 border-bottom: 1px solid #FFF;
481 } 511 }
482 } 512 }
483 .header-bottom { 513 .header-bottom {
...@@ -486,40 +516,61 @@ export default { ...@@ -486,40 +516,61 @@ export default {
486 border-bottom: 1px solid rgba(234, 234, 234, 1); 516 border-bottom: 1px solid rgba(234, 234, 234, 1);
487 box-sizing: border-box; 517 box-sizing: border-box;
488 } 518 }
519 .right-tools{
520 float: right !important;
521 position: absolute;
522 right: 18px;
523 top: 20px;
524 .tuOrShu{
525 .iconfont{
526 cursor: pointer;
527 color:#ffffff;
528 font-size:30px
529 }
530 }
531 }
489 532
490 .tuOrShu{
491 float: right !important;
492 .iconfont{
493 font-size: 21px;
494 }
495 }
496 } 533 }
497 .el-aside { 534 .el-aside {
498 width: 290px !important; 535 width: 290px !important;
499 background-color: #1d50dd; 536 background-color: #ffffff;
500 color: #333; 537 color: #333;
501 // text-align: center; 538 // text-align: center;
502 overflow: hidden; 539 overflow: hidden;
503 transition: width 0.3s; 540 transition: width 0.3s;
504 .logo-box { 541 .logo-box {
505 width: 100%; 542 width: 100%;
506 height: 120px; 543 height: 66px;
507 border-bottom: 1px solid rgba(255, 255, 255, 0.2); 544 border-bottom: 1px solid rgba(255, 255, 255, 0.2);
508 padding: 30px 0 28px 0;
509 box-sizing: border-box; 545 box-sizing: border-box;
510 display: flex; 546 padding: 10px;
511 flex-direction: column;
512 justify-content: space-between;
513 align-items: center;
514 transition: width 0.3s; 547 transition: width 0.3s;
548 background-color: #287CC5;
515 .logo-img { 549 .logo-img {
516 width: 38px; 550 width: 44px;
517 height: 38px; 551 float: left;
518 } 552 }
519 .logo-text { 553 .logo-text {
520 font-size: 18px; 554 padding-left: 10px;
521 color: rgba(255, 255, 255, 1); 555 color: #ffffff;
522 line-height: 14px; 556 line-height: 44px;
557 font-size: 23px;
558 }
559 }
560 .search-box{
561 height: 48px;
562 background-color: #3FA2E1;
563 box-sizing: border-box;
564 padding: 9px 30px;
565 .searchInput{
566 /deep/ .el-input__inner{
567 height: 30px;
568 line-height: 30px;
569 border-radius: 15px;
570 }
571 /deep/ .el-input__suffix{
572 top: -5px!important;
573 }
523 } 574 }
524 } 575 }
525 .treeModule { 576 .treeModule {
...@@ -558,7 +609,7 @@ export default { ...@@ -558,7 +609,7 @@ export default {
558 z-index: 1; 609 z-index: 1;
559 pointer-events: none; 610 pointer-events: none;
560 -webkit-box-shadow: inset -14px 0px 16px red; 611 -webkit-box-shadow: inset -14px 0px 16px red;
561 box-shadow: inset -23px 0px 16px #1d50dd; 612 box-shadow: inset -23px 0px 16px #ffffff;
562 transition: 0.3s; 613 transition: 0.3s;
563 } 614 }
564 .w0{ 615 .w0{
......
...@@ -891,7 +891,7 @@ ...@@ -891,7 +891,7 @@
891 /deep/ .el-tabs__header { 891 /deep/ .el-tabs__header {
892 position: -webkit-fixed; 892 position: -webkit-fixed;
893 position: fixed; 893 position: fixed;
894 top: 120px; 894 top: 114px;
895 z-index: 999; 895 z-index: 999;
896 width: 100%; 896 width: 100%;
897 margin-bottom: 0; 897 margin-bottom: 0;
......
...@@ -80,7 +80,7 @@ export default { ...@@ -80,7 +80,7 @@ export default {
80 /deep/ .el-tabs__header { 80 /deep/ .el-tabs__header {
81 position: -webkit-fixed; 81 position: -webkit-fixed;
82 position: fixed; 82 position: fixed;
83 top: 120px; 83 top: 114px;
84 z-index: 999; 84 z-index: 999;
85 width: 100%; 85 width: 100%;
86 margin-bottom: 0; 86 margin-bottom: 0;
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
2 <div class="hb" ref="hbBox"> 2 <div class="hb" ref="hbBox">
3 <el-tabs v-model="tabName" class="menu" @tab-click="handleClick"> 3 <el-tabs v-model="tabName" class="menu" @tab-click="handleClick">
4 <el-tab-pane label="宗地合并" name="zd"> 4 <el-tab-pane label="宗地合并" name="zd">
5 <div class="hb-tabs top20" style="margin-top:14px"> 5 <div class="hb-tabs top40" style="margin-top:14px">
6 <span class="tips">合并前宗地信息(已选择宗地{{zdhbqData.length}}个)</span> 6 <span class="tips">合并前宗地信息(已选择宗地{{zdhbqData.length}}个)</span>
7 <div class="hbq"> 7 <div class="hbq">
8 8
...@@ -573,6 +573,9 @@ ...@@ -573,6 +573,9 @@
573 height: 100%; 573 height: 100%;
574 .menu { 574 .menu {
575 height: 100%; 575 height: 100%;
576 .top40{
577 top: 40px;
578 }
576 /deep/ .el-tabs__content { 579 /deep/ .el-tabs__content {
577 position: unset; 580 position: unset;
578 margin-top: 40px; 581 margin-top: 40px;
...@@ -581,7 +584,7 @@ ...@@ -581,7 +584,7 @@
581 /deep/ .el-tabs__header { 584 /deep/ .el-tabs__header {
582 position: -webkit-fixed; 585 position: -webkit-fixed;
583 position: fixed; 586 position: fixed;
584 top: 120px; 587 top: 114px;
585 z-index: 999; 588 z-index: 999;
586 width: 100%; 589 width: 100%;
587 margin-bottom: 0; 590 margin-bottom: 0;
......
...@@ -88,6 +88,7 @@ ...@@ -88,6 +88,7 @@
88 this.queryData.pageNo=this.pageNo; 88 this.queryData.pageNo=this.pageNo;
89 this.getData(this.queryData); 89 this.getData(this.queryData);
90 this.$nextTick(()=>{ 90 this.$nextTick(()=>{
91 console.log(this.$refs.dataGrid.offsetHeight,'this.$refs.dataGrid.offsetHeight');
91 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68; 92 this.tableHeight = this.$refs.dataGrid.offsetHeight - 68;
92 }) 93 })
93 }, 94 },
......