diff --git a/cyx-admin/src/main/resources/static/css/main_center.css b/cyx-admin/src/main/resources/static/css/main_center.css index cb0b561..6cfa67d 100644 --- a/cyx-admin/src/main/resources/static/css/main_center.css +++ b/cyx-admin/src/main/resources/static/css/main_center.css @@ -21,19 +21,48 @@ .main_wrap .main_left .main_left_item { width: 100%; - height: 35vh; + height: 30vh; padding: 10px; box-sizing: border-box; /*background-color: rgba(11, 40, 49, 0.2);*/ } - -.main_wrap .main_center .main_center_item, .main_wrap .main_right .main_right_item { +.main_wrap .main_right .main_right_item{ width: 100%; - height: 70vh; + height: 60vh; box-sizing: border-box; padding: 10px; position: relative; } +.main_wrap .main_right .main_right_item_two{ + width: 100%; + height: 40vh; + box-sizing: border-box; + padding: 10px; + position: relative; +} +.main_wrap .main_right .main_right_item_two .main_right_item_two_div{ + width: 100%; + height: 35vh; +} +.main_wrap .main_center .main_center_item{ + width: 100%; + height: 60vh; + box-sizing: border-box; + padding: 10px; + position: relative; +} +.main_wrap .main_left .main_left_item:nth-child(2) { + margin: 3vh 0; +} +.main_wrap .main_left .main_left_item .btn_echarts_wrap { + width: 100%; + height: 25vh; +} + +.main_wrap .main_left .main_left_item .echarts_wrap { + width: 100%; + height: 28vh; +} .main_wrap .main_center .main_center_item .rain { position: absolute; @@ -252,9 +281,9 @@ /*background-color: rgba(11, 40, 49, 0.2);*/ } -.main_wrap .main_footer { +.main_wrap .main_center .main_footer { width: 100%; - height: 30vh; + height: 40vh; box-sizing: border-box; padding: 10px; /*background-color: rgba(11, 40, 49, 0.2);*/ @@ -287,24 +316,14 @@ margin-right: 5px; } -.main_wrap .btn_echarts_wrap { +.main_wrap .main_center .main_footer .echarts_footer_wrap { width: 100%; - height: 25vh; -} - -.main_wrap .echarts_wrap { - width: 100%; - height: 28vh; -} - -.main_wrap .echarts_footer_wrap { - width: 100%; - height: 24vh; + height: 34vh; } .main_wrap .echarts_right_top_wrap{ width: 100%; - height: 60vh; + height: 52vh; } .main_footer_center{ width: 100%; diff --git a/cyx-admin/src/main/resources/templates/main.html b/cyx-admin/src/main/resources/templates/main.html index 686ef2b..4c544ca 100644 --- a/cyx-admin/src/main/resources/templates/main.html +++ b/cyx-admin/src/main/resources/templates/main.html @@ -34,12 +34,12 @@
-