From 1bf1ebe9830b985185c19a4de442e9596c1d1f29 Mon Sep 17 00:00:00 2001
From: chenyabin <Chenab123!>
Date: 星期二, 13 四月 2021 11:01:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue | 4 ++--
src/components/LayerController/logic/WasteWater.js | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
index b61ec1e..baf09e5 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/PublicChart.vue
@@ -5,7 +5,7 @@
<div class="border_corner border_corner_left_bottom"></div>
<div class="border_corner border_corner_right_bottom"></div>
<ul class="tab">
- <li :class="active==0?'hover':''" @click='tabTaggle("Echarts",0)'>瀹炴椂鏁版嵁</li>
+ <li :class="active==0?'hover':''" @click='tabTaggle("EChartsHour",0)'>瀹炴椂鏁版嵁</li>
<li :class="active==1?'hover':''" @click='tabTaggle("EChartsHour",1)'>灏忔椂鏁版嵁</li>
<li :class="active==2?'hover':''" @click='tabTaggle("EChartsHourWasteWater",2)'>鏃ユ暟鎹�</li>
<li :class="active==3?'hover':''" @click='tabTaggle("ECharts",3)'>浜哄伐鏁版嵁</li>
@@ -18,7 +18,7 @@
<span >瓒呮爣</span>
<i style=" background: orange;"></i>
</div>
- <component :is="currentTab" v-bind="$attrs"></component>
+ <component :is="currentTab"></component>
</div>
</template>
diff --git a/src/components/LayerController/logic/WasteWater.js b/src/components/LayerController/logic/WasteWater.js
index 671df7b..5b510ae 100644
--- a/src/components/LayerController/logic/WasteWater.js
+++ b/src/components/LayerController/logic/WasteWater.js
@@ -6,10 +6,10 @@
// 寮圭獥鏁版嵁寮曡繘
const publicBounced = require('../../BaseNav/PublicBounced/PublicBounced').default
-const NormalImg = '/assets/images/map/wastewater/fs_green.png' // 姝ｅ父
+const NormalImg = '/assets/images/map/wastewater/fs_bright_green.png' // 姝ｅ父
const OffImg = '/assets/images/map/wastewater/fs_gray.png' // 鍋滆繍
const AbnormalImg = '/assets/images/map/wastewater/fs_blue.png' // 寮傚父
-const MissImg = '/assets/images/map/wastewater/fs_yellow.png' // 缂哄け
+const MissImg = '/assets/images/map/wastewater/fs_bright_green.png' // 缂哄け
const AlarmImg = '/assets/images/map/wastewater/fs_red.png' // 鎶ヨ闂儊
const WarnImg = '/assets/images/map/wastewater/fs_orange.png' // 棰勮闂儊
@@ -73,7 +73,7 @@
}
const hourData = await mapApi.getQueryOnlineMonData(hourValue)
const dateData = await mapApi.getQueryOnlineMonData(dateValue)
- console.log(dateData)
+ // console.log(dateData)
// const drawback = await mapApi.getWasteWaterMonitoring()
// console.log(drawback)
const result = await mapApi.getWasteWaterMonitoringDetails(dataValue)
--
Gitblit v1.8.0