Merge branch 'develop' of http://120.55.44.4:10080/xujunjie/gt_client_pad into develop

src/components/ManagementPage/chartModule.js

@@ -206,7 +206,7 @@ const defaultOption = {
     },
   },
   grid: {
-    bottom: 20,
+    bottom: 30,
     left: 70,
     right: 30,
   },

src/components/PageTitle/index.less

@@ -39,4 +39,5 @@
 .tabs {
   position: absolute;
   top: 0.4rem;
+  left: 0.4rem;
 }

src/global.less

@@ -195,7 +195,7 @@ input[type='reset'] {
   box-shadow: 0.01rem 0.06rem 0.1rem 0rem rgba(0, 0, 0, 0.1);
 }
 .card-select {
-  border: 1px solid #66ccff;
+  border: 3px solid #66ccff;
 }
 .value-number {
   margin-bottom: 0.2rem;

src/pages/Controller/index.less

@@ -17,6 +17,7 @@
   }
   .right {
     display: flex;
+    align-items: flex-start;
     flex-direction: column;
     justify-content: space-around;
   }

src/pages/DeviceManager/index.js

@@ -245,12 +245,32 @@ const Device = ({ projectId }) => {
   return (
     <div className={`content-tab ${styles.sparePart}`}>
       <Spin spinning={loadingDevice}>
-        <div className={styles.titleContent}>
+        {/* <div className={styles.titleContent}>
           <img className={styles.img} src={deviceIcon} />
           <div>
             <div className="value-number">{allData?.total}</div>
             <div className={styles.text}>设备总数（个）</div>
           </div>
+        </div> */}
+        <div className={styles.top}>
+          <div className={styles.left}>
+            <img
+              className={styles.img}
+              src={require('@/assets/air-conditioner.png')}
+            />
+            <div>
+              <div className="value-number">{allData?.total}</div>
+              设备总数（个）
+            </div>
+          </div>
+          <div className={styles.right}>
+            <div>
+              <i className={styles.icon}></i>正常：{allData?.total}
+            </div>
+            <div>
+              <i className={`${styles.icon} ${styles.offline}`}></i>异常：{0}
+            </div>
+          </div>
         </div>
         <Space className={styles.btns} size={28}>
           <div

src/pages/DeviceManager/index.less

@@ -15,6 +15,45 @@
   border-radius: 0.12rem;
   background: linear-gradient(to right, #4279e5, #372cc9);
 }
+.top {
+  display: flex;
+  padding: 0.48rem 1.8rem 0.25rem 0;
+  font-family: Source Han Sans, Source Han Sans;
+  font-weight: 500;
+  color: #615d5d;
+  font-size: 0.32rem;
+  justify-content: space-around;
+  .left {
+    // width: 50%;
+    display: flex;
+    align-items: center;
+  }
+  .img {
+    width: 1.5rem;
+    margin-right: 0.46rem;
+  }
+  .right {
+    display: flex;
+    align-items: flex-start;
+    flex-direction: column;
+    justify-content: space-around;
+  }
+  .icon {
+    width: 0.2rem;
+    height: 0.2rem;
+    // border-radius: 50%;
+    display: inline-block;
+    background-color: #12ceb3;
+    margin-right: 0.44rem;
+    vertical-align: middle;
+    &.error {
+      background-color: #fe5850;
+    }
+    &.offline {
+      background-color: #9b9b9b;
+    }
+  }
+}
 .titleContent {
   position: relative;
   display: flex;

src/pages/Home/index.js

@@ -283,7 +283,7 @@ const Scada = () => {
             style={{
               width: '707px',
               height: '279px',
-              borderRadius: '0 0 42px 0',
+              borderRadius: '0 0 44px 0',
             }}
             src={url}
           />

src/pages/Home/index.less

@@ -23,7 +23,7 @@
   position: relative;
   display: inline-block;
   cursor: pointer;
-  border-radius: 46px 6px 48px 6px;
+  border-radius: 40px 5px 42px 5px;
   box-shadow: 2px 13px 18px 0 rgba(9, 64, 115, 0.49);
   > ul {
     display: flex;