From dc568edd323882e94481fbae82a97c9aa96f3cd3 Mon Sep 17 00:00:00 2001
From: chenzeping <ChenZeping02609@163.com>
Date: 星期四, 15 四月 2021 15:17:07 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
src/components/panel/topicSearch/WaterWasteSearch.vue | 3 ++-
src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue | 2 +-
src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue | 5 ++++-
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
index fecb54d..9baaa67 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsHourWasteWater.vue
@@ -1,4 +1,4 @@
-git<!-- 灏忔椂鏁版嵁 -->
+<!-- 灏忔椂鏁版嵁 -->
<template>
<div id="Tab">
<div class="infomation">
diff --git a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
index 50f0622..0423201 100644
--- a/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
+++ b/src/components/BaseNav/PublicBounced/common/echarts/EChartsWasteWaterTable.vue
@@ -6,7 +6,7 @@
<!-- </el-table-column>-->
<!-- </el-table-column>-->
<!-- </el-table>-->
- <div style="width: 755px">
+ <div style="width: 5.9rem">
<el-table
:data="tableData"
max-height="255px"
@@ -305,4 +305,7 @@
</script>
<style scoped>
+.el-table--border::after, .el-table--group::after, .el-table::before{
+ background: none;
+}
</style>
diff --git a/src/components/panel/topicSearch/WaterWasteSearch.vue b/src/components/panel/topicSearch/WaterWasteSearch.vue
index edad7fb..246cd39 100644
--- a/src/components/panel/topicSearch/WaterWasteSearch.vue
+++ b/src/components/panel/topicSearch/WaterWasteSearch.vue
@@ -30,7 +30,8 @@
<el-scrollbar style="height:264px">
<div class="environmental-risk-list" v-for="(item,index) in list" :key="index" @click="handleLocation(item)">
<!-- v-for="(item,index) in list" :key="index" -->
- <i class="state"></i>
+<!-- <i class="state"></i>-->
+ <img src="../../../../public/assets/images/map/wastewater/fs_bright_green.png" alt="" class="state">
<div>
<h3>###鐐煎寲閮�</h3>
<p>鎵�灞為儴闂細<span>鐐煎寲閮�</span></p>
--
Gitblit v1.8.0