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

src/components/PageContent/index.js

@@ -35,7 +35,7 @@ export default (props) => {
           <CloseCircleFilled
             onClick={handleClose}
             className={styles.close}
-            style={{ top: tabs ? '0.4rem' : '' }}
+            style={{ top: tabs ? '0.35rem' : '' }}
           />
         )}
 

src/components/PageContent/index.less

@@ -6,7 +6,7 @@
 
   .close {
     position: absolute;
-    top: 0.26rem;
+    top: 0.175rem;
     right: 0.2rem;
     font-size: 0.34rem;
     color: #bcbaba;

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

@@ -110,18 +110,18 @@ function TaskDetail(props) {
               <div key={record.Id} className={styles.workOrderCard}>
                 <div className={styles.leftInfo}>
                   <Row style={{ marginBottom: '0.15rem' }}>
-                    <Col className={styles.fontS32} span={10}>
+                    <Col className={styles.fontS30} span={10}>
                       <>
                         工单类型：
                         {record.RecordType?.label?.replace('工单', '')}
                       </>
                     </Col>
-                    <Col className={styles.fontS32} span={14}>
+                    <Col className={styles.fontS30} span={14}>
                       时间：{record.CreateTime || '-'}
                     </Col>
                   </Row>
                   <Row>
-                    <Col className={styles.fontS32} span={10}>
+                    <Col className={styles.fontS30} span={10}>
                       工单状态：
                       <span style={{ color: '#5697e4' }}>
                         {typeof record.Status === 'number'
@@ -129,7 +129,7 @@ function TaskDetail(props) {
                           : record.Status?.label}
                       </span>
                     </Col>
-                    <Col className={styles.fontS32} span={14}>
+                    <Col className={styles.fontS30} span={14}>
                       工单负责人：
                       {typeof record.Responsible === 'number'
                         ? '-'
@@ -267,21 +267,21 @@ function TaskDetail(props) {
       <div className={`${styles.cardContainer}`}>
         <div className={styles.normalInfo}>
           <Row className={styles.infoRow}>
-            <Col span={14} className={styles.fontS32}>
+            <Col span={14} className={styles.fontS30}>
               时间：{mandateDetail?.CreateTime}
             </Col>
             {/*// @ts-ignore*/}
-            <Col className={styles.fontS32}>
+            <Col className={styles.fontS30}>
               {/*//@ts-ignore*/}
               任务类别：{mandateDetail?.MandateClass?.label}
             </Col>
           </Row>
           <Row>
-            <Col span={14} className={styles.fontS32}>
+            <Col span={14} className={styles.fontS30}>
               {/*//@ts-ignore*/}
               任务状态：{mandateDetail?.Status?.label}
             </Col>
-            <Col className={styles.fontS32}>
+            <Col className={styles.fontS30}>
               {/*// @ts-ignore*/}
               任务负责人：{mandateDetail?.ResponsiblePeople?.CName}
             </Col>
@@ -290,7 +290,7 @@ function TaskDetail(props) {
         <div className={styles.detailInfo}>
           <Row className={styles.infoRow}>
             <Col
-              className={styles.fontS32}
+              className={styles.fontS30}
               span={4}
               style={{ fontWeight: 600 }}
             >
@@ -298,7 +298,7 @@ function TaskDetail(props) {
             </Col>
             <Col
               span={20}
-              className={styles.fontS32}
+              className={styles.fontS30}
               style={{ color: 'rgba(97, 93, 93, 1)' }}
             >
               {mandateDetail?.Summary ||
@@ -308,13 +308,13 @@ function TaskDetail(props) {
           {mandateDetail?.img && (
             <Row className={styles.infoRow}>
               <Col
-                className={styles.fontS32}
+                className={styles.fontS30}
                 span={4}
                 style={{ fontWeight: 600 }}
               >
                 预警图片
               </Col>
-              <Col className={styles.fontS32}>
+              <Col className={styles.fontS30}>
                 <ReactZmage
                   controller={{
                     // 关闭按钮
@@ -339,13 +339,13 @@ function TaskDetail(props) {
           {mandateDetail?.Files.length > 0 && (
             <Row className={styles.infoRow}>
               <Col
-                className={styles.fontS32}
+                className={styles.fontS30}
                 span={4}
                 style={{ fontWeight: 600 }}
               >
                 截图
               </Col>
-              <Col className={styles.fontS32}>
+              <Col className={styles.fontS30}>
                 <ReactZmage
                   controller={{
                     // 关闭按钮
@@ -377,13 +377,13 @@ function TaskDetail(props) {
 
           <Row>
             <Col
-              className={styles.fontS32}
+              className={styles.fontS30}
               span={4}
               style={{ fontWeight: 600 }}
             >
               任务内容
             </Col>
-            <Col className={styles.fontS32} span={20}>
+            <Col className={styles.fontS30} span={20}>
               {/*{mandateDetail?.Detail}*/}
               <Table
                 className={styles.taskTable}

src/pages/Center/MyTask/Detail/taskDetail.less

@@ -26,11 +26,11 @@
     .collapseLabel {
       width: 100%;
 
-      .ant-collapse-arrow {
-        font-size: 0.32rem;
-      }
-
       :global {
+        .ant-collapse-arrow {
+          font-size: 0.3rem;
+        }
+
         .ant-collapse-item {
           margin-bottom: 0;
         }
@@ -55,7 +55,7 @@
           border-bottom: 0.02rem solid #1755ff;
 
           .ant-collapse-header-text {
-            font-size: 0.32rem;
+            font-size: 0.3rem;
             flex: unset;
             margin-inline-end: unset;
           }
@@ -101,7 +101,7 @@
           height: 0.5rem;
           letter-spacing: 0.05rem;
           color: rgba(23, 85, 255, 1);
-          font-size: 0.32rem;
+          font-size: 0.3rem;
           text-align: center;
         }
       }
@@ -194,6 +194,10 @@
   font-size: 0.32rem;
 }
 
+.fontS30 {
+  font-size: 0.3rem;
+}
+
 .fontS28 {
   font-size: 0.28rem;
 }

src/pages/Center/MyTask/List/TaskList.js

@@ -178,21 +178,21 @@ const MyTaskList = (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>
@@ -251,10 +251,10 @@ const MyTaskList = (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>
@@ -265,20 +265,20 @@ const MyTaskList = (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.fontS30}
                   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/Center/MyTask/List/taskList.less

@@ -5,8 +5,6 @@
 
   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);
@@ -18,10 +16,11 @@
   .collapseLabel {
     width: 100%;
 
-    .ant-collapse-arrow {
-      font-size: 0.24rem;
-    }
     :global {
+      .ant-collapse-arrow {
+        font-size: 0.3rem;
+      }
+
       .ant-collapse-item {
         margin-bottom: 0;
       }
@@ -45,12 +44,12 @@
         border-bottom: 0.02rem solid #1755ff;
 
         .ant-collapse-header-text {
-          font-size: 0.32rem;
+          font-size: 0.3rem;
           flex: unset;
           margin-inline-end: unset;
         }
         .ant-collapse-arrow {
-          font-size: 0.32rem;
+          font-size: 0.3rem;
         }
       }
 
@@ -87,9 +86,9 @@
         border-radius: 0.5rem;
         width: 1.5rem;
         height: 0.5rem;
-        letter-spacing: 0.05rem;
+        letter-spacing: 0.02rem;
         color: rgba(23, 85, 255, 1);
-        font-size: 0.32rem;
+        font-size: 0.3rem;
         text-align: center;
       }
     }
@@ -161,6 +160,10 @@
   font-size: 0.32rem;
 }
 
+.fontS30 {
+  font-size: 0.3rem;
+}
+
 .fontS28 {
   font-size: 0.28rem;
 }

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

@@ -145,18 +145,18 @@ function TaskDetail(props: IPropsType) {
               <div key={record.Id} className={styles.workOrderCard}>
                 <div className={styles.leftInfo}>
                   <Row style={{ marginBottom: '0.15rem' }}>
-                    <Col className={styles.fontS32} span={10}>
+                    <Col className={styles.fontS30} span={10}>
                       <>
                         工单类型：
                         {record.RecordType?.label?.replace('工单', '')}
                       </>
                     </Col>
-                    <Col className={styles.fontS32} span={14}>
+                    <Col className={styles.fontS30} span={14}>
                       时间：{record.CreateTime || '-'}
                     </Col>
                   </Row>
                   <Row>
-                    <Col className={styles.fontS32} span={10}>
+                    <Col className={styles.fontS30} span={10}>
                       工单状态：
                       <span style={{ color: '#5697e4' }}>
                         {typeof record.Status === 'number'
@@ -164,7 +164,7 @@ function TaskDetail(props: IPropsType) {
                           : record.Status?.label}
                       </span>
                     </Col>
-                    <Col className={styles.fontS32} span={14}>
+                    <Col className={styles.fontS30} span={14}>
                       工单负责人：
                       {typeof record.Responsible === 'number'
                         ? '-'
@@ -311,21 +311,21 @@ function TaskDetail(props: IPropsType) {
         <div className={`${styles.cardContainer}`}>
           <div className={styles.normalInfo}>
             <Row className={styles.infoRow}>
-              <Col span={14} className={styles.fontS32}>
+              <Col span={14} className={styles.fontS30}>
                 时间：{mandateDetail?.CreateTime}
               </Col>
               {/*// @ts-ignore*/}
-              <Col className={styles.fontS32}>
+              <Col className={styles.fontS30}>
                 {/*//@ts-ignore*/}
                 任务类别：{mandateDetail?.MandateClass?.label}
               </Col>
             </Row>
             <Row>
-              <Col span={14} className={styles.fontS32}>
+              <Col span={14} className={styles.fontS30}>
                 {/*//@ts-ignore*/}
                 任务状态：{mandateDetail?.Status?.label}
               </Col>
-              <Col className={styles.fontS32}>
+              <Col className={styles.fontS30}>
                 {/*// @ts-ignore*/}
                 任务负责人：{mandateDetail?.ResponsiblePeople?.CName}
               </Col>
@@ -334,7 +334,7 @@ function TaskDetail(props: IPropsType) {
           <div className={styles.detailInfo}>
             <Row className={styles.infoRow}>
               <Col
-                className={styles.fontS32}
+                className={styles.fontS30}
                 span={4}
                 style={{ fontWeight: 600 }}
               >
@@ -342,7 +342,7 @@ function TaskDetail(props: IPropsType) {
               </Col>
               <Col
                 span={20}
-                className={styles.fontS32}
+                className={styles.fontS30}
                 style={{ color: 'rgba(97, 93, 93, 1)' }}
               >
                 {mandateDetail?.Summary ||
@@ -352,13 +352,13 @@ function TaskDetail(props: IPropsType) {
             {mandateDetail?.img && (
               <Row className={styles.infoRow}>
                 <Col
-                  className={styles.fontS32}
+                  className={styles.fontS30}
                   span={4}
                   style={{ fontWeight: 600 }}
                 >
                   预警图片
                 </Col>
-                <Col className={styles.fontS32}>
+                <Col className={styles.fontS30}>
                   <ReactZmage
                     controller={{
                       // 关闭按钮
@@ -383,13 +383,13 @@ function TaskDetail(props: IPropsType) {
             {mandateDetail?.Files.length > 0 && (
               <Row className={styles.infoRow}>
                 <Col
-                  className={styles.fontS32}
+                  className={styles.fontS30}
                   span={4}
                   style={{ fontWeight: 600 }}
                 >
                   截图
                 </Col>
-                <Col className={styles.fontS32}>
+                <Col className={styles.fontS30}>
                   <ReactZmage
                     controller={{
                       // 关闭按钮
@@ -421,13 +421,13 @@ function TaskDetail(props: IPropsType) {
 
             <Row>
               <Col
-                className={styles.fontS32}
+                className={styles.fontS30}
                 span={4}
                 style={{ fontWeight: 600 }}
               >
                 任务内容
               </Col>
-              <Col className={styles.fontS32} span={20}>
+              <Col className={styles.fontS30} span={20}>
                 {/*{mandateDetail?.Detail}*/}
                 <Table
                   className={styles.taskTable}

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

@@ -26,11 +26,11 @@
     .collapseLabel {
       width: 100%;
 
-      .ant-collapse-arrow {
-        font-size: 0.32rem;
-      }
-
       :global {
+        .ant-collapse-arrow {
+          font-size: 0.3rem;
+        }
+
         .ant-collapse-item {
           margin-bottom: 0;
         }
@@ -55,13 +55,13 @@
           border-bottom: 0.02rem solid #1755ff;
 
           .ant-collapse-header-text {
-            font-size: 0.32rem;
+            font-size: 0.3rem;
             flex: unset;
             margin-inline-end: unset;
           }
 
           .ant-collapse-arrow {
-            font-size: 0.32rem;
+            font-size: 0.3rem;
           }
         }
 
@@ -101,7 +101,7 @@
           height: 0.5rem;
           letter-spacing: 0.05rem;
           color: rgba(23, 85, 255, 1);
-          font-size: 0.32rem;
+          font-size: 0.3rem;
           text-align: center;
         }
       }
@@ -205,6 +205,10 @@
   font-size: 0.32rem;
 }
 
+.fontS30 {
+  font-size: 0.3rem;
+}
+
 .fontS28 {
   font-size: 0.28rem;
 }

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

@@ -4,7 +4,6 @@
   }
   display: flex;
   flex-grow: 1;
-
   background-color: white;
   background: #ffffff;
   box-shadow: 0rem 0rem 0.2rem 0 rgba(0, 0, 0, 0.15);
@@ -16,10 +15,11 @@
   .collapseLabel {
     width: 100%;
 
-    .ant-collapse-arrow {
-      font-size: 0.32rem;
-    }
     :global {
+      .ant-collapse-arrow {
+        font-size: 0.3rem;
+      }
+
       .ant-collapse-item {
         margin-bottom: 0;
       }
@@ -43,12 +43,12 @@
         border-bottom: 0.02rem solid #1755ff;
 
         .ant-collapse-header-text {
-          font-size: 0.32rem;
+          font-size: 0.3rem;
           flex: unset;
           margin-inline-end: unset;
         }
         .ant-collapse-arrow {
-          font-size: 0.32rem;
+          font-size: 0.3rem;
         }
       }
 
@@ -85,7 +85,7 @@
         border-radius: 0.5rem;
         width: 1.5rem;
         height: 0.5rem;
-        letter-spacing: 0.05rem;
+        letter-spacing: 0.02rem;
         color: rgba(23, 85, 255, 1);
         font-size: 0.32rem;
         text-align: center;