gcz 2 سال پیش
والد
کامیت
bf352bf34f
6فایلهای تغییر یافته به همراه48 افزوده شده و 23 حذف شده
  1. 1 0
      src/assets/scss/common.scss
  2. 8 16
      src/assets/scss/media.scss
  3. 7 5
      src/components/header.vue
  4. 21 1
      src/components/numerical.vue
  5. 10 0
      src/components/pickerAddr.vue
  6. 1 1
      src/views/index.vue

+ 1 - 0
src/assets/scss/common.scss

@@ -170,6 +170,7 @@ body {
     }
     .el-input__icon{
         color: var(--main-color);
+        font-size: 24px;
     }
     .title{
         white-space: nowrap;

+ 8 - 16
src/assets/scss/media.scss

@@ -24,22 +24,14 @@
             padding: 1.1vh 24px;
         }
     }
-    //概况
-    .numerical{
-
-        .item-wrap{
-            .numerical-item{
-                padding: 0 0 15px 5px!important;
-                .name{
-                    font-size: 14px!important;
-                }
-                .number{
-                    font-size: 20px!important;
-                }
-                .unit{
-                    font-size: 14px!important;
-                }
-            }
+    //小班搜索
+    .xiaoban{
+        width: 320px;
+         .el-input .el-input__inner{
+            font-size: 16px;
+        }
+        .title{
+            font-size: 16px;
         }
     }
 

+ 7 - 5
src/components/header.vue

@@ -3,7 +3,7 @@
  * @Author: wangcc
  * @Date: 2022-06-14 18:11:54
  * @LastEditors: gcz
- * @LastEditTime: 2022-06-28 10:37:06
+ * @LastEditTime: 2022-06-28 16:50:32
  * @FilePath: \castgroup_bigscreen\src\components\header.vue
  * @Copyright: Copyright (c) 2016~2022 by wangcc, All Rights Reserved. 
 -->
@@ -120,16 +120,17 @@ import timeFormat from '@/utils/timeFormat'
     text-align: center;
   }
   span {
-    color: #0a7786;
+    color: #0c6e7a;
     font-size: 1.2em;
     position: absolute;
     line-height: 36px;
     left: 7%;
     top: 40px;
+    font-weight: bold;
   }
   img {
-    width: 30px;
-    height: 30px;
+    width: 27px;
+    height: 27px;
     cursor: pointer;
     position: absolute;
     top: 5px;
@@ -137,8 +138,9 @@ import timeFormat from '@/utils/timeFormat'
     top: 40px;
   }
   .weather {
+    font-weight: bold;
     /deep/ .s-sticker >div{
-        color: #0a7786!important;
+        color: #0c6e7a!important;
     }
     position: absolute;
     line-height: 40px;

+ 21 - 1
src/components/numerical.vue

@@ -63,7 +63,7 @@
             }
             .number{
                 color: var(--main-color);
-                font-size: 39px;
+                font-size: 35px;
                 margin-right: 5px;
                 font-family: 'Rubik', sans-serif;
             }
@@ -74,4 +74,24 @@
         }
     }
 }
+@media only screen and (max-width : 1200px) {
+  //概况
+    .numerical{
+
+        .item-wrap{
+            .numerical-item{
+                padding: 0 0 15px 5px;
+                .name{
+                    font-size: 14px;
+                }
+                .number{
+                    font-size: 20px;
+                }
+                .unit{
+                    font-size: 14px;
+                }
+            }
+        }
+    }
+}
 </style>

+ 10 - 0
src/components/pickerAddr.vue

@@ -180,4 +180,14 @@ export default {
     }
   }
 }
+@media only screen and (max-width : 1200px) {
+  .pickerAddr{
+    font-size: 16px;
+    .el-select{
+      /deep/ .el-input__inner {
+        font-size: 16px;
+      }
+    }
+  }
+}
 </style>

+ 1 - 1
src/views/index.vue

@@ -786,7 +786,7 @@ export default {
         });
 
         rows.forEach(element => {
-          console.log('element',element.eventList);
+          // console.log('element',element.eventList);
           this.page6Char2.series[0].data.push(element.eventList[0].value);
           this.page6Char2.series[1].data.push(element.eventList[1].value);
           this.page6Char2.series[2].data.push(element.eventList[2].value);