635fa4fb by 杨威

左侧树目录修改

1 parent 9ca7ce28
...@@ -31,6 +31,12 @@ ...@@ -31,6 +31,12 @@
31 <ul class="icon_lists dib-box"> 31 <ul class="icon_lists dib-box">
32 32
33 <li class="dib"> 33 <li class="dib">
34 <span class="icon iconfont">&#xe7a1;</span>
35 <div class="name">树目录</div>
36 <div class="code-name">&amp;#xe7a1;</div>
37 </li>
38
39 <li class="dib">
34 <span class="icon iconfont">&#xe7a0;</span> 40 <span class="icon iconfont">&#xe7a0;</span>
35 <div class="name">下载</div> 41 <div class="name">下载</div>
36 <div class="code-name">&amp;#xe7a0;</div> 42 <div class="code-name">&amp;#xe7a0;</div>
...@@ -567,6 +573,15 @@ ...@@ -567,6 +573,15 @@
567 <ul class="icon_lists dib-box"> 573 <ul class="icon_lists dib-box">
568 574
569 <li class="dib"> 575 <li class="dib">
576 <span class="icon iconfont iconshumulu"></span>
577 <div class="name">
578 树目录
579 </div>
580 <div class="code-name">.iconshumulu
581 </div>
582 </li>
583
584 <li class="dib">
570 <span class="icon iconfont iconxiazai"></span> 585 <span class="icon iconfont iconxiazai"></span>
571 <div class="name"> 586 <div class="name">
572 下载 587 下载
...@@ -1326,6 +1341,14 @@ ...@@ -1326,6 +1341,14 @@
1326 1341
1327 <li class="dib"> 1342 <li class="dib">
1328 <svg class="icon svg-icon" aria-hidden="true"> 1343 <svg class="icon svg-icon" aria-hidden="true">
1344 <use xlink:href="#iconshumulu"></use>
1345 </svg>
1346 <div class="name">树目录</div>
1347 <div class="code-name">#iconshumulu</div>
1348 </li>
1349
1350 <li class="dib">
1351 <svg class="icon svg-icon" aria-hidden="true">
1329 <use xlink:href="#iconxiazai"></use> 1352 <use xlink:href="#iconxiazai"></use>
1330 </svg> 1353 </svg>
1331 <div class="name">下载</div> 1354 <div class="name">下载</div>
......
This diff could not be displayed because it is too large.
...@@ -6,6 +6,13 @@ ...@@ -6,6 +6,13 @@
6 "description": "", 6 "description": "",
7 "glyphs": [ 7 "glyphs": [
8 { 8 {
9 "icon_id": "19383167",
10 "name": "树目录",
11 "font_class": "shumulu",
12 "unicode": "e7a1",
13 "unicode_decimal": 59297
14 },
15 {
9 "icon_id": "19376823", 16 "icon_id": "19376823",
10 "name": "下载", 17 "name": "下载",
11 "font_class": "xiazai", 18 "font_class": "xiazai",
......
...@@ -20,6 +20,9 @@ Created by iconfont ...@@ -20,6 +20,9 @@ Created by iconfont
20 /> 20 />
21 <missing-glyph /> 21 <missing-glyph />
22 22
23 <glyph glyph-name="shumulu" unicode="&#59297;" d="M928 128h34.176a32 32 0 0 0 32-32v-128a32 32 0 0 0-32-32h-128a32 32 0 0 0-32 32v128a32 32 0 0 0 32 32h29.824V352a6.4 6.4 0 0 1-6.4 6.4H546.176V128h32a32 32 0 0 0 32-32v-128a32 32 0 0 0-32-32h-128a32 32 0 0 0-32 32v128a32 32 0 0 0 32 32h32V358.4H169.6a6.4 6.4 0 0 1-6.4-6.4V128h30.976a32 32 0 0 0 32-32v-128a32 32 0 0 0-32-32h-128a32 32 0 0 0-32 32v128a32 32 0 0 0 32 32h33.024V390.4a32 32 0 0 0 32 32h350.976V640h-32a32 32 0 0 0-32 32v128a32 32 0 0 0 32 32h128a32 32 0 0 0 32-32v-128a32 32 0 0 0-32-32h-32v-217.6H896a32 32 0 0 0 32-32V128z" horiz-adv-x="1024" />
24
25
23 <glyph glyph-name="xiazai" unicode="&#59296;" d="M529.066667 218.510222l193.763555 193.763556a33.166222 33.166222 0 1 0 46.933334-46.933334l-217.258667-217.201777a33.166222 33.166222 0 0 0-46.876445 0L288.369778 365.340444a33.166222 33.166222 0 0 0 46.933333 46.933334L529.066667 218.510222zM491.918222 207.644444V760.661333a33.166222 33.166222 0 1 0 66.389334 0V207.644444a33.166222 33.166222 0 1 0-66.389334 0zM854.300444 27.704889H203.832889v154.567111a33.166222 33.166222 0 0 1-66.332445 0v-187.733333c0-18.318222 14.791111-33.166222 33.166223-33.166223h716.8a33.166222 33.166222 0 0 1 33.166222 33.166223v187.733333a33.166222 33.166222 0 1 1-66.332445 0v-154.567111z" horiz-adv-x="1024" /> 26 <glyph glyph-name="xiazai" unicode="&#59296;" d="M529.066667 218.510222l193.763555 193.763556a33.166222 33.166222 0 1 0 46.933334-46.933334l-217.258667-217.201777a33.166222 33.166222 0 0 0-46.876445 0L288.369778 365.340444a33.166222 33.166222 0 0 0 46.933333 46.933334L529.066667 218.510222zM491.918222 207.644444V760.661333a33.166222 33.166222 0 1 0 66.389334 0V207.644444a33.166222 33.166222 0 1 0-66.389334 0zM854.300444 27.704889H203.832889v154.567111a33.166222 33.166222 0 0 1-66.332445 0v-187.733333c0-18.318222 14.791111-33.166222 33.166223-33.166223h716.8a33.166222 33.166222 0 0 1 33.166222 33.166223v187.733333a33.166222 33.166222 0 1 1-66.332445 0v-154.567111z" horiz-adv-x="1024" />
24 27
25 28
......
...@@ -10,6 +10,12 @@ ...@@ -10,6 +10,12 @@
10 linkLine_last: s_index === list.length - 1 && s_index !== 0, 10 linkLine_last: s_index === list.length - 1 && s_index !== 0,
11 third_layer: !item.children, 11 third_layer: !item.children,
12 second_layer: item.children, 12 second_layer: item.children,
13 curNode:$route.query.bsm && $route.query.bsm==item.bsm,
14 zxx:item.qszt,
15 iszd:item.qszt&&item.type == 'zd',
16 isdz:item.qszt&&item.type == 'dz',
17 iszrz:item.qszt&&item.type == 'zrz',
18 isgzw:item.qszt&&item.type == 'gzw'
13 }" 19 }"
14 > 20 >
15 <div 21 <div
...@@ -17,48 +23,42 @@ ...@@ -17,48 +23,42 @@
17 @click="itemClick(item)" 23 @click="itemClick(item)"
18 @dblclick="dbclick(item,item.zdbsm)" 24 @dblclick="dbclick(item,item.zdbsm)"
19 :class="{ 25 :class="{
20 active_color: item.expand, 26 active_color: item.expand
21 }" 27 }"
22 > 28 >
23 <div 29 <div
24 class="layer_text nowrap" 30 class="layer_text nowrap"
25 @contextmenu.prevent="openMenu($event, item,list)" 31 @contextmenu.prevent="openMenu($event, item,list)"
26 :class="{ 32 :class="{
27 active_color: item.expand, 33 active_color: item.expand
28 curPage:$route.query.bsm && $route.query.bsm==item.bsm
29 }" 34 }"
30 :ref="($route.query.bsm && $route.query.bsm==item.bsm)?'curZxx':''" 35 :ref="($route.query.bsm && $route.query.bsm==item.bsm)?'curZxx':''"
31 :data-zdbsm="item.zdbsm" 36 :data-zdbsm="item.zdbsm"
32 :title=item.mc 37 :title=item.mc
33 > 38 >
39 <i v-show="!item.qszt" class="iconfont iconshumulu" style="margin-right:6px"></i>
34 <span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)"> 40 <span class="qsztImg" v-if="item.bblx == 1 || (item.bhqkbsm != ''&& item.bhqkbsm != null)">
35 <!-- <span class="qsztFont" style="color: #9e9b9b"></span> --> 41 <!-- <span class="qsztFont" style="color: #9e9b9b"></span> -->
36 <i class="iconfont iconbian"></i> 42 <i :class="$route.query.bsm && $route.query.bsm==item.bsm ? 'iconfont iconbianing':'iconfont iconbian'"></i>
37 </span> 43 </span>
38 <template v-else> 44 <template v-else>
39 <span class="qsztImg" v-if="item.qszt=='0'" > 45 <span class="qsztImg" v-if="item.qszt=='0'" >
40 <span class="qsztFont" style="color: red; "></span> 46 <!-- <span class="qsztFont" style="color: #2FA3FA; "></span> -->
47 <i :class="$route.query.bsm && $route.query.bsm==item.bsm ? 'iconfont iconlining':'iconfont iconlin'" style="color: #F7B500;"></i>
41 </span> 48 </span>
42 <span class="qsztImg" v-if="item.qszt=='1'" > 49 <span class="qsztImg" v-if="item.qszt=='1'" >
43 <span class="qsztFont" style="color: #1AD6E1; "></span> 50 <!-- <span class="qsztFont" style="color: #1AD6E1; "></span> -->
51 <i :class="$route.query.bsm && $route.query.bsm==item.bsm ? 'iconfont iconzhenging':'iconfont iconzheng'" style="color: #15D7E2;"></i>
44 </span> 52 </span>
45 <span class="qsztImg" v-if="item.qszt=='2'" > 53 <span class="qsztImg" v-if="item.qszt=='2'" >
46 <span class="qsztFont" style="color: #45AEFD; "></span> 54 <!-- <span class="qsztFont" style="color: #45AEFD; "></span> -->
55 <i :class="$route.query.bsm && $route.query.bsm==item.bsm ? 'iconfont iconxianing':'iconfont iconxian'" style="color: #2FA3FA;"></i>
47 </span> 56 </span>
48 </template> 57 </template>
49 58 <i class="iconfont iconziranchuang1 mr4" v-if="item.type=='zrz'"></i>
50 <!-- <img class="qsztImg" v-if="item.qszt=='0'" :src="linshi"/> 59 <i class="iconfont iconduochuang1 mr4" v-if="item.type=='dz'"></i>
51 <img class="qsztImg" v-if="item.qszt=='1'" :src="zhengshi"/> 60 <i class="iconfont icongouzhuwu mr4" v-if="item.type=='gzw'"></i>
52 <img class="qsztImg" v-if="item.qszt=='2'" :src="xianshi"/> --> 61 <span>{{ item.mc }}</span>
53 <span v-if="item.type=='zrz'" >(自然幢)
54 </span>
55 <span v-if="item.type=='dz'" >(多幢)
56 </span>
57 <span v-if="item.type=='gzw'" >(构筑物)
58 </span>
59
60
61 <span class="project-name">{{ item.mc }}</span>
62 62
63 </div> 63 </div>
64 <div 64 <div
...@@ -336,7 +336,7 @@ export default { ...@@ -336,7 +336,7 @@ export default {
336 cursor: pointer; 336 cursor: pointer;
337 .layer_text { 337 .layer_text {
338 flex: 1; 338 flex: 1;
339 line-height: 16px; 339 line-height: 40px;
340 } 340 }
341 } 341 }
342 .first_vertical_line { 342 .first_vertical_line {
...@@ -349,14 +349,44 @@ export default { ...@@ -349,14 +349,44 @@ export default {
349 } 349 }
350 .basic_banner { 350 .basic_banner {
351 position: relative; 351 position: relative;
352 width: 100%; 352 width: 279px;
353 padding-bottom: 13px; 353 height: 40px;
354 box-sizing: border-box;
355 padding-left: 24px;
354 } 356 }
355 .second_layer { 357 .second_layer {
356 position: relative; 358 position: relative;
357 width: calc(100% - 20px); 359 width: calc(100% - 20px);
358 cursor: pointer; 360 cursor: pointer;
359 padding-left: 20px; 361 padding-left: 20px;
362 .basic_banner{
363 width: 100%;
364 }
365 }
366 .zxx{
367 width: 279px!important;
368 position: relative;
369 left: -80px;
370 text-indent: 80px;
371 }
372 .iszd{
373 .tree_item_box{
374 .zxx{
375 padding-left: 0;
376 left: 0;
377 }
378 }
379 }
380 .iszrz{
381 left: 0px!important;
382 text-indent: 96px;
383 }
384 .isdz{
385 text-indent: 96px!important;
386 .iszrz{
387 left: 0!important;
388 text-indent: 112px!important;
389 }
360 } 390 }
361 .third_layer { 391 .third_layer {
362 position: relative; 392 position: relative;
...@@ -368,80 +398,78 @@ export default { ...@@ -368,80 +398,78 @@ export default {
368 color: black!important; 398 color: black!important;
369 } 399 }
370 400
371 .second_layer::before { 401 // .second_layer::before {
372 content: ""; 402 // content: "";
373 position: absolute; 403 // position: absolute;
374 height: 1px; 404 // height: 1px;
375 width: 16px; 405 // width: 16px;
376 left: 8px; 406 // left: 8px;
377 top: 8px; 407 // top: 8px;
378 opacity: .5; 408 // opacity: .5;
379 background: url('../../assets/images/rowline1.png'); 409 // background: url('../../assets/images/rowline1.png');
380 background-position-y: center; 410 // background-position-y: center;
381 } 411 // }
382 .third_layer::before { 412 // .third_layer::before {
383 content: ""; 413 // content: "";
384 position: absolute; 414 // position: absolute;
385 height: 1px; 415 // height: 1px;
386 width: 16px; 416 // width: 16px;
387 left: 8px; 417 // left: 8px;
388 top: 8px; 418 // top: 8px;
389 opacity: .5; 419 // opacity: .5;
390 background: url('../../assets/images/rowline1.png'); 420 // background: url('../../assets/images/rowline1.png');
391 background-position-y: center; 421 // background-position-y: center;
392 } 422 // }
393 423
394 .linkLine_default::after { 424 // .linkLine_default::after {
395 content: ""; 425 // content: "";
396 position: absolute; 426 // position: absolute;
397 height: 100%; 427 // height: 100%;
398 width: 1px; 428 // width: 1px;
399 left: 7px; 429 // left: 7px;
400 top: 0px; 430 // top: 0px;
401 opacity: .5; 431 // opacity: .5;
402 background: url('../../assets/images/colline1.png'); 432 // background: url('../../assets/images/colline1.png');
403 background-position-x: center; 433 // background-position-x: center;
404 } 434 // }
405 .linkLine_first::after { 435 // .linkLine_first::after {
406 content: ""; 436 // content: "";
407 position: absolute; 437 // position: absolute;
408 /* 为了触顶 */ 438 // /* 为了触顶 */
409 top: -16px; 439 // top: -16px;
410 height: calc(100% + 16px); 440 // height: calc(100% + 16px);
411 width: 1px; 441 // width: 1px;
412 left: 7px; 442 // left: 7px;
413 opacity: .5; 443 // opacity: .5;
414 background: url('../../assets/images/colline1.png'); 444 // background: url('../../assets/images/colline1.png');
415 background-position-x: center; 445 // background-position-x: center;
416 } 446 // }
417 // 上半截 447 // // 上半截
418 .linkLine_half_top::after { 448 // .linkLine_half_top::after {
419 content: ""; 449 // content: "";
420 position: absolute; 450 // position: absolute;
421 height: 23px; 451 // height: 23px;
422 top: -14px; 452 // top: -14px;
423 width: 1px; 453 // width: 1px;
424 left: 7px; 454 // left: 7px;
425 opacity: .5; 455 // opacity: .5;
426 background: url('../../assets/images/colline1.png'); 456 // background: url('../../assets/images/colline1.png');
427 background-position-x: center; 457 // background-position-x: center;
428 } 458 // }
429 .linkLine_last::after { 459 // .linkLine_last::after {
430 content: ""; 460 // content: "";
431 position: absolute; 461 // position: absolute;
432 height: 9px; 462 // height: 9px;
433 width: 1px; 463 // width: 1px;
434 left: 7px; 464 // left: 7px;
435 top: 0px; 465 // top: 0px;
436 opacity: .5; 466 // opacity: .5;
437 background: url('../../assets/images/colline1.png'); 467 // background: url('../../assets/images/colline1.png');
438 background-position-x: center; 468 // background-position-x: center;
439 } 469 // }
440 470
441 .reTree_default_icon { 471 .reTree_default_icon {
442 // opacity: .5; 472 // opacity: .5;
443 background: url("../../assets/images/reTree_default_.svg") no-repeat center
444 center;
445 background-size: contain; 473 background-size: contain;
446 } 474 }
447 475
...@@ -480,14 +508,15 @@ export default { ...@@ -480,14 +508,15 @@ export default {
480 } 508 }
481 .qsztImg{ 509 .qsztImg{
482 width: 16px; 510 width: 16px;
511 margin-right: 6px;
483 // border-radius: 50%; height: 20px; width: 20px; display: inline-block; 512 // border-radius: 50%; height: 20px; width: 20px; display: inline-block;
484 } 513 }
485 .project-name{ 514 .curNode{
486 position: relative; 515 >.basic_banner{
487 top: 1px; 516 background: #E9F5FF;
488 } 517 box-shadow: inset 2px 0 0 0 #0C71FB;
489 .curPage{ 518 color: #0C71FB;
490 color: orange; 519 }
491 } 520 }
492 .qsztFont{ 521 .qsztFont{
493 text-align: center; 522 text-align: center;
...@@ -500,5 +529,7 @@ export default { ...@@ -500,5 +529,7 @@ export default {
500 border: 1px solid; 529 border: 1px solid;
501 border-radius: 8px; 530 border-radius: 8px;
502 } 531 }
503 532 .mr4{
533 margin-right: 4px;
534 }
504 </style> 535 </style>
......
1 <template> 1 <template>
2 <div 2 <div
3 class="content column-start-center reTree_box" 3 class="content column-start-center reTree_box"
4 :style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'270') + 'px' }" 4 :style="{ fontSize: (size || 16) + 'px', lineHeight: (size || 16) + 'px', width: (islpb ? '200':'286') + 'px' }"
5 > 5 >
6 <div 6 <div
7 class="column-start-center basic_layer" 7 class="column-start-center basic_layer"
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
17 @click="itemClick(item)" 17 @click="itemClick(item)"
18 > 18 >
19 19
20 <div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)">{{ item.mc }}</div><div 20 <div class="layer_text nowrap" @contextmenu.prevent="openMenu($event, item)"><i class="iconfont iconshumulu"></i> {{ item.mc }}</div><div
21 class="reTree_icon" 21 class="reTree_icon"
22 :style="{ 22 :style="{
23 height: (size || 16 * 1.2) + 'px', 23 height: (size || 16 * 1.2) + 'px',
...@@ -769,8 +769,8 @@ export default { ...@@ -769,8 +769,8 @@ export default {
769 } 769 }
770 .basic_banner { 770 .basic_banner {
771 position: relative; 771 position: relative;
772 width: 100%; 772 width: 280px;
773 padding-bottom: 13px; 773 height: 40px;
774 } 774 }
775 .second_layer { 775 .second_layer {
776 position: relative; 776 position: relative;
......
...@@ -270,7 +270,7 @@ export default { ...@@ -270,7 +270,7 @@ export default {
270 }) 270 })
271 } 271 }
272 this.$nextTick(()=>{ 272 this.$nextTick(()=>{
273 this.treeHeight = this.$el.clientHeight - 117; 273 this.treeHeight = this.$el.clientHeight - 132;
274 }); 274 });
275 }, 275 },
276 methods: { 276 methods: {
...@@ -532,7 +532,7 @@ export default { ...@@ -532,7 +532,7 @@ export default {
532 532
533 } 533 }
534 .el-aside { 534 .el-aside {
535 width: 290px !important; 535 width: 280px !important;
536 background-color: #ffffff; 536 background-color: #ffffff;
537 color: #333; 537 color: #333;
538 // text-align: center; 538 // text-align: center;
...@@ -558,24 +558,25 @@ export default { ...@@ -558,24 +558,25 @@ export default {
558 } 558 }
559 } 559 }
560 .search-box{ 560 .search-box{
561 height: 48px; 561 height: 65px;
562 background-color: #3FA2E1;
563 box-sizing: border-box; 562 box-sizing: border-box;
564 padding: 9px 30px; 563 padding: 18px 20px;
564 border-right: 1px solid #dedede;
565 .searchInput{ 565 .searchInput{
566 /deep/ .el-input__inner{ 566 /deep/ .el-input__inner{
567 height: 30px; 567 width: 240px;
568 line-height: 30px; 568 height: 38px;
569 border-radius: 15px; 569 background: #FFFFFF;
570 border-radius: 4px;
571 border: 1px solid #DEDEDE;
570 } 572 }
571 /deep/ .el-input__suffix{ 573 /deep/ .el-input__suffix{
572 top: -5px!important; 574 top: 0!important;
573 } 575 }
574 } 576 }
575 } 577 }
576 .treeModule { 578 .treeModule {
577 box-sizing: border-box; 579 box-sizing: border-box;
578 padding: 20px 20px;
579 border-right: 1px solid #dedede; 580 border-right: 1px solid #dedede;
580 } 581 }
581 .logo-box-show { 582 .logo-box-show {
...@@ -603,7 +604,7 @@ export default { ...@@ -603,7 +604,7 @@ export default {
603 } 604 }
604 605
605 .treeModule-show{ 606 .treeModule-show{
606 width: 290px; 607 width: 280px;
607 height: calc(100% - 120px); 608 height: calc(100% - 120px);
608 position: absolute; 609 position: absolute;
609 top: 120px; 610 top: 120px;
......
...@@ -239,16 +239,16 @@ ...@@ -239,16 +239,16 @@
239 <!-- 右键菜单弹出框 --> 239 <!-- 右键菜单弹出框 -->
240 <el-dialog v-dialogDrag :close-on-click-modal="false" :title="taskTitle" :visible.sync="dialogVisible" width="50%" > 240 <el-dialog v-dialogDrag :close-on-click-modal="false" :title="taskTitle" :visible.sync="dialogVisible" width="50%" >
241 <!-- 根据菜单类型(menuType)和右键点击的楼盘类型(treeData.type)来区分弹框内容 --> 241 <!-- 根据菜单类型(menuType)和右键点击的楼盘类型(treeData.type)来区分弹框内容 -->
242 <div class="addCh" v-show="menuType == 'ljz'"> 242 <div class="addCh" v-if="menuType == 'ljz'">
243 <addLjz ref="ljz" :ljzbsm="curBsm"></addLjz> 243 <addLjz ref="ljz" :ljzbsm="curBsm"></addLjz>
244 </div> 244 </div>
245 <div class="addCh" v-show="menuType == 'zdy'"> 245 <div class="addCh" v-if="menuType == 'zdy'">
246 <addZdy ref="zdy" :zdybsm="curBsm"></addZdy> 246 <addZdy ref="zdy" :zdybsm="curBsm"></addZdy>
247 </div> 247 </div>
248 <div class="addCh" v-show="menuType == 'c'"> 248 <div class="addCh" v-if="menuType == 'c'">
249 <editCinfo ref="c" :cbsm="curBsm"></editCinfo> 249 <editCinfo ref="c" :cbsm="curBsm"></editCinfo>
250 </div> 250 </div>
251 <div class="addCh" v-show="menuType == 'ch'"> 251 <div class="addCh" v-if="menuType == 'ch'">
252 <addCh 252 <addCh
253 ref="ch" 253 ref="ch"
254 :scyclx="scyclx" 254 :scyclx="scyclx"
......