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

src/global.less

@@ -312,12 +312,12 @@ input[type='reset'] {
   font-size: 0.26rem;
 }
 .ant-select-selector {
-  height: 0.4rem;
+  // height: 0.4rem;
   padding: 0.04rem 0.11rem;
 }
 
 .ant-select-single:not(.ant-select-customize-input) .ant-select-selector {
-  height: 0.4rem;
+  // height: 0.4rem;
   padding: 0.04rem 0.11rem;
 }
 .ant-select-single .ant-select-selector {

src/pages/Controller/Device.js

@@ -34,7 +34,7 @@ function Hardware() {
 
     return `${styles.icon} ${statusClassName}`;
   });
-  const onHandleClick = item => {
+  const onHandleClick = (item) => {
     UnityAction.sendMsg('SingleDevLocate', JSON.stringify([item]));
   };
   useEffect(() => {

src/pages/SmartReport/index.less

@@ -31,6 +31,8 @@
   line-height: 0.48rem;
 }
 .photo {
+  margin-left: 0.5rem;
+  margin-top: 0.16rem;
   font-size: 0.27rem;
   font-family: Helvetica;
   color: #615d5d;
@@ -127,6 +129,7 @@
   }
   .longWhiteBox {
     width: 48%;
+    white-space: nowrap;
     padding: 0.02rem;
     height: 1.05rem;
     box-shadow: 0 0.05rem 0.14rem 0 rgba(141, 141, 141, 0.2);

src/pages/SystemDaily/index.js

@@ -51,10 +51,10 @@ const SystemDaily = (props) => {
   return (
     <PageContent closeable={false}>
       <Spin spinning={loading}>
-        <div>
-          <PageTitle children="系统工作日报" returnable />
-          <div className={styles.time}>{dayjs().format('MM月DD日')}</div>
-        </div>
+        {/* <div> */}
+        <PageTitle children="系统工作日报" returnable />
+        <div className={styles.time}>{dayjs().format('MM月DD日')}</div>
+        {/* </div> */}
         <div className={styles.box}>
           <div className={styles.main_in}>
             <div className={styles.titleContent}>日报</div>
@@ -68,22 +68,38 @@ const SystemDaily = (props) => {
               <div className={styles.text}>
                 系统自检次数：
                 {renderItem(self_inspection_task, '条')}
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;正常次数：
-                {renderItem(self_inspection_normal_task, '条')}
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;异常次数：
-                {renderItem(self_inspection_abnormal_task, '条')}
+                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+                <br />
+                <div className={styles.textFlex}>
+                  <div className={styles.textItem}>
+                    正常次数：
+                    {renderItem(self_inspection_normal_task, '条')}
+                  </div>
+                  <div className={styles.textItem}>
+                    异常次数：
+                    {renderItem(self_inspection_abnormal_task, '条')}
+                  </div>
+                </div>
               </div>
-              <div className={styles.text}>
-                推送任务：
-                {renderItem(push_task, '条')}
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 任务完成率：
-                {renderItem(task_percent, '%')}
+              <div className={styles.textTwo}>
+                <div className={styles.textItem}>
+                  推送任务：
+                  {renderItem(push_task, '条')}
+                </div>
+                <div className={styles.textItem}>
+                  任务完成率：
+                  {renderItem(task_percent, '%')}
+                </div>
               </div>
-              <div className={styles.text}>
-                工单数量：
-                {renderItem(work_order_task, '条')}
-                &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;工单完成率：
-                {renderItem(work_percent, '%')}
+              <div className={styles.textTwo}>
+                <div className={styles.textItem}>
+                  工单数量：
+                  {renderItem(work_order_task, '条')}
+                </div>{' '}
+                <div className={styles.textItem}>
+                  工单完成率：
+                  {renderItem(work_percent, '%')}
+                </div>
               </div>
               <div className={styles.text}>
                 工单完成人员第一名：

src/pages/SystemDaily/index.less

@@ -8,10 +8,12 @@
   border-radius: 0.2rem;
 }
 .time {
-  margin-left: 0.6rem;
-  font-size: 0.22rem;
-  line-height: 0.3rem;
-  color: #4a4a4a;
+  margin-left: 0.5rem;
+  margin-top: 0.16rem;
+  font-size: 0.27rem;
+  font-family: Helvetica;
+  color: #615d5d;
+  line-height: 0.28rem;
 }
 .titleContent {
   padding: 0.14rem 0.4rem;
@@ -31,6 +33,10 @@
 }
 .content {
   padding: 0.6rem 0.3rem;
+  font-size: 0.32rem;
+  font-family: Source Han Sans, Source Han Sans;
+  font-weight: 500;
+  color: #9b9797;
   .item {
     display: flex;
     justify-content: space-between;
@@ -38,17 +44,24 @@
   }
   .text {
     padding: 0.3rem 0;
-    font-size: 0.32rem;
-    font-family: Source Han Sans, Source Han Sans;
-    font-weight: 500;
-    color: #9b9797;
     border-bottom: 1px solid #9b9797;
   }
   text:last-child {
     border-bottom: none;
   }
+  .textTwo {
+    .text;
+    display: flex;
+    // justify-content: space-between;
+  }
+  .textFlex {
+    display: flex;
+  }
+  .textItem {
+    width: 50%;
+  }
   .value {
-    font-size: 0.64rem;
+    font-size: 0.6rem;
     font-family: PangMenZhengDao-3, PangMenZhengDao-3;
     font-weight: 400;
     color: #3b3b3b;