diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index 771ada3..c3ae4f7 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -436,6 +436,7 @@ font-weight: 400; font-size: 24px; color: #FFFFFF; + line-height: 44px; } } .el-dialog__header{ diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index 771ada3..c3ae4f7 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -436,6 +436,7 @@ font-weight: 400; font-size: 24px; color: #FFFFFF; + line-height: 44px; } } .el-dialog__header{ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 86ae337..f3ca913 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -246,6 +246,10 @@ } console.log("dataId", dataId); if (!dataId) { + //渍水调度 + if(type=='waterlog_point'){ + bus.emit('showZSdispatch',Getproperties.value) + } // proxy.$modal.msgSuccess(''); return; } diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index 771ada3..c3ae4f7 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -436,6 +436,7 @@ font-weight: 400; font-size: 24px; color: #FFFFFF; + line-height: 44px; } } .el-dialog__header{ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 86ae337..f3ca913 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -246,6 +246,10 @@ } console.log("dataId", dataId); if (!dataId) { + //渍水调度 + if(type=='waterlog_point'){ + bus.emit('showZSdispatch',Getproperties.value) + } // proxy.$modal.msgSuccess(''); return; } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/drainageDDZL.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/drainageDDZL.vue new file mode 100644 index 0000000..bdbbc4b --- /dev/null +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/drainageDDZL.vue @@ -0,0 +1,276 @@ + + + + + \ No newline at end of file diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index 771ada3..c3ae4f7 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -436,6 +436,7 @@ font-weight: 400; font-size: 24px; color: #FFFFFF; + line-height: 44px; } } .el-dialog__header{ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 86ae337..f3ca913 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -246,6 +246,10 @@ } console.log("dataId", dataId); if (!dataId) { + //渍水调度 + if(type=='waterlog_point'){ + bus.emit('showZSdispatch',Getproperties.value) + } // proxy.$modal.msgSuccess(''); return; } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/drainageDDZL.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/drainageDDZL.vue new file mode 100644 index 0000000..bdbbc4b --- /dev/null +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/drainageDDZL.vue @@ -0,0 +1,276 @@ + + + + + \ No newline at end of file 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 77d230a..4930f9e 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue @@ -33,10 +33,21 @@ + + + + diff --git a/src/assets/styles/pictureOnMap.scss b/src/assets/styles/pictureOnMap.scss index 771ada3..c3ae4f7 100644 --- a/src/assets/styles/pictureOnMap.scss +++ b/src/assets/styles/pictureOnMap.scss @@ -436,6 +436,7 @@ font-weight: 400; font-size: 24px; color: #FFFFFF; + line-height: 44px; } } .el-dialog__header{ diff --git a/src/views/pictureOnMap/index.vue b/src/views/pictureOnMap/index.vue index 86ae337..f3ca913 100644 --- a/src/views/pictureOnMap/index.vue +++ b/src/views/pictureOnMap/index.vue @@ -246,6 +246,10 @@ } console.log("dataId", dataId); if (!dataId) { + //渍水调度 + if(type=='waterlog_point'){ + bus.emit('showZSdispatch',Getproperties.value) + } // proxy.$modal.msgSuccess(''); return; } diff --git a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/drainageDDZL.vue b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/drainageDDZL.vue new file mode 100644 index 0000000..bdbbc4b --- /dev/null +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/drainageDDZL.vue @@ -0,0 +1,276 @@ + + + + + \ No newline at end of file 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 77d230a..4930f9e 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningLeft/components/pzdd.vue @@ -33,10 +33,21 @@ + + + + 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 f9e110b..d29f0a1 100644 --- a/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue +++ b/src/views/pictureOnMap/page/FloodControlAndDrainage/Pailaodiaodu/MonitoringWarningRigh/components/bzdd.vue @@ -32,7 +32,7 @@