From dddcf8840e52a212e7b49ec034aec7763b5917f5 Mon Sep 17 00:00:00 2001 From: chenzeping <ChenZeping02609@163.com> Date: 星期四, 01 四月 2021 10:56:35 +0800 Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop --- src/components/panel/RightSearchPanel.vue | 50 ++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 46 insertions(+), 4 deletions(-) diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue index ea52369..cbce13b 100644 --- a/src/components/panel/RightSearchPanel.vue +++ b/src/components/panel/RightSearchPanel.vue @@ -9,7 +9,6 @@ <el-tooltip :popper-class="'map-tooltip'" effect="dark" :content="item.name" placement="left"> <li style=" "> <!-- <span>{{item.name}}</span>--> - <!-- <div >--> <img src="../../assets/images/map-pages/icon/sl.png" class="icon"> <!-- </div>--> @@ -35,20 +34,29 @@ <!-- <div class="btn-shrink" v-else-if="!isCollapse"></div>--> <div :class="[isCollapse? 'btn-stretch':'btn-shrink']" ></div> </div> - <component :title="title" :is="gcComp"></component> + + <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> <script> -import EnvProtectSearch from './topicSearch/EnvProtectSearch' +import EnvRiskSearch from './topicSearch/EnvRiskSearch' import DischargeSearch from './topicSearch/DischargeSearch' import { TopicList } from '../../conf/Topic' +import GasWasteSearch from '@components/panel/topicSearch/GasWasteSearch' +import WaterWasteSearch from '@components/panel/topicSearch/WaterWasteSearch' +import SolidWasteSearch from '@components/panel/topicSearch/SolidWasteSearch' import SewersSearch from '@components/panel/topicSearch/SewersSearch' +import SoilGroundWaterSearch from '@components/panel/topicSearch/SoilGroundWaterSearch.vue' export default { name: 'MonitorPanel', - components: { EnvProtectSearch, DischargeSearch }, + components: { GasWasteSearch, WaterWasteSearch, SolidWasteSearch, EnvRiskSearch, DischargeSearch }, data () { return { isShow: true, @@ -92,6 +100,29 @@ this.topicList.forEach((itm) => { itm.checked = val.name === itm.name }) + switch (val.name) { + case '姹℃煋婧�': + this.gcComp = DischargeSearch + break + case '搴熸按鐩戞祴': + this.gcComp = WaterWasteSearch + break + case '搴熸皵鐩戞祴': + this.gcComp = GasWasteSearch + break + case '鍥哄簾绠$悊': + this.gcComp = SolidWasteSearch + break + case '鐜椋庨櫓': + this.gcComp = EnvRiskSearch + break + case '鍦熷¥鍙婂湴涓嬫按': + this.gcComp = SoilGroundWaterSearch + break + case '姹¢洦姘寸缃�': + this.gcComp = SewersSearch + break + } }, handlePage (page) { }, @@ -145,6 +176,17 @@ </script> <style lang="less"> +.search-title{ + color: rgb(255, 255, 255); + font-size: 16px; + margin: 5px; +} +.search-container { + position: relative; + width: 1.79167rem; + height: 3.4375rem; + overflow: hidden; +} .module-wrap{ width: 0.15rem; height: 0.15rem; -- Gitblit v1.8.0