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

yangdelong

2021-04-07 c6d73ab9748dcafb3977f3e7acfaf4257b270408

 src/components/table/enterprise.vue

@@ -3,7 +3,7 @@
        <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>
                <!--<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">

@@ -13,7 +13,7 @@
        <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>
<!--                <span class="icon-name">指标</span>-->
            </div>
        </div>
        <Dialog ref="warnDialog" title="企业预警报警分类统计" >
@@ -82,7 +82,7 @@
        cursor: pointer;
    }
    .enterprise-function:not(:first-child){
        margin-left: 10px;
        margin-left: 0.05rem;
    }
}
</style>