diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index c7229ea..a7b9c16 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -705,7 +705,7 @@ pointNumber: Row.properties.wellCode, }).then((res) => { if (res && res.code == 200) { - AllData.GWBD = res.data[0]; + AllData.GWBD = res.data[0]||{}; } }); } else { diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index c7229ea..a7b9c16 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -705,7 +705,7 @@ pointNumber: Row.properties.wellCode, }).then((res) => { if (res && res.code == 200) { - AllData.GWBD = res.data[0]; + AllData.GWBD = res.data[0]||{}; } }); } else { diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index bf2802d..acc7c88 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -752,7 +752,7 @@ pointNumber: Row.properties.wellCode, }).then((res) => { if (res && res.code == 200) { - AllData.GWBD = res.data[0]; + AllData.GWBD = res.data[0]||{}; } }); } else { diff --git a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue index c7229ea..a7b9c16 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/WSIndex.vue @@ -705,7 +705,7 @@ pointNumber: Row.properties.wellCode, }).then((res) => { if (res && res.code == 200) { - AllData.GWBD = res.data[0]; + AllData.GWBD = res.data[0]||{}; } }); } else { diff --git a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue index bf2802d..acc7c88 100644 --- a/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue +++ b/src/views/pictureOnMap/page/DrainageSystem/YSIndex.vue @@ -752,7 +752,7 @@ pointNumber: Row.properties.wellCode, }).then((res) => { if (res && res.code == 200) { - AllData.GWBD = res.data[0]; + AllData.GWBD = res.data[0]||{}; } }); } else { diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue index ca1bba2..3193fd8 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue @@ -15,9 +15,9 @@ 签 到 数 :{{item.signNumber}}/{{item.areaPeopleNum}} 上报处理:{{item.handle}}/{{item.report}} 平台调度:{{item.dispatch}} - 渍水监测:{{item.alarmMonitorWaterlogging}}/{{item.monitorWaterlogging}} - 雨水预警:{{item.alarmRainwaterMonitor}}/{{item.rainwaterMonitor}} - 污水预警:{{item.alarmSewageMonitor}}/{{item.sewageMonitor}} + 渍水监测:{{item.alarmMonitorWaterlogging}}/{{item.monitorWaterlogging}} + 雨水预警:{{item.alarmRainwaterMonitor}}/{{item.rainwaterMonitor}} + 污水预警:{{item.alarmSewageMonitor}}/{{item.sewageMonitor}} @@ -125,20 +125,17 @@ beansToMap: { key: 'beansToMap',id:['ybyj'] }, }; // 点击事件 -function showMapOnePoint(val){ - bus.emit(events_paramsPoint.removeMapDatas.key, events_paramsPoint.beansToMap.id) - reviewApi.monitorDataPoint({monitorType:val}).then(res=>{ +function showMapOnePoint(val,row){ + bus.emit(events_paramsPoint.removeMapDatas.key, events_paramsPoint.beansToMap.id); + reviewApi.monitorDataPoint({monitorType:val,watchId:row.id}).then(res=>{ if(res.code==200){ if(res.data.length>0){ let data=res.data - debugger bus.emit(events_paramsPoint.beansToMap.key, { beans: data.filter(i => i.geometry).map(i => ({...i,_image:i.stType+(!(i.warnInfoCode) ?'':"_"+i.warnInfoCode)})), fields: { geometry: 'geometry', name: 'stName' }, type: events_paramsPoint.beansToMap.id[0], }); - - // events_paramsPoint.beansToMap.id.forEach(o => bus.emit(events_paramsPoint.setLayerVisible.key,{layername:o,isCheck:true})); } } })