From e8692ebf024715c922ca0e10f90dc3a1219862b0 Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期三, 07 四月 2021 22:00:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/RightSearchPanel.vue | 40 +++++++++++++---------------------------
1 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 875399d..30af0e3 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -10,15 +10,13 @@
<button type="button" class="el-button special-button el-button--default el-icon-d-arrow-right"></button>
</li>
</ul>
+
<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>
-<!-- <span>{{item.name}}</span>-->
-<!-- <div >-->
- <img src="../../assets/images/map-pages/icon/sl.png" class="icon">
-<!-- </div>-->
- </li>
- </el-tooltip>
+ <el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left">
+ <li>
+ <img src="../../assets/images/map-pages/icon/sl.png" class="icon">
+ </li>
+ </el-tooltip>
</ul>
</div>
</div>
@@ -41,7 +39,7 @@
</div>
<div :class="'search-container map-background'">
- <div class="el-message-box__content" style="padding:6px;font-size: 13px;">
+ <div class="el-message-box__content" style="padding:0 6px 6px 6px;font-size: 13px;">
<component :title="title" :is="gcComp"></component>
</div>
</div>
@@ -182,11 +180,7 @@
</script>
<style lang="less">
-.search-title{
- color:@color-title;
- font-size: 18px;
- margin: 5px;
-}
+
.search-container {
position: relative;
width: 1.79167rem;
@@ -469,13 +463,14 @@
.el-icon-search{
width: 40px;
border:1px solid @color;
- height: 26px;
- line-height: 26px;
+ height: 28px;
+ line-height: 28px;
text-align: center;
color:#fff;
border-radius: 2px;
cursor:pointer;
background: rgba(0,16,30,.5);
+ padding:0;
}
}
/*鍗曢�夋寜閽牱寮�*/
@@ -524,16 +519,6 @@
color:@color-over;
background: @background-color;
}
- //.search-panel {
- // border: #07325B;
- // background-color: #07325B !important;
- // margin-top: 0px;
- //
- // .el-input__inner {
- // border-radius: 0px !important;
- // background-color: #061e51 !important;
- // }
- //}
input::-webkit-input-placeholder {
color: #569ee1;
@@ -701,10 +686,11 @@
.sewers-search{
position: relative;
overflow: hidden;
+ .panel-title{}
.search-panel{
background-color: transparent;
- border: 1px solid @background-color-split;
padding: 10px 0;
+ border-bottom: 1px solid @background-color-split;
// .el-input{width:calc(100% - 40px);position: relative}
/deep/ input {
border-radius: 0;
--
Gitblit v1.8.0