From de24fe37e2af8456c49981dbe1ed9318ad2666b8 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期三, 07 四月 2021 15:32:26 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/enterprise.vue | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/components/table/enterprise.vue b/src/components/table/enterprise.vue
index 261ca06..da345c3 100644
--- a/src/components/table/enterprise.vue
+++ b/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;
}
--
Gitblit v1.8.0