Renxy 1 tahun lalu
induk
melakukan
0fb04a46be

+ 2 - 2
src/pages/Controller/components/AirConditioner.js

@@ -34,10 +34,10 @@ const Work = (props) => {
           </div>
         </div>
         <div className={styles.right}>
-          <div className={styles.row}>
+          <div>
             <i className={styles.icon}></i> 在线:{data?.online_count}
           </div>
-          <div className={styles.row}>
+          <div>
             <i className={`${styles.icon} ${styles.offline}`}></i> 离线:
             {data?.offline_count}
           </div>

+ 11 - 9
src/pages/Controller/index.less

@@ -1,9 +1,12 @@
 .top {
   display: flex;
   padding: 0.48rem 0.6rem 0.25rem;
+  font-family: Source Han Sans, Source Han Sans;
+  font-weight: 500;
+  color: #615d5d;
+  font-size: 0.32rem;
   .left {
     width: 50%;
-    font-size: 0.28rem;
     display: flex;
     align-items: center;
   }
@@ -13,22 +16,21 @@
   }
   .number {
     font-size: 0.8rem;
-    font-weight: bold;
-    margin-bottom: 0.1rem;
-    color: #4A90E2;
+    font-family: PangMenZhengDao-3, PangMenZhengDao-3;
+    font-weight: 400;
+    color: #3b3b3b;
+    line-height: 0.62rem;
+    letter-spacing: 0.06rem;
   }
   .right {
     display: flex;
     flex-direction: column;
     justify-content: space-around;
   }
-  .row {
-    font-size: 0.32rem;
-  }
 }
 .item {
   padding: 0.4rem 0.6rem;
-  
+
   font-size: 0.32rem;
   margin-top: 0.28rem;
   display: flex;
@@ -37,7 +39,7 @@
 .icon {
   width: 0.2rem;
   height: 0.2rem;
-  border-radius: 50%;
+  // border-radius: 50%;
   display: inline-block;
   background-color: #12ceb3;
   margin-right: 0.44rem;

+ 8 - 7
src/pages/Menu/index.less

@@ -1,17 +1,18 @@
 .main {
-  margin-top: calc(100vh - 15.2rem);
+  // margin-top: calc(100vh - 15.2rem);
   float: right;
-  width: 3.2rem;
-  height: 15.2rem;
+  width: 2.29rem;
+  height: 13.2rem;
   display: flex;
   flex-direction: column;
   align-items: flex-end;
-  background: url('@/assets/menu/menu_bg.png') no-repeat center;
-  background-size: 100% 100%;
+  // background-color: #aaacae;
+  // background: url('@/assets/menu/menu_bg.png') no-repeat center;
+  // background-size: 100% 100%;
 }
 .menu {
-  margin-top: 0.6rem;
-  width: 2rem;
+  // margin-top: 0.6rem;
+  width: 100%;
   height: 11.8rem;
   display: flex;
   flex-direction: column;