From 896776bdfb2435ba9ed49996e39f007cc487ffe0 Mon Sep 17 00:00:00 2001
From: 徐旺旺 <11530253@qq.com>
Date: 星期二, 11 五月 2021 10:48:04 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 deletions(-)
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index f820713..a53ae08 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -24,7 +24,7 @@
</ul>
</div>
</div>
- <div class="right-control" :class="[{ 'unfold': !isCollapse },{ 'shrink': isCollapse }] ">
+ <div class="right-control" :class="[{ 'unfold': !isCollapse },{ 'shrink': isCollapse }] " v-if="gcComp!=''">
<div class="panel-fold-btn" @click="toggleMonitorPanel">
<div :class="[isCollapse? 'btn-stretch':'btn-shrink']"></div>
</div>
@@ -60,6 +60,7 @@
import SoilGroundWaterSearch from '@components/panel/topicSearch/SoilGroundWaterSearch.vue'
import PipeChangesSearch from '@components/panel/topicSearch/pipeChangesSearch.vue'
import PipeInformationSearch from '@components/panel/topicSearch/pipeInformationSearch.vue'
+import ReportSearch from './topicSearch/ReportSearch'
import bus from '@/eventBus'
@@ -70,7 +71,8 @@
WaterWasteSearch,
SolidWasteSearch,
EnvRiskSearch,
- DischargeSearch
+ DischargeSearch,
+ ReportSearch
},
data () {
return {
@@ -153,6 +155,9 @@
case '绠￠亾淇℃伅':
this.gcComp = PipeInformationSearch
break
+ case '浼佷笟搴旀��':
+ this.gcComp = ReportSearch
+ break
}
},
handlePage (page) {
@@ -214,6 +219,7 @@
const that = this
bus.$on('changeSearchBar', function (obj) {
// console.log(obj.checked, obj.name)
+ that.gcComp = ''
that.topicList.forEach((item) => {
if (item.name === obj.name) {
item.isShow = obj.checked
@@ -264,10 +270,10 @@
cursor: pointer;
position: relative;
line-height: 0.15rem;
-
li {
margin: 0.00521rem 0;
text-align: center;
+ font-size: 20px;
img {
width: 0.1rem;
@@ -286,7 +292,7 @@
//top: 10px;
height: 0;
position: absolute;
- top: 0.42979rem;
+ top: 0.73979rem;
right: 0.14583rem;
z-index: 501;
display: -webkit-box;
@@ -600,13 +606,12 @@
.environmental-risk-list {
position: relative;
- cursor: pointer;
padding-left: 50px;
padding-top: 5px;
padding-bottom: 5px;
color: @color-shadow;
border-bottom: 1px solid @background-color-split;
-
+ h3{ cursor: pointer;}
.state {
width: 30px;
height: 30px;
@@ -619,12 +624,14 @@
background: #0B3B6D;
}
}
-
.environmental-risk-list.hover,
- .environmental-risk-list:hover {
- color: @color-over;
+ .environmental-risk-list:hover{
background: @background-color;
}
+ .environmental-risk-list.hover h3,
+ .environmental-risk-list h3:hover {
+ color: @color-highlight;
+ }
input::-webkit-input-placeholder {
color: #569ee1;
--
Gitblit v1.8.0