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/panel/RightSearchPanel.vue | 38 ++++++++++++++++++++------------------
1 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index dacfcbe..c8ff02e 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -7,7 +7,7 @@
<div class="container">
<ul v-for="item in topicList" :key="item.name" :class="item.checked?'module-wrap map-btn-active':'module-wrap map-btn-unactive'" @click="()=>{selected(item)}" >
<el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left">
- <li style=" ">
+ <li>
<!-- <span>{{item.name}}</span>-->
<!-- <div >-->
<img src="../../assets/images/map-pages/icon/sl.png" class="icon">
@@ -35,11 +35,11 @@
<div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div>
</div>
- <div :class="'search-container map-background'">
- <div class="el-message-box__content" style="padding:6px;font-size: 13px;">
- <component :title="title" :is="gcComp"></component>
- </div>
+ <div :class="'search-container map-background'">
+ <div class="el-message-box__content" style="padding:6px;font-size: 13px;">
+ <component :title="title" :is="gcComp"></component>
</div>
+ </div>
</div>
</div>
</template>
@@ -178,16 +178,14 @@
<style lang="less">
.search-title{
- color: rgb(255, 255, 255);
- font-size: 16px;
+ color:@color-title;
+ font-size: 18px;
margin: 5px;
}
.search-container {
position: relative;
width: 1.79167rem;
/*height: 5.6475rem;*/
- min-height: 80vh;
- max-height: 90vh;
overflow: hidden;
}
.module-wrap{
@@ -224,8 +222,8 @@
//top: 10px;
height: 0;
position: absolute;
- top: .4rem;
- right: .08333rem;
+ top: .46rem;
+ right: 0.14583rem;
z-index: 501;
display: -webkit-box;
display: -ms-flexbox;
@@ -474,7 +472,7 @@
display: inline-block;
position: relative;
padding-right: 5px;
- color:#f5f5f5;
+ color:@color-shadow;
i{
display: block;
width: 15px;
@@ -488,14 +486,13 @@
.el-radio.is-checked .levelOfRisk-type{color:#409EFF}
.environmental-risk-list{
- border:1px solid @color;
- margin-right: 10px;
- margin-bottom: 15px;
position: relative;
+ cursor: pointer;
padding-left:50px;
- padding-top:3px;
- padding-bottom:3px;
- color: #f5f5f5;
+ padding-top:5px;
+ padding-bottom:5px;
+ color: @color-shadow;
+ border-bottom:1px solid @background-color-split;
.state{
width: 30px;
height: 30px;
@@ -508,6 +505,11 @@
background: #0B3B6D;
}
}
+ .environmental-risk-list.hover,
+ .environmental-risk-list:hover{
+ color:@color-over;
+ background: @background-color;
+ }
//.search-panel {
// border: #07325B;
// background-color: #07325B !important;
--
Gitblit v1.8.0