diff --git a/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js b/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
index 0bdb86d26..31fbe8d9b 100644
--- a/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
+++ b/src/views/Home/MapCtrl/Pops/DuanMian/drpOption.js
@@ -25,7 +25,7 @@ export default function drpOption(data) {
// 显示图例
show: true,
// 图例的位置
- data: ["压测管水位", "库水位"],
+ data: ["测压管水位", "库水位"],
},
xAxis: [
{
@@ -57,7 +57,7 @@ export default function drpOption(data) {
// gridIndex: 1,
type: 'value',
position: 'left',
- name: "压测管水位(m)",
+ name: "测压管水位(m)",
nameTextStyle: {
padding: [0, 0, 10, 10],
color:'#333333',
@@ -128,7 +128,7 @@ export default function drpOption(data) {
{
// xAxisIndex: 1,
yAxisIndex: 0,
- name: '压测管水位',
+ name: '测压管水位',
type: 'line',
color: "#d6eaec",
lineStyle: {
diff --git a/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js b/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js
index c7f062fb4..136e632f1 100644
--- a/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js
+++ b/src/views/Home/MapCtrl/Pops/ShenYa/drpOption.js
@@ -41,7 +41,7 @@ export default function drpOption(data,yjData) {
// 显示图例
show: true,
// 图例的位置
- data: ["压测管水位", "库水位"],
+ data: ["测压管水位", "库水位"],
},
xAxis: [
{
@@ -73,7 +73,7 @@ export default function drpOption(data,yjData) {
// gridIndex: 1,
type: 'value',
position: 'left',
- name: "压测管水位(m)",
+ name: "测压管水位(m)",
nameTextStyle: {
padding: [0, 0, 10, 10],
color:'#333333',
@@ -144,7 +144,7 @@ export default function drpOption(data,yjData) {
{
// xAxisIndex: 1,
yAxisIndex: 0,
- name: '压测管水位',
+ name: '测压管水位',
type: 'line',
color: "#d6eaec",
lineStyle: {
diff --git a/src/views/Home/homePanelsLayoutPage/index.js b/src/views/Home/homePanelsLayoutPage/index.js
index 1998c6f35..7b08de6da 100644
--- a/src/views/Home/homePanelsLayoutPage/index.js
+++ b/src/views/Home/homePanelsLayoutPage/index.js
@@ -23,6 +23,7 @@ import AnZhiDian from './item_anzhidian'
import QSYDW from './item_qishiyedanwei'
import YHJMH from './item_yanhejuminhu'
import SetWxqStation from '../setMapStation/wxq'
+import SetDrpStation from '../setMapStation/drp'
import Bzt from '../../gcaqjc/bzt2'
import ShenLiu from '../MapCtrl/Pops/ShenLiu';
import ShenYa from '../MapCtrl/Pops/ShenYa';
@@ -419,10 +420,13 @@ const HomePage = ({ showPanels }) => {
});
// 先清除已存在的同名图层
mapObj && mapObj.getLayers().getArray().forEach(layer => {
- if (layer.values_.name && (layer.values_.name.indexOf('ZHZS_WXQ') > -1)) {
+ if (layer.values_.name && (layer.values_.name.indexOf('ZHZS_WXQ') > -1 ||
+ layer.values_.name.indexOf('ZHZS_YQ') > -1 ||
+ layer.values_.name.indexOf('ZHZS_YQ_DRP') > -1)) {
mapObj.removeLayer(layer);
}
});
+ debugger
// 根据类型确定弹窗类型和图层
let popType = item.type;
let layerToShow = {};
@@ -760,6 +764,8 @@ const HomePage = ({ showPanels }) => {
{checkedObj.label === '沿河居民户' ? : null}
{checkedObj.label === '危险区' || checkedObj.label === '安置点' || checkedObj.label === '企事业单位' || checkedObj.label === '沿河居民户' ? : null}
+ {checkedObj.label === '搜索结果' ? {}} /> : null}
+
: null
}