From 5bd3c6fc05b2548195ebe78bc4cec04886b51ca2 Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期五, 02 四月 2021 14:22:03 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/RightSearchPanel.vue | 134 +++++++++++++++++++++++++++++++++++++++++---
1 files changed, 125 insertions(+), 9 deletions(-)
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index d8e296b..f9abbfb 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>-->
@@ -38,9 +37,6 @@
<div :class="'search-container map-background'">
<div class="el-message-box__content" style="padding:6px;font-size: 13px;">
- <div class="search-title">
- 姹￠洦姘�
- </div>
<component :title="title" :is="gcComp"></component>
</div>
</div>
@@ -49,14 +45,18 @@
</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,
@@ -96,10 +96,33 @@
console.log(done)
},
selected (val) {
- console.log(val)
+ // console.log(val)
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) {
},
@@ -161,7 +184,9 @@
.search-container {
position: relative;
width: 1.79167rem;
- height: 3.4375rem;
+ /*height: 5.6475rem;*/
+ min-height: 60vh;
+ max-height: 80vh;
overflow: hidden;
}
.module-wrap{
@@ -420,10 +445,68 @@
.search-form .el-icon-search {
display: grid;
- line-height: 30px;
font-size: 18px;
}
+ /*input 鐐瑰嚮鎼滅储鏍峰紡*/
+ .rightButtonSearch{
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ .el-input{margin-right: 10px}
+ .el-icon-search{
+ width: 40px;
+ border:1px solid @color;
+ height: 26px;
+ line-height: 26px;
+ text-align: center;
+ color:#fff;
+ border-radius: 2px;
+ cursor:pointer;
+ background: rgba(0,16,30,.5);
+ }
+ }
+ /*鍗曢�夋寜閽牱寮�*/
+ .levelOfRisk{padding-left:20px}
+ .levelOfRisk .el-radio{padding-bottom:6px}
+ .levelOfRisk-type{
+ display: inline-block;
+ position: relative;
+ padding-right: 5px;
+ color:#f5f5f5;
+ i{
+ display: block;
+ width: 15px;
+ height: 10px;
+ position: absolute;
+ top:50%;
+ right: -15px;
+ margin-top: -5px;
+ }
+ }
+ .el-radio.is-checked .levelOfRisk-type{color:#409EFF}
+
+ .environmental-risk-list{
+ border:1px solid @color;
+ margin-right: 10px;
+ margin-bottom: 15px;
+ position: relative;
+ padding-left:50px;
+ padding-top:3px;
+ padding-bottom:3px;
+ color: #f5f5f5;
+ .state{
+ width: 30px;
+ height: 30px;
+ position: absolute;
+ top:50%;
+ left:10px;
+ margin-top: -15px;
+ border-radius: 50%;
+ box-shadow: 0 0 3px #000;
+ background: #0B3B6D;
+ }
+ }
//.search-panel {
// border: #07325B;
// background-color: #07325B !important;
@@ -598,4 +681,37 @@
transition: transform 0.5s linear;
}
}
+/******************浠ヤ笅鍏叡閮ㄥ垎**********/
+.sewers-search{
+ position: relative;
+ overflow: hidden;
+ .search-panel{
+ background-color: transparent;
+ border: 1px solid @background-color-split;
+ padding: 10px;
+ // .el-input{width:calc(100% - 40px);position: relative}
+ /deep/ input {
+ border-radius: 0;
+ background-color: @background-color-split ;
+ border: solid 1px @color ;
+ color: @color-gray;
+ font-size: 0.01rem;
+ padding:0 15px;
+ .el-select .el-input.is-focus .el-input__inner{
+ border-color: @color;
+ }
+ }
+ .el-input__inner{background: none;color:#fff;font-size: 14px;border-radius: 0; border-color: @color;background: rgba(0,16,30,.5);}
+ }
+ .search-btn{
+
+ }
+ //location-btn{
+ //
+ //}
+ .location-btn:hover,.el-input__icon:hover{
+ color: @color;
+ cursor: pointer;
+ }
+}
</style>
--
Gitblit v1.8.0