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

src/components/PageContent/index.less

@@ -1,6 +1,6 @@
 .page {
   // background: #fff;
-  padding: 0.2rem;
+  padding: 0.2rem 0.5rem;
   min-height: 100vh;
   position: relative;
 

src/components/PageTitle/index.less

@@ -1,4 +1,6 @@
 .titleBox {
+  position: relative;
+  left: -0.2rem;
   display: flex;
   align-items: center;
   padding-bottom: 0.2rem;

src/pages/SmartOps/components/DeviceAnalysis.js

@@ -561,14 +561,26 @@ const PressureGauge = (props) => {
       },
     },
     {
-      title: '仪表最小数',
-      width: '2rem',
+      title: (
+        <>
+          仪表
+          <br />
+          最小数
+        </>
+      ),
+      width: '1.25rem',
       key: 'data_min',
       dataIndex: 'data_min',
     },
     {
-      title: '仪表最大数',
-      width: '2rem',
+      title: (
+        <>
+          仪表
+          <br />
+          最大数
+        </>
+      ),
+      width: '1.25rem',
       key: 'data_max',
       dataIndex: 'data_max',
     },
@@ -666,14 +678,26 @@ const WaterQuality = (props) => {
       },
     },
     {
-      title: '仪表最小数',
-      width: '2rem',
+      title: (
+        <>
+          仪表
+          <br />
+          最小数
+        </>
+      ),
+      width: '1.25rem',
       key: 'data_min',
       dataIndex: 'data_min',
     },
     {
-      title: '仪表最大数',
-      width: '2rem',
+      title: (
+        <>
+          仪表
+          <br />
+          最大数
+        </>
+      ),
+      width: '1.25rem',
       key: 'data_max',
       dataIndex: 'data_max',
     },

src/pages/TaskManage/Detail/TaskList/TaskList.tsx

@@ -225,21 +225,21 @@ const TaskList: React.FC<IPropsType> = (props) => {
             <div key={order.Id} className={styles.workOrderCard}>
               <div className={styles.leftInfo}>
                 <Row style={{ marginBottom: '0.15rem' }}>
-                  <Col className={styles.fontS32} span={11}>
+                  <Col className={styles.fontS30} span={11}>
                     工单类型：{order.RecordType?.label || '-'}
                   </Col>
-                  <Col className={styles.fontS32} span={13}>
+                  <Col className={styles.fontS30} span={13}>
                     时间：{order.CreateTime}
                   </Col>
                 </Row>
                 <Row>
-                  <Col className={styles.fontS32} span={11}>
+                  <Col className={styles.fontS30} span={11}>
                     工单状态：
                     <span style={{ color: '#5697e4' }}>
                       {order.Status?.label}
                     </span>
                   </Col>
-                  <Col className={styles.fontS32} span={13}>
+                  <Col className={styles.fontS30} span={13}>
                     工单负责人：{order.Responsible?.CName}
                   </Col>
                 </Row>
@@ -298,10 +298,10 @@ const TaskList: React.FC<IPropsType> = (props) => {
                 maxHeight: '0.7rem',
               }}
             >
-              <Col span={11} className={styles.fontS32}>
+              <Col span={11} className={styles.fontS30}>
                 时间: {formatItem.CreateTime}
               </Col>
-              <Col className={styles.fontS32}>
+              <Col className={styles.fontS30}>
                 任务类别: {formatItem.MandateClass?.label}
               </Col>
             </Row>
@@ -312,20 +312,20 @@ const TaskList: React.FC<IPropsType> = (props) => {
                 maxHeight: '0.75rem',
               }}
             >
-              <Col span={11} className={styles.fontS32}>
+              <Col span={11} className={styles.fontS30}>
                 任务负责人: {formatItem.ResponsiblePeople?.CName || '-'}
               </Col>
-              <Col span={8} className={styles.fontS32}>
+              <Col span={8} className={styles.fontS30}>
                 任务状态: {formatItem.Status?.label || '-'}
               </Col>
               <Col>
                 <div
-                  className={styles.fontS32}
+                  className={styles.fontS28}
                   style={{
                     backgroundColor: '#f5a623',
                     color: 'white',
-                    width: '1.8rem',
-                    letterSpacing: '0.05rem',
+                    width: '1.7rem',
+                    letterSpacing: '0.025rem',
                     height: '0.55rem',
                     display: 'flex',
                     justifyContent: 'center',

src/pages/TaskManage/Detail/TaskList/taskList.less

@@ -4,8 +4,7 @@
   }
   display: flex;
   flex-grow: 1;
-  margin-left: 0.1rem;
-  margin-right: 0.2rem;
+
   background-color: white;
   background: #ffffff;
   box-shadow: 0rem 0rem 0.2rem 0 rgba(0, 0, 0, 0.15);
@@ -160,6 +159,10 @@
   font-size: 0.32rem;
 }
 
+.fontS30 {
+  font-size: 0.3rem;
+}
+
 .fontS28 {
   font-size: 0.28rem;
 }

src/pages/TaskManage/index.less

@@ -1,5 +1,4 @@
 .container {
-  padding: 0 0.5rem;
   justify-content: center;
 }