Merge remote-tracking branch 'origin/main'

ui/dasadmin/src/views/backend/dashboard.vue

@@ -1182,12 +1182,12 @@ onUnmounted(() => {
 
 <style scoped lang="scss">
 .default-main {
-    width: 100%;
     height: 100%;
     padding: 0;
     margin: 0;
     color: #4E5969;
     background-color: #F2F3F5;
+    overflow-x: hidden;
     .content-number{
         color: #333333;
         font-size: 20px;
@@ -1267,7 +1267,12 @@ onUnmounted(() => {
         .power{
             .power-chart{
                 width: 100%;
-                height: 250px;
+                height: 260px;
+            }
+            @media screen and (max-width: 1920px) {
+                .power-chart{
+                    height: 250px;
+                }
             }
         }
         .matrix{
@@ -1296,7 +1301,7 @@ onUnmounted(() => {
 
         }
         .trend{
-            height: 350px;
+            height: 365px;
             overflow: hidden;
             .trend-tabs{
                 :deep(.el-tabs__item){
@@ -1337,9 +1342,19 @@ onUnmounted(() => {
                 height: 260px;
             }
         }
-
+        @media screen and (max-width: 1920px) {
+            .trend{
+                height: 350px;
+            }
+        }
     }
 
 
 }
+@media screen and (max-width: 1920px) {
+    .default-main{
+        height: auto;
+    }
+}
+
 </style>