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

wangqi

2021-04-07 564d0ab88c6ddf0b3d56a9eeba5ee72d6fff01b9

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

 src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue

@@ -30,6 +30,7 @@
  methods: {
    tabTaggle (taggleMenu) {
      this.currentTab = taggleMenu
      debugger
    }
  }
}

 src/components/LayerController/LayerController.vue

@@ -1,9 +1,12 @@
<template>
  <div :class='["float-panel",layerControllerVisible ? "active" : ""]' >
    <div @click="showPanel" class="iconBtn" :class='layerControllerVisible ? "active-button" : ""' v-show="!layerControllerVisible" style="  position: absolute;top:0;left: 0;">

    <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="图层" placement="left">
      <div @click="showPanel" class="iconBtn" :class='layerControllerVisible ? "active-button" : ""' v-show="!layerControllerVisible" style="  position: absolute;top:0;left: 0;">
        <img src="@assets/images/map-pages/icon/layer.png" alt="" class="icon">
<!--        <span class="icon-name">图层</span>-->
    </div>
        <!--        <span class="icon-name">图层</span>-->
      </div>
    </el-tooltip>
    <transition name="animationChange">
      <div :class="'legend-content map-background'" v-show="layerControllerVisible">
        <lc-service-layer></lc-service-layer>
@@ -242,12 +245,13 @@
    position: absolute;
    top:0;
    right: -26px;
    border-radius: 0.03rem 50% 50% 0.03rem;
  }
  .el-button--default:hover{
    background:@background-color;
  }
  .legend-content{
    width: 2.2rem;
    width: 250px;
  }
}


 src/components/LayerController/modules/LcServiceLayer.vue

@@ -1,8 +1,6 @@
<template>
    <div class="inner-panel">
        <div class="title">
            图层控制
        </div>
        <div class="title"> 图层控制 </div>
        <div class="wms-panel">
            <el-scrollbar class="wms-panel-scrollbar">
                <div v-for="item in serviceLayers" :key="item.code" class="layerbox">

 src/components/LayerController/modules/LcServiceLayerFilter.vue

@@ -101,13 +101,10 @@
    .inner-panel {
        color: #90c8e0;
        font-size: 13px;

        position: absolute;
        left: 260px;
        left: 256px;
        z-index: 1000;
        height: 220px;
        top: 0;

        top: 50px;
        .filter-group {
            display: flex;
            flex-flow: row;

 src/components/panel/RightSearchPanel.vue

@@ -102,7 +102,7 @@
    },
    selected (val) {
      // console.log(val)
      this.title = val.name + '（检索）'
      this.title = val.name
      this.topicList.forEach((itm) => {
        itm.checked = val.name === itm.name
      })
@@ -257,10 +257,10 @@
        padding: 15px 3px;
        background: rgba(0, 16, 30, 0.7);
        color: #C0C4CC;
        border-radius:50%  0.03rem 0.03rem 50% ;
    }
    .el-button--default:hover{
        background: transparent;
        border-color: #0f93a9;
        background:@background-color;
    }

  .el-form-item__label {

 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"   @click.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>
        </el-button>
      </el-tooltip>
      <transition name="animationChange">
        <el-row v-show="selectGroup" class="specific-tools-group">
          <el-popover
@@ -487,7 +489,11 @@
      .special-button {
        width: 0.1362rem;
        height: 0.2725rem;
        color: @color-over;
        color: #C0C4CC;
        border-radius: 0.03rem 50% 50% 0.03rem;
      }
      .special-button:hover{
        color: #00fff6;
      }
    }
  }

 src/components/panel/topicSearch/DischargeSearch.vue

@@ -1,5 +1,5 @@
<template>
  <div class="query-search" v-if="gdVisible">
  <div class="sewers-search" v-if="gdVisible">
    <div class="search-title">{{title}}</div>
    <div class="search-panel ">
      <el-form ref="form" :model="form" label-width="90px" class="search-form">

 src/components/panel/topicSearch/EnvRiskSearch.vue

@@ -1,5 +1,5 @@
<template>
  <div class="query-search" v-if="gdVisible">
  <div class="sewers-search" v-if="gdVisible">
    <div class="search-title">{{title}}</div>
    <div class="search-panel ">
      <el-form ref="form" :model="form" label-width="90px" class="search-form">

 src/components/panel/topicSearch/GasWasteSearch.vue

@@ -1,5 +1,5 @@
<template>
  <div class="query-search" v-if="gdVisible">
  <div class="sewers-search" v-if="gdVisible">
    <div class="search-title">{{title}}</div>
    <div class="search-panel ">
      <el-form ref="form" :model="form" label-width="90px" class="search-form">

 src/components/table/enterprise.vue

@@ -1,20 +1,20 @@
<template>
    <div class="enterprise-panel">
        <div class="enterprise-function" @click="showWarnDialog()">
            <div :class='["iconBtn",warnVisible ? "active-button" : ""]'>
                <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" class="icon">
                <!--<span class="icon-name">预报警</span>-->
                <!--    <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="预报警" placement="left">
                    <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" width="26px" style="display: block;margin: auto">

                </el-tooltip> -->
            </div>
            <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="预报警" placement="left">
                <div :class='["iconBtn",warnVisible ? "active-button" : ""]'>
                   <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" class="icon">
                    <!--<span class="icon-name">预报警</span>-->
                </div>
            </el-tooltip>
        </div>
        <div class="enterprise-function" @click="showStatisDialog()">
            <div :class='["iconBtn",companyVisible ? "active-button" : ""]'>
                <img src="@/assets/images/map-pages/icon/map/company.png" alt="" class="icon">
<!--                <span class="icon-name">指标</span>-->
            </div>
            <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="指标" placement="bottom">
                <div :class='["iconBtn",companyVisible ? "active-button" : ""]'>
                    <img src="@/assets/images/map-pages/icon/map/company.png" alt="" class="icon">
    <!--                <span class="icon-name">指标</span>-->
                </div>
            </el-tooltip>
        </div>
        <Dialog ref="warnDialog" title="企业预警报警分类统计" >
            <warn></warn>
@@ -76,11 +76,8 @@
    position: absolute;
    right: 0.14583rem;
    top:0.11979rem;
    z-index: 9999;
    .enterprise-function{
        float: left;
        cursor: pointer;
    }
    z-index: 1000;
    display: flex;
    .enterprise-function:not(:first-child){
        margin-left: 0.05rem;
    }

 src/components/table/summarySheets.vue

@@ -1,9 +1,11 @@
<template>
    <div class="summary-sheets">
        <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
            <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon">
            <!--<span class="icon-name">统计表</span>-->
        </div>
        <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="统计表" placement="left">
            <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
                <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon">
                <!--<span class="icon-name">统计表</span>-->
            </div>
        </el-tooltip>
        <Dialog ref="summarySheets" title="企业指标分类统计">
          <tab-handover></tab-handover>
        </Dialog >

 src/styles/theme-dark/el-ui/button.less

@@ -47,9 +47,7 @@
  border: 1px solid @dark--primary-color;
}
.el-button--default:hover{
  background: transparent;
  border-color: #0f93a9;
  color: @dark--title-color;
    background:@background-color;
}
.el-button--default:active{
    border-color: #0f93a9;