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

src/global.less

@@ -147,6 +147,14 @@ input[type='reset'] {
   background: #ffffff;
   box-shadow: 0.01rem 0.06rem 0.1rem 0rem rgba(0, 0, 0, 0.1);
 }
+.value-number {
+  font-size: 0.8rem;
+  font-family: PangMenZhengDao-3, PangMenZhengDao-3;
+  font-weight: 400;
+  color: #3b3b3b;
+  line-height: 0.62rem;
+  letter-spacing: 0.06rem;
+}
 
 .content-tab {
   padding-left: 0.05rem;

src/pages/Controller/components/AirConditioner.js

@@ -22,34 +22,36 @@ const Work = (props) => {
 
   return (
     <div>
-      <div className={`card-box ${styles.top}`}>
+      <div className={styles.top}>
         <div className={styles.left}>
           <img
             className={styles.img}
             src={require('@/assets/air-conditioner.png')}
           />
           <div>
-            <div className={styles.number}>{data?.pagination?.total}</div>
+            <div className="value-number">{data?.pagination?.total}</div>
             空调数量
           </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>
         </div>
       </div>
       <Spin spinning={loading}>
-        {data?.list?.map((item) => (
-          <div key={item.id} className={`card-box ${styles.item}`}>
-            <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>{' '}
-            {item.name}
-          </div>
-        ))}
+        <div className={styles.listContent}>
+          {data?.list?.map((item) => (
+            <div key={item.id} className={`card-box ${styles.item}`}>
+              <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>
+              {item.name}
+            </div>
+          ))}
+        </div>
       </Spin>
     </div>
   );

src/pages/Controller/components/Light.js

@@ -22,14 +22,14 @@ const Work = (props) => {
 
   return (
     <div>
-      <div className={`card-box ${styles.top}`}>
+      <div className={styles.top}>
         <div className={styles.left}>
           <img
             className={styles.img}
             src={require('@/assets/air-conditioner.png')}
           />
           <div>
-            <div className={styles.number}>{data?.pagination?.total}</div>
+            <div className="value-number">{data?.pagination?.total}</div>
             照明数量
           </div>
         </div>
@@ -44,12 +44,14 @@ const Work = (props) => {
         </div>
       </div>
       <Spin spinning={loading}>
-        {data?.list?.map((item) => (
-          <div key={item.id} className={`card-box ${styles.item}`}>
-            <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>{' '}
-            {item.name}
-          </div>
-        ))}
+        <div className={styles.listContent}>
+          {data?.list?.map((item) => (
+            <div key={item.id} className={`card-box ${styles.item}`}>
+              <i className={`${styles.icon} ${getIconStatus(item.status)}`}></i>{' '}
+              {item.name}
+            </div>
+          ))}
+        </div>
       </Spin>
     </div>
   );

src/pages/Controller/index.js

@@ -12,19 +12,19 @@ const HardwareController = (props) => {
       <PageTitle>智能管控</PageTitle>
 
       <div
-        className={`card-box ${styles.item}`}
+        className={`card-box ${styles.itemLong}`}
         onClick={() => UnityAction.sendMsg('innerItem', 'scada')}
       >
         工艺监控
       </div>
       <div
-        className={`card-box ${styles.item}`}
+        className={`card-box ${styles.itemLong}`}
         onClick={() => UnityAction.sendMsg('innerItem', 'sensor')}
       >
         感知监控
       </div>
       <div
-        className={`card-box ${styles.item}`}
+        className={`card-box ${styles.itemLong}`}
         onClick={() => UnityAction.sendMsg('innerItem', 'locate')}
       >
         室内定位

src/pages/Controller/index.less

@@ -1,9 +1,13 @@
 .top {
   display: flex;
-  padding: 0.48rem 0.6rem 0.25rem;
+  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%;
-    font-size: 0.28rem;
+    // width: 50%;
     display: flex;
     align-items: center;
   }
@@ -11,33 +15,33 @@
     width: 1.52rem;
     margin-right: 0.45rem;
   }
-  .number {
-    font-size: 0.8rem;
-    font-weight: bold;
-    margin-bottom: 0.1rem;
-    color: #4A90E2;
-  }
   .right {
     display: flex;
     flex-direction: column;
     justify-content: space-around;
   }
-  .row {
-    font-size: 0.32rem;
-  }
 }
-.item {
+
+.listContent {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.itemLong {
   padding: 0.4rem 0.6rem;
-  
   font-size: 0.32rem;
   margin-top: 0.28rem;
   display: flex;
   align-items: center;
 }
+.item {
+  .itemLong;
+  width: 48%;
+}
 .icon {
   width: 0.2rem;
   height: 0.2rem;
-  border-radius: 50%;
+  // border-radius: 50%;
   display: inline-block;
   background-color: #12ceb3;
   margin-right: 0.44rem;

src/pages/DeviceManager/index.js

@@ -239,10 +239,10 @@ const Device = ({ projectId }) => {
   return (
     <div className={`content-tab ${styles.sparePart}`}>
       <Spin spinning={loadingDevice}>
-        <div className={`card-box ${styles.titleContent}`}>
+        <div className={styles.titleContent}>
           <img className={styles.img} src={deviceIcon} />
           <div>
-            <div className={styles.num}>{allData?.total}</div>
+            <div className="value-number">{allData?.total}</div>
             <div className={styles.text}>设备总数（个）</div>
           </div>
         </div>
@@ -346,10 +346,10 @@ const SparePart = ({ projectId }) => {
     <Spin spinning={loading}>
       <div className="content-tab">
         <Space direction="vertical" size={16} className={styles.sparePart}>
-          <div className={`card-box ${styles.titleContent}`}>
+          <div className={styles.titleContent}>
             <img className={styles.img} src={spareIcon} />
             <div>
-              <div className={styles.num}>{data?.on_amount || 0}</div>
+              <div className="value-number">{data?.on_amount || 0}</div>
               <div className={styles.text}>在库数量（个）</div>
             </div>
             <div

src/pages/DeviceManager/index.less

@@ -108,10 +108,13 @@
     }
     .ant-collapse-item {
       margin-bottom: 0.16rem;
-      border-radius: 0.08rem;
-      box-shadow: 0rem 0rem 0.08rem 0.02rem rgba(191, 191, 191, 0.2);
-      border: 0.01rem solid #eee;
-      background: rgb(255, 255, 255);
+      // border-radius: 0.08rem;
+      // box-shadow: 0rem 0rem 0.08rem 0.02rem rgba(191, 191, 191, 0.2);
+      // border: 0.01rem solid #eee;
+      // background: rgb(255, 255, 255);
+      border-radius: 0.4rem 0 0.4rem 0 !important;
+      background: #ffffff;
+      box-shadow: 0.01rem 0.06rem 0.1rem 0rem rgba(0, 0, 0, 0.1);
     }
     .ant-collapse
       > .ant-collapse-item

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;

src/pages/SafetyManagement/index.js

@@ -8,7 +8,7 @@ import {
 } from '@/services/safety';
 import { UnityAction } from '@/utils/utils';
 import { useNavigate, useParams, useRequest } from '@umijs/max';
-import { Button, Space, Spin } from 'antd';
+import { Button, Spin } from 'antd';
 import { useEffect, useState } from 'react';
 import styles from './index.less';
 const doorIcon = require('@/assets/deviceManager/doorIcon.png');
@@ -119,12 +119,12 @@ const Video = ({ data, dataOnline, loading }) => {
   return (
     <Spin spinning={loading}>
       <div className="content-tab">
-        <Space direction="vertical" size={16} className={styles.sparePart}>
-          <div className={`card-box ${styles.titleContent}`}>
+        <div className={styles.sparePart}>
+          <div className={styles.titleContent}>
             <div className={styles.titleLeft}>
               <img className={styles.img} src={videoIcon} />
               <div className={styles.textCon}>
-                <div className={styles.num}>{dataOnline?.total || 0}</div>
+                <div className="value-number">{dataOnline?.total || 0}</div>
                 <div className={styles.text}>在库数量（个）</div>
               </div>
             </div>
@@ -143,13 +143,17 @@ const Video = ({ data, dataOnline, loading }) => {
               </div>
             </div>
           </div>
-
-          {data?.map((item, idx) => (
-            <div key={`video_${idx}`} className="card-box">
-              {renderRed(item)}
-            </div>
-          ))}
-        </Space>
+          <div className={styles.listContent}>
+            {data?.map((item, idx) => (
+              <div
+                key={`video_${idx}`}
+                className={`card-box ${styles.listItem}`}
+              >
+                {renderRed(item)}
+              </div>
+            ))}
+          </div>
+        </div>
       </div>
     </Spin>
   );
@@ -175,13 +179,13 @@ const Door = ({ data, dataOver, loading, projectId }) => {
   return (
     <Spin spinning={loading}>
       <div className="content-tab">
-        <Space direction="vertical" size={16} className={styles.doorPart}>
+        <div className={styles.doorPart}>
           <div className={styles.titleContent}>
-            <div className={`card-box ${styles.cardLeft}`}>
+            <div className={styles.cardLeft}>
               <div className={styles.up}>
                 <img className={styles.img} src={doorIcon} />
                 <div className={styles.textCon}>
-                  <div className={styles.num}>{dataOver?.total}</div>
+                  <div className="value-number">{dataOver?.total}</div>
                   <div className={styles.text}>门禁数量（个）</div>
                 </div>
               </div>
@@ -196,7 +200,7 @@ const Door = ({ data, dataOver, loading, projectId }) => {
                 </div>
               </div>
             </div>
-            <div className={`card-box ${styles.cardRight}`}>
+            <div className={styles.cardRight}>
               <div className={styles.textContent}>
                 <div className={styles.in} />
                 <span className={styles.text}>
@@ -214,12 +218,17 @@ const Door = ({ data, dataOver, loading, projectId }) => {
               </Button>
             </div>
           </div>
-          {data?.map((item, idx) => (
-            <div key={`door_${idx}`} className="card-box">
-              {renderRed(item)}
-            </div>
-          ))}
-        </Space>
+          <div className={styles.listContent}>
+            {data?.map((item, idx) => (
+              <div
+                key={`door_${idx}`}
+                className={`card-box ${styles.listItem}`}
+              >
+                {renderRed(item)}
+              </div>
+            ))}
+          </div>
+        </div>
       </div>
     </Spin>
   );

src/pages/SafetyManagement/index.less

@@ -9,16 +9,15 @@
 }
 .num {
   font-size: 0.8rem;
-  font-weight: bold;
-  font-family: DINAlternate-Bold, DINAlternate;
-  line-height: 0.94rem;
-  margin-bottom: 0.16rem;
-  color: #4a90e2;
+  font-family: PangMenZhengDao-3, PangMenZhengDao-3;
+  font-weight: 400;
+  color: #3b3b3b;
+  line-height: 0.62rem;
+  letter-spacing: 0.06rem;
 }
 .point {
   width: 0.2rem;
   height: 0.2rem;
-  border-radius: 0.1rem;
   margin-right: 0.12rem;
 }
 .onlinePoint {
@@ -34,6 +33,15 @@
   right: 0.2rem;
   top: 0.2rem;
 }
+.listContent {
+  display: flex;
+  flex-wrap: wrap;
+  justify-content: space-between;
+}
+.listItem {
+  width: 48%;
+  margin-bottom: 0.29rem;
+}
 .cardItem {
   display: flex;
   padding: 0.4rem 0.44rem 0.32rem;
@@ -57,9 +65,9 @@
   .titleContent {
     position: relative;
     display: flex;
-    // justify-content: space-between;
+    justify-content: space-around;
     align-items: center;
-    padding: 0.48rem 0 0.28rem 1.04rem;
+    padding: 0.48rem 1.8rem 0.28rem 0;
     .titleLeft {
       display: flex;
       margin-right: 0.96rem;
@@ -79,6 +87,10 @@
   .titleContent {
     display: flex;
     justify-content: space-between;
+    font-family: Source Han Sans, Source Han Sans;
+    font-weight: 500;
+    color: #615d5d;
+    font-size: 0.32rem;
     .cardLeft {
       width: 49%;
       .up {