Merge remote-tracking branch 'origin/develop' into develop

wangqi

2021-04-07 564d0ab88c6ddf0b3d56a9eeba5ee72d6fff01b9

 src/components/panel/ToolBoxPanel.vue

@@ -1,10 +1,12 @@
<template>
  <div class="left-top-toolbox-panel">
    <div class="specific-tools">
      <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"   @mouseover.enter.native="changeSelectMouse">
      <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="工具" placement="left">
        <el-button :class="selectGroup === true ?'active-button':''" class="el-button-choice"   @click.enter.native="changeSelectMouse">
          <img src="@assets/images/map-pages/icon/toolbox/Selecd/tool.png" alt="" class="icon" />
          <span class="span-default">工具</span>
      </el-button>
          <!--<span class="span-default">工具</span>-->
        </el-button>
      </el-tooltip>
      <transition name="animationChange">
        <el-row v-show="selectGroup" class="specific-tools-group">
          <el-popover
@@ -20,8 +22,8 @@
                       @click.native="changeChoose(index)">
              <img :src="item.iconSelecd" alt="" v-if="active === index"/>
              <img :src="item.icon" alt="" v-else/>
              <span v-if="active === index">{{ item.label }}</span>
              <span v-else class="default-span">{{ item.label }}</span>
              <!--<span v-if="active === index">{{ item.label }}</span>
              <span v-else class="default-span">{{ item.label }}</span>-->
            </el-button>
            <el-button v-for="(itemT,indexT) in item.items" :key="indexT" @click="choiceItem(itemT,indexT)"
                       v-show="item.index!=='2'">
@@ -409,16 +411,15 @@

  .specific-tools {
    display: flex;

    .el-button {
    overflow: hidden;
     .el-button {
      z-index: 999;
      padding: 0;
      margin: 0 0.015rem;
      width: 45px;
      height: 45px;
      width: 0.2725rem;
      height: 0.2725rem;
      background: @background-color;
      //vertical-align: middle !important;

      vertical-align: middle !important;
      .base-map-img {
        position: absolute;
      }
@@ -437,6 +438,10 @@
      span {
        display: block;
        font-size: 10px;
      }
    }
    .specific-tools-group .el-button{
      span{
        color: #0B89B5;
      }
    }
@@ -447,8 +452,8 @@
      padding: 0;
      margin: 0;
      margin-right:0.015rem;
      width: 45px;
      height: 45px;
      width: 0.2725rem;
      height: 0.2725rem;
      background: @background-color;
      border: 0.00521rem solid @color-shadow;
    }
@@ -460,6 +465,7 @@

    .specific-tools-group {
      z-index: 1;

      .tools-panel-choose {
        border: none;
        box-shadow: 0 0 0.03rem @color-shadow;
@@ -481,11 +487,60 @@
      }

      .special-button {
        width: 22px;
        height: 45px;
        color: @color-over;
        width: 0.1362rem;
        height: 0.2725rem;
        color: #C0C4CC;
        border-radius: 0.03rem 50% 50% 0.03rem;
      }
      .special-button:hover{
        color: #00fff6;
      }
    }
  }
}
.base-map-inner-panel {
  display: flex;
  justify-content: center;
  align-items: center;

  .base-map-img {
    position: absolute;
  }

  .base-map-img-Tool:hover {
    cursor: pointer;
  }

  .base-map-anno-Tool {
    position: absolute;
    margin-left: 2px;
    background-color: rgba(0, 0, 0, .5);
    color: @color-over;

    .el-checkbox__label {
      padding-left: 5px !important;
    }
  }

  .basemap-layer-item {
    display: flex;
    width: 50px;
    height: 50px;
    margin: 10px;
    border: 2px solid white;

    input {
      position: relative;
      left: 0;
      top: -53px;
    }

    .basemap-layer-item-name {
      position: relative;
      left: 0;
      top: -53px;
    }
  }
}

</style>