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

src/pages/Center/index.js

@@ -52,7 +52,10 @@ const Center = () => {
             toMyTask(1);
           }}
         >
-          <img src={taskIcon} style={{ marginRight: '0.2rem' }} />
+          <img
+            src={taskIcon}
+            style={{ marginRight: '0.2rem', width: '0.5rem' }}
+          />
           我的任务
         </div>
         <div
@@ -61,7 +64,10 @@ const Center = () => {
             toMyTask(2);
           }}
         >
-          <img src={orderIcon} style={{ marginRight: '0.2rem' }} />
+          <img
+            src={orderIcon}
+            style={{ marginRight: '0.2rem', width: '0.5rem' }}
+          />
           我的工单
         </div>
       </div>

src/pages/Home/ChemCostComparison.js

@@ -229,7 +229,7 @@ const CostComparison = (props) => {
       message.error('获取数据失败');
     });
     setChemList([...list]);
-    setCurrentChem(list[0])
+    setCurrentChem(list[0]);
     typeParams.forEach((item) => {
       item.chemical_agents = list[0];
     });
@@ -263,7 +263,7 @@ const CostComparison = (props) => {
         ></div>
       </PageTitle>
 
-      <div className="card-box" style={{ padding: 20, marginTop: 40 }}>
+      <div className="card-box" style={{ padding: '0.2rem' }}>
         {/* 使用Tabs来展示所有药的标签 */}
         <div className="tabs">
           {chemList?.map((item) => (
@@ -301,7 +301,7 @@ const CostComparison = (props) => {
               display: 'flex',
               flexDirection: 'column',
               justifyContent: 'space-between',
-              padding: "0.4rem 0"
+              padding: '0.4rem 0',
             }}
           >
             <div style={{ height: '3.5rem' }}>

src/pages/Home/EnergyCostComparison.js

@@ -235,7 +235,7 @@ const CostComparison = () => {
         ></div>
       </PageTitle>
 
-      <div className="card-box" style={{ padding: 20, marginTop: 40 }}>
+      <div className="card-box" style={{ padding: '0.2rem' }}>
         <div className={styles.curEnergyCost}>
           <div className={styles.item}>
             <div className={styles.value}>

src/pages/Home/QualityMng.js

@@ -107,8 +107,8 @@ function Quality() {
         水质监测
       </PageTitle>
 
-      <div className="card-box" style={{ padding: 20, marginTop: 10 }}>
-        <div className="tabs" style={{ marginBottom: 20 }}>
+      <div className="card-box" style={{ padding: '0.2rem' }}>
+        <div className="tabs" style={{ marginBottom: '0.2rem' }}>
           {codeList?.map((item) => (
             <div
               onClick={() => {
@@ -125,7 +125,7 @@ function Quality() {
           数据曲线
         </div>
         <Spin spinning={mainRes.loading}>
-          <div style={{ height: 500, marginTop: 20 }}>
+          <div style={{ height: '5rem', marginTop: '0.2rem' }}>
             {mainRes?.data ? (
               <ChartModule {...chartProps} onChange={onChange} />
             ) : (
@@ -133,14 +133,14 @@ function Quality() {
             )}
           </div>
         </Spin>
-        <div style={{ marginTop: 30 }}>
+        <div style={{ marginTop: '0.3rem' }}>
           <div className="section-title">
             <div className="section-line"></div>
             数据列表
           </div>
           <Table
             columns={column}
-            style={{ marginTop: 20 }}
+            style={{ marginTop: '0.2rem' }}
             dataSource={mainRes?.data}
             pagination={false}
           />

src/pages/Home/WaterAmtMng.js

@@ -82,7 +82,7 @@ const WaterAmtMng = () => {
       <PageTitle onReturn={() => UnityAction.sendMsg('menuItem', '首页')}>
         水量监测
       </PageTitle>
-      <div className="card-box" style={{ padding: 20, marginTop: 26 }}>
+      <div className="card-box" style={{ padding: '0.2rem' }}>
         <div className="section-title">
           <div className="section-line"></div>
           数据曲线

src/pages/Home/index.less

@@ -187,6 +187,7 @@
   align-items: flex-end;
 }
 .backlog {
+  margin-right: 6px;
   margin-bottom: 40px;
   padding: 0 20px;
   overflow-y: auto;
@@ -213,12 +214,12 @@
     float: right;
   }
   .titleText {
-    font-size: 22px;
+    font-size: 24px;
     margin: 0 20px;
   }
   .bottomCon {
     margin-left: 24px;
-    font-size: 18px;
+    font-size: 20px;
     line-height: 36px;
     word-wrap: break-word;
   }

src/pages/Projects/index.js

@@ -70,9 +70,9 @@ const Projects = () => {
                     <div className={styles.valueCon}>
                       <span className={styles.value}>
                         {item.WaterIn}
-                        <div className={styles.valueCon}>m3/h</div>
+                        {/* <div className={styles.valueCon}>m3/h</div> */}
                       </span>
-                      <div>进水流量</div>
+                      <div>进水流量(m3/h)</div>
                     </div>
                   </div>
                   <div className={styles.itemCon}>
@@ -80,9 +80,9 @@ const Projects = () => {
                     <div className={styles.valueCon}>
                       <span className={styles.value}>
                         {item.WaterOut}
-                        <div className={styles.valueCon}>m3/h</div>
+                        {/* <div className={styles.valueCon}>m3/h</div> */}
                       </span>
-                      <div>出水流量</div>
+                      <div>出水流量(m3/h)</div>
                     </div>
                   </div>
                 </div>

src/pages/Projects/index.less

@@ -84,10 +84,11 @@
     padding-right: 0.4rem;
     // justify-content: space-between;
     .itemCon {
+      width: 50%;
       display: flex;
-      &:first-child {
-        margin-right: 0.2rem;
-      }
+      // &:first-child {
+      //   margin-right: 0.2rem;
+      // }
     }
   }
   .valueCon {