diff --git a/src/assets/images/pictureOnMap/titlePop.png b/src/assets/images/pictureOnMap/titlePop.png new file mode 100644 index 0000000..8ae0b48 --- /dev/null +++ b/src/assets/images/pictureOnMap/titlePop.png Binary files differ diff --git a/src/assets/images/pictureOnMap/titlePop.png b/src/assets/images/pictureOnMap/titlePop.png new file mode 100644 index 0000000..8ae0b48 --- /dev/null +++ b/src/assets/images/pictureOnMap/titlePop.png Binary files differ diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index 7a05b83..38bfb6c 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -426,4 +426,41 @@ .fade_bottom-leave-to { transform: translateY(350px); opacity: 0; +} + +.mapTotalDialog{ + .el-dialog{ + background: #071645; + .el-dialog__title{ + font-family: 'PangMenZhengDao'; + font-weight: 400; + font-size: 24px; + color: #FFFFFF; + } + } + .el-dialog__header{ + height: 44px; + background: url('@/assets/images/pictureOnMap/titlePop.png') no-repeat; + background-size:100% 100%; + margin: 0; + padding: 0 20px 0 50px; + } + .el-dialog__headerbtn{ + width: 44px; + height: 44px; + font-size: 30px; + font-weight: bold; + top: 0; + right: 10px; + .el-dialog__close{ + color: #3FA4F6; + background: linear-gradient(0deg, #3FA4F6 0%, #F7FDFF 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + } + .el-dialog__body{ + padding: 10px !important; + border: 1px solid #163F80; + } } \ No newline at end of file diff --git a/src/assets/images/pictureOnMap/titlePop.png b/src/assets/images/pictureOnMap/titlePop.png new file mode 100644 index 0000000..8ae0b48 --- /dev/null +++ b/src/assets/images/pictureOnMap/titlePop.png Binary files differ diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index 7a05b83..38bfb6c 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -426,4 +426,41 @@ .fade_bottom-leave-to { transform: translateY(350px); opacity: 0; +} + +.mapTotalDialog{ + .el-dialog{ + background: #071645; + .el-dialog__title{ + font-family: 'PangMenZhengDao'; + font-weight: 400; + font-size: 24px; + color: #FFFFFF; + } + } + .el-dialog__header{ + height: 44px; + background: url('@/assets/images/pictureOnMap/titlePop.png') no-repeat; + background-size:100% 100%; + margin: 0; + padding: 0 20px 0 50px; + } + .el-dialog__headerbtn{ + width: 44px; + height: 44px; + font-size: 30px; + font-weight: bold; + top: 0; + right: 10px; + .el-dialog__close{ + color: #3FA4F6; + background: linear-gradient(0deg, #3FA4F6 0%, #F7FDFF 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + } + .el-dialog__body{ + padding: 10px !important; + border: 1px solid #163F80; + } } \ No newline at end of file diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue index 0ebf62b..db6533a 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue @@ -88,9 +88,6 @@ width="1200px" :before-close="floodReleaseClose" > -
- -
diff --git a/src/assets/images/pictureOnMap/titlePop.png b/src/assets/images/pictureOnMap/titlePop.png new file mode 100644 index 0000000..8ae0b48 --- /dev/null +++ b/src/assets/images/pictureOnMap/titlePop.png Binary files differ diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index 7a05b83..38bfb6c 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -426,4 +426,41 @@ .fade_bottom-leave-to { transform: translateY(350px); opacity: 0; +} + +.mapTotalDialog{ + .el-dialog{ + background: #071645; + .el-dialog__title{ + font-family: 'PangMenZhengDao'; + font-weight: 400; + font-size: 24px; + color: #FFFFFF; + } + } + .el-dialog__header{ + height: 44px; + background: url('@/assets/images/pictureOnMap/titlePop.png') no-repeat; + background-size:100% 100%; + margin: 0; + padding: 0 20px 0 50px; + } + .el-dialog__headerbtn{ + width: 44px; + height: 44px; + font-size: 30px; + font-weight: bold; + top: 0; + right: 10px; + .el-dialog__close{ + color: #3FA4F6; + background: linear-gradient(0deg, #3FA4F6 0%, #F7FDFF 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + } + .el-dialog__body{ + padding: 10px !important; + border: 1px solid #163F80; + } } \ No newline at end of file diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue index 0ebf62b..db6533a 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue @@ -88,9 +88,6 @@ width="1200px" :before-close="floodReleaseClose" > -
- -
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 3c04c28..af673f9 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue @@ -32,14 +32,13 @@ -
- -
+
@@ -48,9 +47,12 @@ import { getBZFxLogList } from "@/api/FloodControlAndDrainage.js"; import bus from "@/bus"; import { watchAreaDutyPumpScheduling } from '@/api/FloodControlAndDrainage.js'; +import pumpDDZL from './pumpDDZL'; const bzData=ref({}) const dialogVisible=ref(false) +const serveData=ref({}) + const wetherData=ref([ { color:'cblue', @@ -107,15 +109,15 @@ } watchAreaDutyPumpScheduling(params).then(res => { if (res && res.code == 200) { - let data=res.data + 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=data.startLevel - element.bz=data.pumpNumber - if(element.code==data.warningInfo){ + element.qc=serveData.value.startLevel + element.bz=serveData.value.pumpNumber + if(element.code==serveData.value.warningInfo){ element.show=true } }); diff --git a/src/assets/images/pictureOnMap/titlePop.png b/src/assets/images/pictureOnMap/titlePop.png new file mode 100644 index 0000000..8ae0b48 --- /dev/null +++ b/src/assets/images/pictureOnMap/titlePop.png Binary files differ diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index 7a05b83..38bfb6c 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -426,4 +426,41 @@ .fade_bottom-leave-to { transform: translateY(350px); opacity: 0; +} + +.mapTotalDialog{ + .el-dialog{ + background: #071645; + .el-dialog__title{ + font-family: 'PangMenZhengDao'; + font-weight: 400; + font-size: 24px; + color: #FFFFFF; + } + } + .el-dialog__header{ + height: 44px; + background: url('@/assets/images/pictureOnMap/titlePop.png') no-repeat; + background-size:100% 100%; + margin: 0; + padding: 0 20px 0 50px; + } + .el-dialog__headerbtn{ + width: 44px; + height: 44px; + font-size: 30px; + font-weight: bold; + top: 0; + right: 10px; + .el-dialog__close{ + color: #3FA4F6; + background: linear-gradient(0deg, #3FA4F6 0%, #F7FDFF 100%); + -webkit-background-clip: text; + -webkit-text-fill-color: transparent; + } + } + .el-dialog__body{ + padding: 10px !important; + border: 1px solid #163F80; + } } \ No newline at end of file diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue index 0ebf62b..db6533a 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Fuzhujuece/AuxiliaryResearchAndJudgmentLeft/component/Beonduty.vue @@ -88,9 +88,6 @@ width="1200px" :before-close="floodReleaseClose" > -
- -
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 3c04c28..af673f9 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue @@ -32,14 +32,13 @@ -
- -
+
@@ -48,9 +47,12 @@ import { getBZFxLogList } from "@/api/FloodControlAndDrainage.js"; import bus from "@/bus"; import { watchAreaDutyPumpScheduling } from '@/api/FloodControlAndDrainage.js'; +import pumpDDZL from './pumpDDZL'; const bzData=ref({}) const dialogVisible=ref(false) +const serveData=ref({}) + const wetherData=ref([ { color:'cblue', @@ -107,15 +109,15 @@ } watchAreaDutyPumpScheduling(params).then(res => { if (res && res.code == 200) { - let data=res.data + 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=data.startLevel - element.bz=data.pumpNumber - if(element.code==data.warningInfo){ + element.qc=serveData.value.startLevel + element.bz=serveData.value.pumpNumber + if(element.code==serveData.value.warningInfo){ element.show=true } }); diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue new file mode 100644 index 0000000..5f0194c --- /dev/null +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/pumpDDZL.vue @@ -0,0 +1,89 @@ + + + + + \ No newline at end of file