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 0c6db71..f14464c 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue @@ -60,8 +60,8 @@ tq:'大雨暴雨', qc:'', tc:'', - kb:'', - bz:'', + kb:'--', + bz:'--', show:false, },{ color:'cyellow', @@ -69,8 +69,8 @@ tq:'暴雨', qc:'', tc:'', - kb:'', - bz:'', + kb:'--', + bz:'--', show:false, },{ color:'corange', @@ -78,8 +78,8 @@ tq:'暴雨', qc:'', tc:'', - kb:'', - bz:'', + kb:'--', + bz:'--', show:false, },{ color:'cred', @@ -87,8 +87,8 @@ tq:'暴雨', qc:'', tc:'', - kb:'', - bz:'', + kb:'--', + bz:'--', show:false, },{ color:'cnomal', @@ -96,8 +96,8 @@ tq:'小雨中雨', qc:'', tc:'', - kb:'', - bz:'', + kb:'--', + bz:'--', show:false, }, ]) @@ -113,15 +113,19 @@ serveData.value=res.data let array=res.data.dataList wetherData.value.forEach(element => { - let Object=array.find(i=>{return i.warningInfo==element.code}) - element.kb=Object.openPumpNum - element.tc=Object.stopLevel - element.qc=serveData.value.startLevel - element.bz=serveData.value.pumpNumber - if(element.code==serveData.value.warningInfo){ - element.show=true - serveData.value.serverPubNum=element.kb + let Object=array.find(i=>{return i.grade==element.code}) + if(Object){ + element.kb=Object.openPumpNumber + element.tc=Object.stopLevel + element.qc=Object.startLevel + // element.qc=serveData.value.startLevel + element.bz=serveData.value.pumpNumber + if(element.code==serveData.value.warningInfo){ + element.show=true + serveData.value.serverPubNum=element.kb + } } + }); } }); 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 0c6db71..f14464c 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue @@ -60,8 +60,8 @@ tq:'大雨暴雨', qc:'', tc:'', - kb:'', - bz:'', + kb:'--', + bz:'--', show:false, },{ color:'cyellow', @@ -69,8 +69,8 @@ tq:'暴雨', qc:'', tc:'', - kb:'', - bz:'', + kb:'--', + bz:'--', show:false, },{ color:'corange', @@ -78,8 +78,8 @@ tq:'暴雨', qc:'', tc:'', - kb:'', - bz:'', + kb:'--', + bz:'--', show:false, },{ color:'cred', @@ -87,8 +87,8 @@ tq:'暴雨', qc:'', tc:'', - kb:'', - bz:'', + kb:'--', + bz:'--', show:false, },{ color:'cnomal', @@ -96,8 +96,8 @@ tq:'小雨中雨', qc:'', tc:'', - kb:'', - bz:'', + kb:'--', + bz:'--', show:false, }, ]) @@ -113,15 +113,19 @@ serveData.value=res.data let array=res.data.dataList wetherData.value.forEach(element => { - let Object=array.find(i=>{return i.warningInfo==element.code}) - element.kb=Object.openPumpNum - element.tc=Object.stopLevel - element.qc=serveData.value.startLevel - element.bz=serveData.value.pumpNumber - if(element.code==serveData.value.warningInfo){ - element.show=true - serveData.value.serverPubNum=element.kb + let Object=array.find(i=>{return i.grade==element.code}) + if(Object){ + element.kb=Object.openPumpNumber + element.tc=Object.stopLevel + element.qc=Object.startLevel + // element.qc=serveData.value.startLevel + element.bz=serveData.value.pumpNumber + if(element.code==serveData.value.warningInfo){ + element.show=true + serveData.value.serverPubNum=element.kb + } } + }); } }); diff --git a/src/views/pictureOnMap/page/components/DialogTabs/component/bengzhandiaodu.vue b/src/views/pictureOnMap/page/components/DialogTabs/component/bengzhandiaodu.vue index 152aa20..a6253a7 100644 --- a/src/views/pictureOnMap/page/components/DialogTabs/component/bengzhandiaodu.vue +++ b/src/views/pictureOnMap/page/components/DialogTabs/component/bengzhandiaodu.vue @@ -244,9 +244,12 @@ watchAreaDutyPumpScheduling(params).then(res => { if (res && res.code == 200) { serveData.value=res.data + debugger serveData.value.dataList.forEach(element => { - if(element.warningInfo==serveData.value.warningInfo){ - serveData.value.serverPubNum=element.openPumpNum + if(element.grade==serveData.value.warningInfo){ + serveData.value.serverPubNum=element.openPumpNumber + serveData.value.startLevel=element.startLevel + serveData.value.stopLevel=element.stopLevel } }); for(let i=1;i<=serveData.value.pumpNumber;i++){