Explorar o código

style: 微调样式

ZhaoJun hai 1 ano
pai
achega
63c444dcbc

+ 42 - 11
src/pages/TaskManage/Detail/TaskOrder/TaskOrder.tsx

@@ -27,6 +27,12 @@ interface IOrderInfo {
   Reason: string;
   Repairman: string | IUserType;
   OrderStatus: string | DefaultOptionType;
+  Lubrication?: number;
+  Fasten?: number;
+  RustRemoval?: number;
+  AntiCorrosive?: number;
+  Clean?: number;
+  Check?: number;
 }
 
 const TaskOrder: React.FC<IPropsType> = (props) => {
@@ -50,6 +56,12 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
         PlanTime: temp.PlanTime,
         RepairTime: '-',
         Reason: temp.Note,
+        Lubrication: temp.Lubrication,
+        Fasten: temp.Fasten,
+        RustRemoval: temp.RustRemoval,
+        AntiCorrosive: temp.Anticorrosive,
+        Clean: temp.Clean,
+        Check: temp.Check,
         Repairman:
           userList.find((item) => item.ID === temp.MaintenancePerson) || '-',
         OrderStatus:
@@ -173,17 +185,36 @@ const TaskOrder: React.FC<IPropsType> = (props) => {
             </Row>
           </div>
         </div>
-        {/*<div>*/}
-        {/*  <SubTitle title="维修内容" />*/}
-        {/*  <div style={{ padding: '15px' }}>*/}
-        {/*    <Row className={styles.rowMargin}>*/}
-        {/*      <Col className={styles.fontS24}>是否润滑加油:否</Col>*/}
-        {/*    </Row>*/}
-        {/*    <Row>*/}
-        {/*      <Col className={styles.fontS24} >是否清洁:否</Col>*/}
-        {/*    </Row>*/}
-        {/*  </div>*/}
-        {/*</div>*/}
+        {order_type === 3 && (
+          <div>
+            <SubTitle title="维修内容" />
+            <div style={{ padding: '15px' }}>
+              <Row className={styles.rowMargin} justify={"space-between"}>
+                <Col className={styles.fontS24}>
+                  是否润滑/加油:{orderInfo?.Lubrication === 1 ? '是' : '否'}
+                </Col>
+                <Col className={styles.fontS24}>
+                  是否拆检:{orderInfo?.Check === 1 ? '是' : '否'}
+                </Col>
+                <Col className={styles.fontS24}>
+                  是否清洁:{orderInfo?.Clean === 1 ? '是' : '否'}
+                </Col>
+              </Row>
+              <Row>
+                <Col className={styles.fontS24}>
+                  是否紧固:{orderInfo?.Fasten === 1 ? '是' : '否'}
+                </Col>
+                <Col className={styles.fontS24}>
+                  是否除锈:{orderInfo?.AntiCorrosive === 1 ? '是' : '否'}
+                </Col>
+                <Col className={styles.fontS24}>
+                  是否防腐:{orderInfo?.RustRemoval === 1 ? '是' : '否'}
+                </Col>
+              </Row>
+            </div>
+          </div>
+        )}
+
         {/*<div>*/}
         {/*  <SubTitle title="工单流程" />*/}
         {/*  <div style={{ padding: '15px' }}>*/}

+ 1 - 1
src/pages/TaskManage/components/TopFilter.tsx

@@ -12,7 +12,7 @@ const TopFilter: React.FC<IProps> = ({ filters, onChange }) => {
   const [values, setValues] = useState<any[]>([]);
 
   return (
-    <Row justify="space-around">
+    <Row justify="space-around" style={{marginTop:'30px'}}>
       {filters.map((item, index) => {
         return (
           <Col

+ 9 - 2
src/pages/TaskManage/index.less

@@ -15,7 +15,8 @@
 
       .countNumber {
         color: #f5a623;
-        font-size: 28px;
+        font-size: 32px;
+        font-weight: 500;
         margin-bottom: 6px;
       }
     }
@@ -26,7 +27,9 @@
 .antdSelect .ant-select-selection-placeholder,
 .ant-select-item-option-content
 {
-  font-size: 20px;
+  font-size: 28px;
+  width: 10rem;
+  text-align: center;
 }
 
 .antdSelect .ant-select-selection-placeholder{
@@ -49,6 +52,10 @@
   font-size: 24px;
 }
 
+.fontS22{
+  font-size: 22px;
+}
+
 .fontS20{
   font-size: 20px;
 }

+ 1 - 1
src/pages/TaskManage/index.tsx

@@ -52,7 +52,7 @@ const TaskManage: React.FC<IPropTypes> = (props) => {
         <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.fontS20}>任务数量</div>
+          <div className={styles.fontS22}>任务数量</div>
         </div>
         <RightOutlined />
       </List.Item>