wangzhe 9 miesięcy temu
rodzic
commit
30bd2f5480
1 zmienionych plików z 32 dodań i 24 usunięć
  1. 32 24
      src/views/zdsz/bigscreen/index.vue

+ 32 - 24
src/views/zdsz/bigscreen/index.vue

@@ -909,7 +909,7 @@
         let option = {
           grid: {
             top: "15%",
-            left: "3%",
+            left: "6%",
             right: "2%",
             bottom: "15%"
           },
@@ -964,7 +964,7 @@
         let option = {
           grid: {
             top: "15%",
-            left: "3%",
+            left: "6%",
             right: "2%",
             bottom: "15%"
           },
@@ -1429,35 +1429,36 @@
 	}
 </style>
 <style lang="scss" scoped>
+
   .mainTitle{
     width: 1920px;
     height: 62px;
-    margin-bottom: 10px;
+    /*margin-bottom: 6px; // 10px*/
     background: url("../../../assets/images/logo.jpg");
-   }
    .searchBox{
       float: right;
       width: 450px;
       height: 40px;
       background-color: transparent;
       display: flex;
+     .el-input__inner{
+        background: transparent;
+        border: solid 1px #007dec;
+        height: 32px;
+        margin: 5px 0 0 0;
+        }
+      .el-range__icon{
+        line-height: 24px;
+      }
+      .el-button--mini {
+        padding: 8px 15px;
+        font-size: 12px;
+        border-radius: 3px;
+        margin: 5px 0 0 5px;
+        height: 32px;
+      }
      }
- .el-input__inner{
-    background: transparent;
-    border: solid 1px #007dec;
-    height: 32px;
-    margin: 5px 0 0 0;
-    }
-  .el-range__icon{
-    line-height: 24px;
-  }
-  .el-button--mini {
-    padding: 8px 15px;
-    font-size: 12px;
-    border-radius: 3px;
-    margin: 5px 0 0 5px;
-    height: 32px;
-  }
+   }
   /*1920 * 929 Google Chrome*/
   /*1920 * 69 Title*/
   /*1920 * 560 Top share 860 */
@@ -1465,8 +1466,9 @@
   /*1920 * 20 Remain */
   .mainTop{
     width: 1920px;
-    height: 560px;
-    margin: 0 auto 20px;
+    height: 565px; // 560
+    /*margin: 0 auto 20px;*/
+    padding-top: 5px;
     display: flex;
     flex-direction: row;
     justify-content:space-between;
@@ -1584,7 +1586,8 @@
   }
   .mainBottom{
     width: 1920px;
-    height: 277px;
+    height: 287px; // 277px
+    padding-top: 10px;
     .mainBottom_1{
       float: left;
       width: 930px;
@@ -1612,11 +1615,16 @@
   .app-container{
     margin: 0;
     padding: 0;
+    width: 100%;
+    height: 929px;
+    display: flex;
+    /*background-color: red !important;*/
+    flex-direction: column;
+    justify-content:flex-start;
   }
   .mainTop, .mainBottom, .app-container{
     background-color: #0a1426;
     /*background-color: #000;*/
-    /*background-color: red;*/
   }
   @font-face{
     font-family: 'biaotihei';