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

src/pages/TaskManage/Detail/TaskDetail/TaskDetail.tsx

@@ -15,7 +15,7 @@ import {
 import { getMandateDetail } from '@/services/TaskManage';
 import { useLocation } from '@@/exports';
 import { connect, useRequest } from '@umijs/max';
-import { Button, Col, Divider, Row } from 'antd';
+import { Col, Divider, Row } from 'antd';
 import { useEffect, useState } from 'react';
 import { useNavigate } from 'umi';
 import styles from './taskDetail.less';
@@ -98,21 +98,21 @@ function TaskDetail(props: IPropsType) {
       <div className={`${styles.cardContainer} card-box`}>
         <div className={styles.normalInfo}>
           <Row className={styles.infoRow}>
-            <Col className={styles.fontS18} span={16}>
+            <Col className={styles.fontS24} span={16}>
               时间：{mandateDetail?.CreateTime}
             </Col>
             {/*// @ts-ignore*/}
-            <Col className={styles.fontS18} span={8}>
+            <Col className={styles.fontS24} span={8}>
               {/*//@ts-ignore*/}
               任务类别：{mandateDetail?.MandateClass?.label}
             </Col>
           </Row>
           <Row>
-            <Col className={styles.fontS18} span={16}>
+            <Col className={styles.fontS24} span={16}>
               {/*//@ts-ignore*/}
               任务状态：{mandateDetail?.Status?.label}
             </Col>
-            <Col className={styles.fontS18} span={8}>
+            <Col className={styles.fontS24} span={8}>
               {/*// @ts-ignore*/}
               任务负责人：{mandateDetail?.ResponsiblePeople?.CName}
             </Col>
@@ -120,24 +120,24 @@ function TaskDetail(props: IPropsType) {
         </div>
         <div className={styles.detailInfo}>
           <Row className={styles.infoRow}>
-            <Col className={styles.fontS18} span={4}>
+            <Col className={styles.fontS24} span={4}>
               任务总结
             </Col>
-            <Col className={styles.fontS18}>{mandateDetail?.Summary}</Col>
+            <Col className={styles.fontS24}>{mandateDetail?.Summary}</Col>
           </Row>
           <Row>
-            <Col className={styles.fontS18} span={4}>
+            <Col className={styles.fontS24} span={4}>
               任务内容
             </Col>
-            <Col className={styles.fontS18} span={20}>
-              <Col>{mandateDetail?.Detail}</Col>
+            <Col className={styles.fontS24} span={20}>
+              {mandateDetail?.Detail}
               {/*<Table />*/}
             </Col>
           </Row>
         </div>
         <div className={styles.relatedOrder}>
           <div
-            className={styles.fontS22}
+            className={styles.fontS28}
             style={{ marginLeft: '15px', marginBottom: '15px' }}
           >
             关联工单
@@ -147,41 +147,37 @@ function TaskDetail(props: IPropsType) {
               <div key={order.Id} className={styles.workOrderCard}>
                 <div className={styles.leftInfo}>
                   <Row className={styles.infoRow}>
-                    <Col className={styles.fontS18} span={12}>
+                    <Col className={styles.fontS24} span={12}>
                       工单编号：{order.Id}
                     </Col>
-                    <Col className={styles.fontS18} span={12}>
+                    <Col className={styles.fontS24} span={12}>
                       时间：{order.CreateTime}
                     </Col>
                   </Row>
                   <Row>
-                    <Col className={styles.fontS18} span={12}>
+                    <Col className={styles.fontS24} span={12}>
                       工单状态：
                       <span style={{ color: '#5697e4' }}>
                         {/*// @ts-ignore*/}
                         {order.Status?.label}
                       </span>
                     </Col>
-                    <Col className={styles.fontS18} span={12}>
+                    <Col className={styles.fontS24} span={12}>
                       {/*// @ts-ignore*/}
                       工单负责人：{order.Responsible?.CName}
                     </Col>
                   </Row>
                 </div>
                 <Divider type="vertical" style={{ height: '40px' }} />
-                <div className={styles.rightButton}>
-                  <Button
-                    className={styles.fontS18}
-                    style={{ color: '#5697e4' }}
-                    type="text"
-                    size="large"
-                    onClick={() => {
-                      // @ts-ignore
-                      goTaskOrder(order.Id, order.RecordType?.value);
-                    }}
-                  >
-                    查看工单
-                  </Button>
+                <div
+                  className={styles.rightButton}
+                  style={{ color: '#5697e4' }}
+                  onClick={() => {
+                    // @ts-ignore
+                    goTaskOrder(order.Id, order.RecordType?.value);
+                  }}
+                >
+                  查看工单
                 </div>
               </div>
             );

src/pages/TaskManage/Detail/TaskDetail/taskDetail.less

@@ -37,6 +37,7 @@
     .rightButton {
       flex: auto;
       color: #5697e4;
+      font-size: 24px;
       text-align: center;
       display: flex;
       justify-content: center;
@@ -45,6 +46,10 @@
   }
 }
 
+.fontS28 {
+  font-size: 28px;
+}
+
 .fontS24 {
   font-size: 24px;
 }

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

@@ -17,16 +17,7 @@ import { connect, useLocation } from '@umijs/max';
 import TopFilter from '@/pages/TaskManage/components/TopFilter';
 import { IMandateType } from '@/pages/TaskManage/index.types';
 import { useNavigate } from '@@/exports';
-import {
-  Button,
-  Col,
-  Collapse,
-  CollapseProps,
-  Divider,
-  List,
-  Row,
-  Spin,
-} from 'antd';
+import { Col, Collapse, CollapseProps, Divider, List, Row, Spin } from 'antd';
 import React, { useEffect, useState } from 'react';
 import styles from './taskList.less';
 
@@ -178,38 +169,34 @@ const TaskList: React.FC<IPropsType> = (props) => {
             <div key={order.Id} className={styles.workOrderCard}>
               <div className={styles.leftInfo}>
                 <Row style={{ marginBottom: '15px' }}>
-                  <Col className={styles.fontS18} span={12}>
+                  <Col className={styles.fontS24} span={12}>
                     工单编号：{order.Id}
                   </Col>
-                  <Col className={styles.fontS18} span={12}>
+                  <Col className={styles.fontS24} span={12}>
                     时间：{order.CreateTime}
                   </Col>
                 </Row>
                 <Row>
-                  <Col className={styles.fontS18} span={12}>
+                  <Col className={styles.fontS24} span={12}>
                     工单状态：
                     <span style={{ color: '#5697e4' }}>
                       {order.Status?.label}
                     </span>
                   </Col>
-                  <Col className={styles.fontS18} span={12}>
+                  <Col className={styles.fontS24} span={12}>
                     工单负责人：{order.Responsible?.CName}
                   </Col>
                 </Row>
               </div>
               <Divider type="vertical" style={{ height: '40px' }} />
-              <div className={styles.rightButton}>
-                <Button
-                  size='large'
-                  className={styles.fontS18}
-                  style={{ color: '#5697e4' }}
-                  type="text"
-                  onClick={() => {
-                    goTaskOrder(order.Id, order.RecordType?.value);
-                  }}
-                >
-                  查看工单
-                </Button>
+              <div
+                className={styles.rightButton}
+                style={{ color: '#5697e4' }}
+                onClick={() => {
+                  goTaskOrder(order.Id, order.RecordType?.value);
+                }}
+              >
+                查看工单
               </div>
             </div>
           );
@@ -221,11 +208,11 @@ const TaskList: React.FC<IPropsType> = (props) => {
       <List.Item>
         <div className={`${styles.cardContainer} card-box`}>
           <Row justify="space-between" style={{ marginBottom: '20px' }}>
-            <Col className={styles.fontS18}>时间：{formatItem.CreateTime}</Col>
-            <Col className={styles.fontS18}>
+            <Col className={styles.fontS24}>时间：{formatItem.CreateTime}</Col>
+            <Col className={styles.fontS24}>
               任务类别：{formatItem.MandateClass?.label}
             </Col>
-            <Col className={styles.fontS18}>
+            <Col className={styles.fontS24}>
               任务负责人：{formatItem.ResponsiblePeople?.CName || '-'}
             </Col>
           </Row>
@@ -233,26 +220,26 @@ const TaskList: React.FC<IPropsType> = (props) => {
             justify="space-between"
             style={{ paddingBottom: '10px', borderBottom: '1px solid gray' }}
           >
-            <Col className={styles.fontS18}>
+            <Col className={styles.fontS24}>
               任务状态：{formatItem.Status?.label || '-'}
             </Col>
             <Col>
               <div
+                className={styles.fontS24}
                 style={{
                   backgroundColor: '#f5a623',
+                  color: 'white',
+                  width: '150px',
+                  height: '50px',
+                  display: 'flex',
+                  justifyContent: 'center',
+                  alignItems: 'center',
+                }}
+                onClick={() => {
+                  goTaskDetail(item);
                 }}
               >
-                <Button
-                  className={styles.fontS18}
-                  style={{ color: 'white' }}
-                  type="text"
-                  size="large"
-                  onClick={() => {
-                    goTaskDetail(item);
-                  }}
-                >
-                  任务详情
-                </Button>
+                任务详情
               </div>
             </Col>
           </Row>

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

@@ -6,7 +6,7 @@
   .collapseLabel {
     width: 100%;
     .ant-collapse-arrow{
-      font-size: 18px;
+      font-size: 24px;
     }
     :global {
       .ant-collapse-item{
@@ -19,12 +19,12 @@
         margin-top: 10px;
 
         .ant-collapse-header-text {
-          font-size: 18px;
+          font-size: 24px;
           flex: unset;
           margin-inline-end: unset;
         }
         .ant-collapse-arrow{
-          font-size: 18px;
+          font-size: 24px;
         }
       }
     }
@@ -44,6 +44,7 @@
       .rightButton {
         flex: auto;
         color: #5697e4;
+        font-size: 24px;
         text-align: center;
         display: flex;
         justify-content: center;
@@ -53,6 +54,18 @@
   }
 }
 
+.fontS28{
+  font-size: 28px;
+}
+
+.fontS26{
+  font-size: 26px;
+}
+
+.fontS24{
+  font-size: 24px;
+}
+
 .fontS20{
   font-size: 20px;
 }

src/pages/TaskManage/Detail/TaskOrder/TaskOrder.tsx

@@ -132,41 +132,41 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
           />
           <div style={{ padding: '15px' }}>
             <Row className={styles.rowMargin}>
-              <Col className={styles.fontS18} span={16}>
+              <Col className={styles.fontS24} span={16}>
                 时间：{'-'}
               </Col>
-              <Col className={styles.fontS18} span={8}>
+              <Col className={styles.fontS24} span={8}>
                 {/*// @ts-ignore*/}
                 工单负责人：{orderInfo?.Repairman?.CName || '-'}
               </Col>
             </Row>
             <Row className={styles.rowMargin}>
-              <Col className={styles.fontS18} span={16}>
+              <Col className={styles.fontS24} span={16}>
                 {/*// @ts-ignore*/}
                 工单状态：{orderInfo?.OrderStatus?.label}
               </Col>
-              <Col className={styles.fontS18} span={8}>
+              <Col className={styles.fontS24} span={8}>
                 派单人员：{'-'}
               </Col>
             </Row>
             <Row className={styles.rowMargin}>
-              <Col className={styles.fontS18}>
+              <Col className={styles.fontS24}>
                 派单时间：{orderInfo?.CreateTime || '-'}
               </Col>
             </Row>
             <Row className={styles.rowMargin}>
-              <Col className={styles.fontS18}>
+              <Col className={styles.fontS24}>
                 计划完成时间：{orderInfo?.PlanTime || '-'}
               </Col>
             </Row>
             <Row className={styles.rowMargin}>
-              <Col className={styles.fontS18}>
+              <Col className={styles.fontS24}>
                 实际完成时间：{orderInfo?.RepairTime || '-'}
               </Col>
             </Row>
             <Row>
-              <Col className={styles.fontS18}>工单详情：</Col>
-              <Col className={styles.fontS18} span={20}>
+              <Col className={styles.fontS24}>工单详情：</Col>
+              <Col className={styles.fontS24} span={20}>
                 {orderInfo?.Reason}
                 {/*<Table />*/}
               </Col>
@@ -177,10 +177,10 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
         {/*  <SubTitle title="维修内容" />*/}
         {/*  <div style={{ padding: '15px' }}>*/}
         {/*    <Row className={styles.rowMargin}>*/}
-        {/*      <Col className={styles.fontS18}>是否润滑加油：否</Col>*/}
+        {/*      <Col className={styles.fontS24}>是否润滑加油：否</Col>*/}
         {/*    </Row>*/}
         {/*    <Row>*/}
-        {/*      <Col className={styles.fontS18} >是否清洁：否</Col>*/}
+        {/*      <Col className={styles.fontS24} >是否清洁：否</Col>*/}
         {/*    </Row>*/}
         {/*  </div>*/}
         {/*</div>*/}

src/pages/TaskManage/Detail/TaskOrder/taskOrder.less

@@ -14,6 +14,10 @@
   margin-bottom: 15px;
 }
 
+.fontS28 {
+  font-size: 28px;
+}
+
 .fontS24 {
   font-size: 24px;
 }

src/pages/TaskManage/components/SubTitle.tsx

@@ -25,7 +25,7 @@ const SubTitle: React.FC<IPropsType> = ({
         paddingLeft: '20px',
         paddingRight: '10px',
         backgroundColor: '#d9e7f9',
-        fontSize: '20px',
+        fontSize: '26px',
         height: '66px',
         borderRadius: radius ? '8px 8px 0 0 ' : 'unset',
       }}

src/pages/TaskManage/index.less

@@ -15,7 +15,7 @@
 
       .countNumber {
         color: #f5a623;
-        font-size: 24px;
+        font-size: 28px;
         margin-bottom: 6px;
       }
     }
@@ -37,6 +37,18 @@
   width: unset;
 }
 
+.fontS28{
+  font-size: 28px;
+}
+
+.fontS26{
+  font-size: 26px;
+}
+
+.fontS24{
+  font-size: 24px;
+}
+
 .fontS20{
   font-size: 20px;
 }

src/pages/TaskManage/index.tsx

@@ -49,10 +49,10 @@ const TaskManage: React.FC<IPropTypes> = (props) => {
           goTaskList(item.value);
         }}
       >
-        <List.Item.Meta title={<span className={styles.fontS20}>{item.label}</span>} />
+        <List.Item.Meta title={<span className={styles.fontS28}>{item.label}</span>} />
         <div className={styles.itemCount}>
           <div className={styles.countNumber}>{mandateCount[index]}</div>
-          <div className={styles.fontS16}>任务数量</div>
+          <div className={styles.fontS20}>任务数量</div>
         </div>
         <RightOutlined />
       </List.Item>