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

chenyabin

2021-04-15 93850b9aee34d3a66c2770a1eb0435ce104e772f

 src/components/table/summarySheets.vue

@@ -9,7 +9,8 @@
        <div class="subtopic" v-if="subtopic">
            <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="统计表" placement="bottom">
              <div :class='["iconBtn",summaryVisible ? "active-button" : ""]' @click="closeBtn">
                <img src="@assets/images/map-pages/icon/toolbox/table.png" alt="" class="icon">
                  <!--  -->
                  <i class="icon iconfont iconbiaoge2"></i>
                <!--<span class="icon-name">统计表</span>-->
              </div>
            </el-tooltip>
@@ -21,7 +22,7 @@
            </el-tooltip>
            <el-tooltip :popper-class="'map-tooltip'" effect="dark" content="预报警" placement="bottom">
              <div :class='["iconBtn",warnVisible ? "active-button" : ""]' @click="showWarnDialog()" >
                <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" class="icon">
                <i class="icon iconfont iconbaojing01"></i>
                <!--<span class="icon-name">预报警</span>-->
              </div>
            </el-tooltip>
@@ -46,7 +47,9 @@
import Warn from './components/Warn'
import IndexStatistics from './components/IndexStatistics'

import '@/components/BaseNav/SolidWaste/directive/dir'
// import '@/components/BaseNav/SolidWaste/directive/dir'
// import '@/components/plugin/DialogDrag'

import bus from '@/eventBus'
export default {
  name: 'summary-sheet.vue',