From ac41da710d542993b9c9fd9c680cc310e8e61832 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期五, 09 四月 2021 17:54:48 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/table/enterprise.vue | 55 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 30 insertions(+), 25 deletions(-)
diff --git a/src/components/table/enterprise.vue b/src/components/table/enterprise.vue
index 4a38d1f..da345c3 100644
--- a/src/components/table/enterprise.vue
+++ b/src/components/table/enterprise.vue
@@ -1,13 +1,22 @@
<template>
<div class="enterprise-panel">
<div class="enterprise-function" @click="showWarnDialog()">
- <div :class='["iconBtn",warnVisible ? "active" : ""]'><span><img src="@/assets/images/map-pages/icon/map/warn.png" alt="" width="26px" style="display: block;margin: auto"><span class="icon-name">棰勬姤璀�</span></span></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" : ""]'><span><img src="@/assets/images/map-pages/icon/map/company.png" alt="" width="26px" style="display: block;margin: auto"><span class="icon-name">鎸囨爣</span></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="浼佷笟棰勮鎶ヨ鍒嗙被缁熻">
+ <Dialog ref="warnDialog" title="浼佷笟棰勮鎶ヨ鍒嗙被缁熻" >
<warn></warn>
</Dialog>
<Dialog ref="indexStatisticsDialog" title="浼佷笟鎸囨爣鍒嗙被缁熻">
@@ -47,6 +56,17 @@
this.$refs.indexStatisticsDialog.show()
this.companyVisible = true
}
+ },
+ mounted () {
+ const that = this
+ this.$nextTick(() => {
+ this.$refs.warnDialog.$on('closeDialog', () => {
+ that.warnVisible = false
+ })
+ this.$refs.indexStatisticsDialog.$on('closeDialog', () => {
+ that.companyVisible = false
+ })
+ })
}
}
</script>
@@ -54,27 +74,12 @@
<style lang="less" scoped>
.enterprise-panel{
position: absolute;
- right: 5px;
- top:5px;
- z-index: 9999;
-
- .enterprise-function{
- width: 50px;
- float: left;
- cursor: pointer;
- }
- .iconBtn {
- width:45px;
- text-align: center;
- background: rgba(0, 16, 30, 0.5);
- cursor: pointer;
- color: #00fff6;
- border: 0.00521rem solid #00fff6;
- box-shadow: 0 0 0.03rem #00fff6;
- }
- .active {
- // border: 0.00521rem solid #fff700;
- // box-shadow: 0 0 0.03rem #fff700;
+ right: 0.14583rem;
+ top:0.11979rem;
+ z-index: 1000;
+ display: flex;
+ .enterprise-function:not(:first-child){
+ margin-left: 0.05rem;
}
}
</style>
--
Gitblit v1.8.0