diff --git a/src/assets/newImgs/HMScreen/dialogHead.png b/src/assets/newImgs/HMScreen/dialogHead.png new file mode 100644 index 0000000..4000220 --- /dev/null +++ b/src/assets/newImgs/HMScreen/dialogHead.png Binary files differ diff --git a/src/assets/newImgs/HMScreen/dialogHead.png b/src/assets/newImgs/HMScreen/dialogHead.png new file mode 100644 index 0000000..4000220 --- /dev/null +++ b/src/assets/newImgs/HMScreen/dialogHead.png Binary files differ diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 5177e08..b8a3001 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -125,13 +125,33 @@ // 弹窗 .el-dialog { transform: none; - left: 0; - position: relative; - margin: 0 auto; + position: absolute; + top: 50%; + left: 50%; + display: flex; + flex-direction: column; + transform: translate(-50%, -50%); + margin: 0 !important; background: $mainBg !important; box-shadow: 0px 0px 40px rgba(0, 21, 41, 0.35) !important; + max-height: calc(100% - 30px); + max-width: calc(100% - 30px); .el-dialog__header { border-bottom: 1px solid $mainColor1; + width: 100%; + .el-dialog__close { + font-size: 26px; + font-weight: bold; + svg path { + fill: #3afff8 !important; + } + } + } + .el-dialog__title { + font-family: YouSheBiaoTiHei; + font-weight: 400; + font-size: 22px; + color: #e4f5ff; } .el-dialog__footer { border-top: 1px solid $mainColor1; @@ -139,19 +159,9 @@ .el-dialog__body { padding-top: 20px !important; padding-bottom: 0 !important; - max-height: 800px; overflow: auto; + flex: 1; } - .el-dialog__title { - font-size: 18px; - font-family: HarmonyOS Sans SC-Medium, HarmonyOS Sans SC; - font-weight: 500; - color: #fff; - line-height: 26px; - } -} -.el-dialog:not(.is-fullscreen) { - margin-top: 6vh !important; } .el-dialog.scrollbar .el-dialog__body { diff --git a/src/assets/newImgs/HMScreen/dialogHead.png b/src/assets/newImgs/HMScreen/dialogHead.png new file mode 100644 index 0000000..4000220 --- /dev/null +++ b/src/assets/newImgs/HMScreen/dialogHead.png Binary files differ diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 5177e08..b8a3001 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -125,13 +125,33 @@ // 弹窗 .el-dialog { transform: none; - left: 0; - position: relative; - margin: 0 auto; + position: absolute; + top: 50%; + left: 50%; + display: flex; + flex-direction: column; + transform: translate(-50%, -50%); + margin: 0 !important; background: $mainBg !important; box-shadow: 0px 0px 40px rgba(0, 21, 41, 0.35) !important; + max-height: calc(100% - 30px); + max-width: calc(100% - 30px); .el-dialog__header { border-bottom: 1px solid $mainColor1; + width: 100%; + .el-dialog__close { + font-size: 26px; + font-weight: bold; + svg path { + fill: #3afff8 !important; + } + } + } + .el-dialog__title { + font-family: YouSheBiaoTiHei; + font-weight: 400; + font-size: 22px; + color: #e4f5ff; } .el-dialog__footer { border-top: 1px solid $mainColor1; @@ -139,19 +159,9 @@ .el-dialog__body { padding-top: 20px !important; padding-bottom: 0 !important; - max-height: 800px; overflow: auto; + flex: 1; } - .el-dialog__title { - font-size: 18px; - font-family: HarmonyOS Sans SC-Medium, HarmonyOS Sans SC; - font-weight: 500; - color: #fff; - line-height: 26px; - } -} -.el-dialog:not(.is-fullscreen) { - margin-top: 6vh !important; } .el-dialog.scrollbar .el-dialog__body { diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index af6bd44..da88007 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -39,7 +39,7 @@ -
+ @@ -61,7 +61,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(4); const showPanel = ref(false); const showLegend = ref(false); diff --git a/src/assets/newImgs/HMScreen/dialogHead.png b/src/assets/newImgs/HMScreen/dialogHead.png new file mode 100644 index 0000000..4000220 --- /dev/null +++ b/src/assets/newImgs/HMScreen/dialogHead.png Binary files differ diff --git a/src/assets/styles/element-ui.scss b/src/assets/styles/element-ui.scss index 5177e08..b8a3001 100644 --- a/src/assets/styles/element-ui.scss +++ b/src/assets/styles/element-ui.scss @@ -125,13 +125,33 @@ // 弹窗 .el-dialog { transform: none; - left: 0; - position: relative; - margin: 0 auto; + position: absolute; + top: 50%; + left: 50%; + display: flex; + flex-direction: column; + transform: translate(-50%, -50%); + margin: 0 !important; background: $mainBg !important; box-shadow: 0px 0px 40px rgba(0, 21, 41, 0.35) !important; + max-height: calc(100% - 30px); + max-width: calc(100% - 30px); .el-dialog__header { border-bottom: 1px solid $mainColor1; + width: 100%; + .el-dialog__close { + font-size: 26px; + font-weight: bold; + svg path { + fill: #3afff8 !important; + } + } + } + .el-dialog__title { + font-family: YouSheBiaoTiHei; + font-weight: 400; + font-size: 22px; + color: #e4f5ff; } .el-dialog__footer { border-top: 1px solid $mainColor1; @@ -139,19 +159,9 @@ .el-dialog__body { padding-top: 20px !important; padding-bottom: 0 !important; - max-height: 800px; overflow: auto; + flex: 1; } - .el-dialog__title { - font-size: 18px; - font-family: HarmonyOS Sans SC-Medium, HarmonyOS Sans SC; - font-weight: 500; - color: #fff; - line-height: 26px; - } -} -.el-dialog:not(.is-fullscreen) { - margin-top: 6vh !important; } .el-dialog.scrollbar .el-dialog__body { diff --git a/src/views/sponeScreen/HaiMianScreen/index.vue b/src/views/sponeScreen/HaiMianScreen/index.vue index af6bd44..da88007 100644 --- a/src/views/sponeScreen/HaiMianScreen/index.vue +++ b/src/views/sponeScreen/HaiMianScreen/index.vue @@ -39,7 +39,7 @@ - + @@ -61,7 +61,7 @@ { name: '排水防涝', id: 4 }, { name: '长效运维', id: 5 }, ]); -const menuIndex = ref(1); +const menuIndex = ref(4); const showPanel = ref(false); const showLegend = ref(false); diff --git a/src/views/sponeScreen/waterFlood/rainReport.vue b/src/views/sponeScreen/waterFlood/rainReport.vue index 93c382e..c448458 100644 --- a/src/views/sponeScreen/waterFlood/rainReport.vue +++ b/src/views/sponeScreen/waterFlood/rainReport.vue @@ -1,7 +1,21 @@