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

src/pages/Center/MyTask/Detail/TaskDetail.js

@@ -199,7 +199,7 @@ function TaskDetail(props) {
         },
       });
       dataSource.push(
-        ...Object.entries(JSON.parse(mandateChild[0].Content)).map((item) => {
+        ...Object.entries(JSON.parse(mandateChild[0].Payload)).map((item) => {
           const [key, value] = item;
           return {
             detail: {

src/pages/MessageCenter/index.less

@@ -45,7 +45,7 @@
 }
 .allRead {
   position: absolute;
-  top: 68px;
+  top: 47.5px;
   line-height: 24px;
   right: 104px;
   font-size: 32px;

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

@@ -216,7 +216,7 @@ function TaskDetail(props: IPropsType) {
         },
       });
       dataSource.push(
-        ...Object.entries(JSON.parse(mandateChild[0].Content)).map(
+        ...Object.entries(JSON.parse(mandateChild[0].Payload)).map(
           (item: any) => {
             const [key, value] = item;
             return {

src/pages/TaskManage/Detail/TaskDetail/taskDetail.types.ts

@@ -8,8 +8,9 @@ export interface IMandateChildTypes {
   ProjectId: number;
   Status: number;
   Title: string;
+  Payload: any;
 }
 
 export interface IColumn {
-  detail: {text: string, key: string};
+  detail: { text: string; key: string };
 }

src/pages/TaskManage/Popup/WorkOrderModal.js

@@ -275,42 +275,42 @@ const WorkOrderModal = (props) => {
           />
           <div className={styles.basicalInfo}>
             <Row>
-              <Col span={16} className={styles.fontS24}>
+              <Col span={16} className={styles.fontS28}>
                 工单类型：
                 {OrderType.find((item) => item.value === order_type)?.label ||
                   '-'}
               </Col>
-              <Col span={8} className={styles.fontS24}>
+              <Col span={8} className={styles.fontS28}>
                 {/*// @ts-ignore*/}
                 工单负责人：{orderInfo?.Repairman?.CName || '-'}
               </Col>
             </Row>
             <Row>
-              <Col span={16} className={styles.fontS24}>
+              <Col span={16} className={styles.fontS28}>
                 工单状态：{orderInfo?.OrderStatus?.label}
               </Col>
-              <Col span={8} className={styles.fontS24}>
+              <Col span={8} className={styles.fontS28}>
                 派单人员：{orderInfo?.DispatchMan?.CName}
               </Col>
             </Row>
             <Row>
-              <Col className={styles.fontS24}>
+              <Col className={styles.fontS28}>
                 派单时间：{orderInfo?.CreateTime || '-'}
               </Col>
             </Row>
             <Row>
-              <Col className={styles.fontS24}>
+              <Col className={styles.fontS28}>
                 计划完成时间：{orderInfo?.PlanTime || '-'}
               </Col>
             </Row>
             <Row>
-              <Col className={styles.fontS24}>
+              <Col className={styles.fontS28}>
                 实际完成时间：{orderInfo?.RepairTime || '-'}
               </Col>
             </Row>
             {orderInfo?.MandateImages?.length > 0 && (
               <Row>
-                <Col className={styles.fontS24} span={4}>
+                <Col className={styles.fontS28} span={4}>
                   任务图片：
                 </Col>
                 {renderImg()}
@@ -323,24 +323,24 @@ const WorkOrderModal = (props) => {
             <SubTitle title="操作内容" titleFontSize={24} />
             <div className={styles.additionInfo}>
               <Row justify={'space-around'}>
-                <Col className={styles.fontS24} span={8}>
+                <Col className={styles.fontS28} span={8}>
                   是否润滑/加油：{orderInfo?.Lubrication === 1 ? '是' : '否'}
                 </Col>
-                <Col className={styles.fontS24} span={8}>
+                <Col className={styles.fontS28} span={8}>
                   是否拆检：{orderInfo?.Check === 1 ? '是' : '否'}
                 </Col>
-                <Col className={styles.fontS24} span={8}>
+                <Col className={styles.fontS28} span={8}>
                   是否清洁：{orderInfo?.Clean === 1 ? '是' : '否'}
                 </Col>
               </Row>
               <Row justify={'space-around'}>
-                <Col className={styles.fontS24} span={8}>
+                <Col className={styles.fontS28} span={8}>
                   是否紧固：{orderInfo?.Fasten === 1 ? '是' : '否'}
                 </Col>
-                <Col className={styles.fontS24} span={8}>
+                <Col className={styles.fontS28} span={8}>
                   是否除锈：{orderInfo?.AntiCorrosive === 1 ? '是' : '否'}
                 </Col>
-                <Col className={styles.fontS24} span={8}>
+                <Col className={styles.fontS28} span={8}>
                   是否防腐：{orderInfo?.RustRemoval === 1 ? '是' : '否'}
                 </Col>
               </Row>
@@ -352,8 +352,8 @@ const WorkOrderModal = (props) => {
             <SubTitle title="加药详情" titleFontSize={24} />
             <div style={{ padding: '15px' }}>
               <Row>
-                <Col className={styles.fontS24}>加药详情：</Col>
-                <Col className={styles.fontS24} span={18}>
+                <Col className={styles.fontS28}>加药详情：</Col>
+                <Col className={styles.fontS28} span={18}>
                   {`药剂名称：${additionalInfo?.name || '-'} 加药量：${
                     additionalInfo?.dosage || '-'
                   }升 浓度：${additionalInfo?.concentration || '-'}`}
@@ -373,7 +373,7 @@ const WorkOrderModal = (props) => {
                 items={stepInfo?.map((item) => {
                   return {
                     title: (
-                      <span className={styles.fontS24}>{item.content}</span>
+                      <span className={styles.fontS28}>{item.content}</span>
                     ),
                     description: (
                       <span className={styles.fontS20}>{item.time}</span>

src/pages/TaskManage/Popup/WorkOrderModal.less

@@ -33,3 +33,14 @@
 .fontS24 {
   font-size: 24px;
 }
+.fontS26 {
+  font-size: 26px;
+}
+
+.fontS28 {
+  font-size: 28px;
+}
+
+.fontS30 {
+  font-size: 30px;
+}

src/pages/TaskManage/Popup/index.js

@@ -87,7 +87,7 @@ const TaskModal = (props) => {
           mandateIDs.map((item, index) => {
             return {
               key: String(item),
-              label: <span className={styles.fontS24}>任务{index + 1}</span>,
+              label: <span className={styles.fontS28}>任务{index + 1}</span>,
               children: (
                 <MandateDetail
                   key={item}

src/pages/TaskManage/Popup/index.less

@@ -13,7 +13,7 @@
 }
 
 .modalTitle {
-  font-size: 28px;
+  font-size: 30px;
   font-weight: 600;
   padding: 10px 0;
 }
@@ -29,3 +29,15 @@
 .fontS24 {
   font-size: 24px;
 }
+
+.fontS26 {
+  font-size: 26px;
+}
+
+.fontS28 {
+  font-size: 28px;
+}
+
+.fontS30 {
+  font-size: 30px;
+}

src/pages/TaskManage/components/MandateDetail.js

@@ -178,7 +178,6 @@ const MandateDetail = (props) => {
     } else {
       params.note = mandateDetail.Summary;
     }
-    debugger;
     const result = await dispatchTask(params);
     if (result) {
       setDispatchModalOpen(false);
@@ -201,10 +200,8 @@ const MandateDetail = (props) => {
     <div>
       <div className={styles.mandate}>
         <Row>
-          <Col className={styles.fontS24} span={4}>
-            任务内容：{' '}
-          </Col>
-          <Col className={styles.fontS24} span={20}>
+          <Col className={styles.fontS28}>任务内容：</Col>
+          <Col className={styles.fontS28} span={21}>
             <Table
               columns={columns}
               dataSource={mandateChild}
@@ -213,21 +210,21 @@ const MandateDetail = (props) => {
           </Col>
         </Row>
         <Row>
-          <Col className={styles.fontS24} span={14}>
+          <Col className={styles.fontS28} span={14}>
             任务时间：{mandateDetail?.CreateTime || '-'}
           </Col>
-          <Col className={styles.fontS24}>
+          <Col className={styles.fontS28}>
             任务类别：{mandateDetail?.MandateClass?.label || '-'}
           </Col>
         </Row>
         <Row>
-          <Col className={styles.fontS24} span={14}>
+          <Col className={styles.fontS28} span={14}>
             任务状态：{' '}
             <span style={{ color: ' #5697e4' }}>
               {mandateDetail?.Status.label}
             </span>
           </Col>
-          <Col className={styles.fontS24}>
+          <Col className={styles.fontS28}>
             任务负责人：{mandateDetail?.ResponsiblePeople?.CName || '-'}
           </Col>
         </Row>
@@ -238,19 +235,19 @@ const MandateDetail = (props) => {
           <div key={item.Id} className={styles.relatedOrder}>
             <div className={styles.leftInfo}>
               <Row>
-                <Col span={12} className={styles.fontS24}>
+                <Col span={12} className={styles.fontS28}>
                   工单类型：{item?.RecordType?.label}
                 </Col>
-                <Col className={styles.fontS24}>时间：{item?.CreateTime}</Col>
+                <Col className={styles.fontS28}>时间：{item?.CreateTime}</Col>
               </Row>
               <Row>
-                <Col span={12} className={styles.fontS24}>
+                <Col span={12} className={styles.fontS28}>
                   工单状态：
                   <span style={{ color: ' #5697e4' }}>
                     {item?.Status?.label}
                   </span>
                 </Col>
-                <Col className={styles.fontS24}>
+                <Col className={styles.fontS28}>
                   工单负责人：{item?.Responsible?.CName}
                 </Col>
               </Row>
@@ -399,7 +396,7 @@ const IgnoreTaskModal = (params) => {
         <Form layout="vertical">
           <Form.Item label="忽略理由:">
             <Select
-              className={styles.fontS24}
+              className={styles.fontS28}
               options={ignoreReason}
               onChange={onReasonChange}
               allowClear
@@ -496,7 +493,7 @@ const MandateSelectModal = (props) => {
 
   return (
     <Modal
-      title={<span className={styles.fontS24}>选择任务</span>}
+      title={<span className={styles.fontS28}>选择任务</span>}
       open={open}
       onCancel={onCancel}
       width={'95%'}
@@ -544,7 +541,7 @@ const DispatchTaskModal = (props) => {
 
   return (
     <Modal
-      title={<span className={styles.fontS24}>派遣任务</span>}
+      title={<span className={styles.fontS28}>派遣任务</span>}
       onCancel={onCancel}
       open={open}
       destroyOnClose

src/pages/TaskManage/components/MandateDetail.less

@@ -25,7 +25,7 @@
   .footerBtn {
     height: 50px;
     width: 125px;
-    font-size: 20px;
+    font-size: 26px;
     border: 0;
     color: #5697e4;
     background-color: #e5effa;
@@ -52,7 +52,7 @@
   .rightButton {
     flex: auto;
     color: #5697e4;
-    font-size: 24px;
+    font-size: 28px;
     text-align: center;
     display: flex;
     justify-content: center;
@@ -80,3 +80,15 @@
 .fontS24 {
   font-size: 24px;
 }
+
+.fontS26 {
+  font-size: 26px;
+}
+
+.fontS28 {
+  font-size: 28px;
+}
+
+.fontS30 {
+  font-size: 30px;
+}