From 4d265afb3419bd5cedc6f31ab78d570f6917b520 Mon Sep 17 00:00:00 2001
From: seatonwan9 <seatonwan9@163.com>
Date: 星期五, 21 五月 2021 14:30:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 0f7114d..b8fa510 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -60,7 +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 EnterpriseEmergencySearch from './topicSearch/EnterpriseEmergencySearch'
import bus from '@/eventBus'
@@ -72,7 +72,7 @@
SolidWasteSearch,
EnvRiskSearch,
DischargeSearch,
- ReportSearch
+ EnterpriseEmergencySearch
},
data () {
return {
@@ -86,7 +86,6 @@
hbVisible: false,
pkVisible: false,
toggleMonitorStyle: 'right:0px',
-
title: '姹￠洦姘寸缃�',
isCollapse: true,
selectGroup: false
@@ -156,7 +155,7 @@
this.gcComp = PipeInformationSearch
break
case '浼佷笟搴旀��':
- this.gcComp = ReportSearch
+ this.gcComp = EnterpriseEmergencySearch
break
}
},
@@ -218,11 +217,15 @@
mounted () {
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
+ if (obj.type > 0) {
+ item.isShow = true
+ } else {
+ item.isShow = false
+ }
+ // item.isShow = obj.checked
if (item.isShow) {
that.selected(item)
} else {
@@ -231,6 +234,7 @@
}
})
})
+ // console.log(that.topicList)
}
}
</script>
@@ -324,7 +328,7 @@
color: @color-tool;
position: absolute;
top: 24px;
- right: 0.02rem;
+ left: 0.02rem;
border: none; //1px solid @color-tool;
width: 0.2rem;
height: 0.2rem;
--
Gitblit v1.8.0