diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index c999349..f8978e7 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -226,6 +226,13 @@
});
}
+export function getSectionByWellCodeDetail(params) {
+ return request({
+ url: `/business/pipelineInfo/getSectionByWellCode/wellCode`,
+ method: 'get',
+ params
+ });
+}
// 堤防防汛备料全部数据
export function infoListallDFFXBL(params) {
return request({
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index c999349..f8978e7 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -226,6 +226,13 @@
});
}
+export function getSectionByWellCodeDetail(params) {
+ return request({
+ url: `/business/pipelineInfo/getSectionByWellCode/wellCode`,
+ method: 'get',
+ params
+ });
+}
// 堤防防汛备料全部数据
export function infoListallDFFXBL(params) {
return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1c9bb2e..9c94a4e 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -456,15 +456,17 @@
};
function anotherMeht(item) {
let properties = {};
- Getproperties.value.stCode = item.stCode;
+ Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode;
Getproperties.value.dataCode = item.dataCode;
- Getproperties.value.wellcode = item.wellCode || item.dataName;
+ Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
Getproperties.value.dataId = item.dataId || '';
Getproperties.value.stType = item.stType;
Getproperties.value.geometry = item.geometry;
- Getproperties.value.waterRegionCode = item.waterRegionCode; //河湖水情 查询水系分区详情
-
+ Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情
+ if(item.daterange){
+ Getproperties.value.daterange=item.daterange
+ }
console.log('Getproperties', Getproperties.value);
if (arrstcode.value.includes(item.stType)) {
properties.stCode = item.stCode;
@@ -483,6 +485,7 @@
console.log('item', item);
dialogConfig.RefName = item.RefName || '';
dialogConfig.title = item.stName || item.name;
+ debugger
if (!!!item.NoPromise) {
anotherMeht(item);
} else {
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index c999349..f8978e7 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -226,6 +226,13 @@
});
}
+export function getSectionByWellCodeDetail(params) {
+ return request({
+ url: `/business/pipelineInfo/getSectionByWellCode/wellCode`,
+ method: 'get',
+ params
+ });
+}
// 堤防防汛备料全部数据
export function infoListallDFFXBL(params) {
return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1c9bb2e..9c94a4e 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -456,15 +456,17 @@
};
function anotherMeht(item) {
let properties = {};
- Getproperties.value.stCode = item.stCode;
+ Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode;
Getproperties.value.dataCode = item.dataCode;
- Getproperties.value.wellcode = item.wellCode || item.dataName;
+ Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
Getproperties.value.dataId = item.dataId || '';
Getproperties.value.stType = item.stType;
Getproperties.value.geometry = item.geometry;
- Getproperties.value.waterRegionCode = item.waterRegionCode; //河湖水情 查询水系分区详情
-
+ Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情
+ if(item.daterange){
+ Getproperties.value.daterange=item.daterange
+ }
console.log('Getproperties', Getproperties.value);
if (arrstcode.value.includes(item.stType)) {
properties.stCode = item.stCode;
@@ -483,6 +485,7 @@
console.log('item', item);
dialogConfig.RefName = item.RefName || '';
dialogConfig.title = item.stName || item.name;
+ debugger
if (!!!item.NoPromise) {
anotherMeht(item);
} else {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue
index 6408b94..39b2b85 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue
@@ -54,7 +54,7 @@
}
function changePump(data) {
bus.emit("pumpToRight",data)
- bus.emit("panelDataToMap",data)
+ // bus.emit("panelDataToMap",data)
}
onMounted(() => {
gitDataFun()
diff --git a/src/api/MonitorAssetsOnMap.js b/src/api/MonitorAssetsOnMap.js
index c999349..f8978e7 100644
--- a/src/api/MonitorAssetsOnMap.js
+++ b/src/api/MonitorAssetsOnMap.js
@@ -226,6 +226,13 @@
});
}
+export function getSectionByWellCodeDetail(params) {
+ return request({
+ url: `/business/pipelineInfo/getSectionByWellCode/wellCode`,
+ method: 'get',
+ params
+ });
+}
// 堤防防汛备料全部数据
export function infoListallDFFXBL(params) {
return request({
diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue
index 1c9bb2e..9c94a4e 100644
--- a/src/views/pictureOnMap/index.vue
+++ b/src/views/pictureOnMap/index.vue
@@ -456,15 +456,17 @@
};
function anotherMeht(item) {
let properties = {};
- Getproperties.value.stCode = item.stCode;
+ Getproperties.value.stCode = item.stCode||item.siteCode||item.lakeCode;
Getproperties.value.dataCode = item.dataCode;
- Getproperties.value.wellcode = item.wellCode || item.dataName;
+ Getproperties.value.wellcode = item.wellCode || item.dataName || item.pipeLine;
Getproperties.value.id = item.id || item.relationId; //item.relationId监测告警的普通id
Getproperties.value.dataId = item.dataId || '';
Getproperties.value.stType = item.stType;
Getproperties.value.geometry = item.geometry;
- Getproperties.value.waterRegionCode = item.waterRegionCode; //河湖水情 查询水系分区详情
-
+ Getproperties.value.waterRegionCode = item.waterRegionCode || item.lakeCode; //河湖水情 查询水系分区详情
+ if(item.daterange){
+ Getproperties.value.daterange=item.daterange
+ }
console.log('Getproperties', Getproperties.value);
if (arrstcode.value.includes(item.stType)) {
properties.stCode = item.stCode;
@@ -483,6 +485,7 @@
console.log('item', item);
dialogConfig.RefName = item.RefName || '';
dialogConfig.title = item.stName || item.name;
+ debugger
if (!!!item.NoPromise) {
anotherMeht(item);
} else {
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue
index 6408b94..39b2b85 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/bzdd.vue
@@ -54,7 +54,7 @@
}
function changePump(data) {
bus.emit("pumpToRight",data)
- bus.emit("panelDataToMap",data)
+ // bus.emit("panelDataToMap",data)
}
onMounted(() => {
gitDataFun()
diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
index 8565b78..3c04c28 100644
--- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
+++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue
@@ -12,7 +12,7 @@
停抽水位:{{i.tc}}m(吴淞)
开泵个数:{{i.kb}}/{{i.bz}}
-