From f3f693a10d00b75f1eafe7f029cbd99bd3c9825b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 10:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/table/enterprise.vue | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/components/table/enterprise.vue b/src/components/table/enterprise.vue
index f024ad2..d2f65ae 100644
--- a/src/components/table/enterprise.vue
+++ b/src/components/table/enterprise.vue
@@ -1,12 +1,22 @@
<template>
<div class="enterprise-panel">
<div class="enterprise-function" @click="showWarnDialog()">
- <img src="@/assets/images/map-pages/icon/map/warn.png" alt="" width="32px">
+ <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>
</div>
<div class="enterprise-function" @click="showStatisDialog()">
- <img src="@/assets/images/map-pages/icon/map/company.png" alt="" width="32px">
+ <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>
</div>
- <Dialog ref="warnDialog" title="浼佷笟棰勮鎶ヨ鍒嗙被缁熻">
+ <Dialog ref="warnDialog" title="浼佷笟棰勮鎶ヨ鍒嗙被缁熻" >
<warn></warn>
</Dialog>
<Dialog ref="indexStatisticsDialog" title="浼佷笟鎸囨爣鍒嗙被缁熻">
@@ -28,7 +38,9 @@
},
data () {
return {
- comp: Warn
+ comp: Warn,
+ warnVisible: false,
+ companyVisible: false
}
},
methods: {
@@ -38,10 +50,23 @@
},
showWarnDialog () {
this.$refs.warnDialog.show()
+ this.warnVisible = true
},
showStatisDialog () {
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>
@@ -49,14 +74,15 @@
<style lang="less" scoped>
.enterprise-panel{
position: absolute;
- right: 5px;
- top:5px;
+ right: 0.14583rem;
+ top:0.11979rem;
z-index: 9999;
-
.enterprise-function{
- width: 40px;
float: left;
cursor: pointer;
}
+ .enterprise-function:not(:first-child){
+ margin-left: 10px;
+ }
}
</style>
--
Gitblit v1.8.0