From 4adfa4774e09f3b388335bb8dee5dea518856e5b Mon Sep 17 00:00:00 2001
From: yangdelong <828900aaa>
Date: 星期日, 30 五月 2021 19:23:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/panel/RightSearchPanel.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/components/panel/RightSearchPanel.vue b/src/components/panel/RightSearchPanel.vue
index 4ebfab1..2283ad0 100644
--- a/src/components/panel/RightSearchPanel.vue
+++ b/src/components/panel/RightSearchPanel.vue
@@ -53,8 +53,8 @@
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 WasteGasSearch from '@components/panel/topicSearch/WasteGasSearch'
+import WasteWaterSearch from '@components/panel/topicSearch/WasteWaterSearch'
import SolidWasteSearch from '@components/panel/topicSearch/SolidWasteSearch'
import SewersSearch from '@components/panel/topicSearch/SewersSearch'
import SoilGroundWaterSearch from '@components/panel/topicSearch/SoilGroundWaterSearch.vue'
@@ -65,8 +65,8 @@
export default {
name: 'MonitorPanel',
components: {
- GasWasteSearch,
- WaterWasteSearch,
+ WasteGasSearch,
+ WasteWaterSearch,
SolidWasteSearch,
EnvRiskSearch,
DischargeSearch,
@@ -153,10 +153,10 @@
this.gcComp = DischargeSearch
break
case '搴熸按':
- this.gcComp = WaterWasteSearch
+ this.gcComp = WasteWaterSearch
break
case '搴熸皵':
- this.gcComp = GasWasteSearch
+ this.gcComp = WasteGasSearch
break
case '鍥哄簾':
this.gcComp = SolidWasteSearch
@@ -369,7 +369,7 @@
background: @background-color4;
color: @color-tool;
position: absolute;
- top: 24px;
+ top: 20px;
left: 0.02rem;
border: none; //1px solid @color-tool;
width: 0.2rem;
--
Gitblit v1.8.0