From 0ab574aa5f3d49cd78a41ccbd063ace5a422635c Mon Sep 17 00:00:00 2001
From: wangqi <magical1908@outlook.com>
Date: 星期一, 12 四月 2021 17:07:06 +0800
Subject: [PATCH] Merge branch 'develop' of http://xearth.cn:6600/r/wuyushui/SewerAndRainNetwork into develop
---
public/assets/images/map/company_gongChengDanWei.png | 0
src/components/LayerController/logic/WasteGas.js | 6 +++---
public/assets/images/map/company_refining1.png | 0
public/assets/images/map/company_xiaoShou.png | 0
public/assets/images/map/company_zhuanYeGongSi.png | 0
public/assets/images/map/exhaust/fq_green2.png | 0
src/assets/css/map/map-panel-style.less | 1 +
src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue | 2 +-
public/assets/images/map/company_huaGong.png | 0
public/assets/images/map/company_refining.png | 0
public/assets/images/map/company_youTian.png | 0
public/assets/images/map/company_keYanJiGou.png | 0
12 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/public/assets/images/map/company_gongChengDanWei.png b/public/assets/images/map/company_gongChengDanWei.png
new file mode 100644
index 0000000..ce650a9
--- /dev/null
+++ b/public/assets/images/map/company_gongChengDanWei.png
Binary files differ
diff --git a/public/assets/images/map/company_huaGong.png b/public/assets/images/map/company_huaGong.png
new file mode 100644
index 0000000..52f9fcc
--- /dev/null
+++ b/public/assets/images/map/company_huaGong.png
Binary files differ
diff --git a/public/assets/images/map/company_keYanJiGou.png b/public/assets/images/map/company_keYanJiGou.png
new file mode 100644
index 0000000..4b348d6
--- /dev/null
+++ b/public/assets/images/map/company_keYanJiGou.png
Binary files differ
diff --git a/public/assets/images/map/company_refining.png b/public/assets/images/map/company_refining.png
index faa99c1..f686363 100644
--- a/public/assets/images/map/company_refining.png
+++ b/public/assets/images/map/company_refining.png
Binary files differ
diff --git a/public/assets/images/map/company_refining1.png b/public/assets/images/map/company_refining1.png
new file mode 100644
index 0000000..faa99c1
--- /dev/null
+++ b/public/assets/images/map/company_refining1.png
Binary files differ
diff --git a/public/assets/images/map/company_xiaoShou.png b/public/assets/images/map/company_xiaoShou.png
new file mode 100644
index 0000000..ad94782
--- /dev/null
+++ b/public/assets/images/map/company_xiaoShou.png
Binary files differ
diff --git a/public/assets/images/map/company_youTian.png b/public/assets/images/map/company_youTian.png
new file mode 100644
index 0000000..6fb90e0
--- /dev/null
+++ b/public/assets/images/map/company_youTian.png
Binary files differ
diff --git a/public/assets/images/map/company_zhuanYeGongSi.png b/public/assets/images/map/company_zhuanYeGongSi.png
new file mode 100644
index 0000000..dbaf603
--- /dev/null
+++ b/public/assets/images/map/company_zhuanYeGongSi.png
Binary files differ
diff --git a/public/assets/images/map/exhaust/fq_green2.png b/public/assets/images/map/exhaust/fq_green2.png
new file mode 100644
index 0000000..b924938
--- /dev/null
+++ b/public/assets/images/map/exhaust/fq_green2.png
Binary files differ
diff --git a/src/assets/css/map/map-panel-style.less b/src/assets/css/map/map-panel-style.less
index fcf9008..2f70562 100644
--- a/src/assets/css/map/map-panel-style.less
+++ b/src/assets/css/map/map-panel-style.less
@@ -11,6 +11,7 @@
list-style: none;
}
+i{font-style: normal}
.el-button--primary {
color: @color;
diff --git a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
index 623b3cc..6cf58be 100644
--- a/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
+++ b/src/components/BaseNav/PublicBounced/GasComponents/EChartsHour.vue
@@ -32,7 +32,7 @@
</div>
<div>
閲囨牱鐐规暟:
- <el-select v-model="formInline.region" placeholder="50">
+ <el-select v-model="formInline.region">
<el-option label="0" value="0"></el-option>
<el-option label="25" value="25"></el-option>
<el-option label="50" value="50"></el-option>
diff --git a/src/components/LayerController/logic/WasteGas.js b/src/components/LayerController/logic/WasteGas.js
index 69dc4a1..bdc5e30 100644
--- a/src/components/LayerController/logic/WasteGas.js
+++ b/src/components/LayerController/logic/WasteGas.js
@@ -7,7 +7,7 @@
// 鍖哄垎涓嶅悓绫诲瀷 浣跨敤涓嶅悓img
// const ImgBlue = '/assets/images/map/exhaust/fq_blue.png'
// const ImgGray = '/assets/images/map/exhaust/fq_gray.png'
-const ImagGreen = '/assets/images/map/exhaust/fq_green_new.png'
+const ImagGreen = '/assets/images/map/exhaust/fq_green2.png'
// const ImagBright = '/assets/images/map/exhaust/fq_bright_green.png'
const mapApi = require('../../../api/mapApi').default
@@ -42,8 +42,8 @@
test: data[i],
icon: L.icon({
iconUrl: iconUrl,
- iconSize: [30, 38],
- iconAnchor: [15, 19]
+ iconSize: [30, 30],
+ iconAnchor: [15, 15]
})
})
layer.addLayer(marker)
--
Gitblit v1.8.0