some styles

src/pages/Projects/index.js

@@ -45,13 +45,13 @@ const Projects = () => {
   }, []);
   return (
     <div className={styles.main}>
-      <div className={styles.titleCon}>
+      {/* <div className={styles.titleCon}>
         <span className={styles.titleSelect}>请选择项目</span>
         <div className={styles.titleRight}>
           <div className={styles.icon} />
           <span className={styles.titleText}>新水岛无人值守管理平台</span>
         </div>
-      </div>
+      </div> */}
       <div className={styles.swiper}>
         <Swiper {...params} ref={ref}>
           {projectList?.map((item) => (

src/pages/Projects/index.less

@@ -3,39 +3,40 @@
   height: 100vh;
   background: url('@/assets/projects/bg.png') no-repeat center;
   background-size: 100% 100%;
-  .titleCon {
-    margin: 0 1.8rem;
-    padding: 2.64rem 0 0.4rem;
-    display: flex;
-    justify-content: space-between;
-    border-bottom: 0.01rem solid #ffffff;
-    .icon {
-      width: 0.54rem;
-      height: 0.54rem;
-      margin-right: 0.1rem;
-      background: url('@/assets/greentech.png') no-repeat center;
-      background-size: 100% 100%;
-    }
-    .titleSelect {
-      font-size: 0.55rem;
-      font-family: Source Han Sans, Source Han Sans;
-      color: #3b3b3b;
-      font-weight: bold;
-    }
-    .titleRight {
-      display: flex;
-    }
-    .titleText {
-      font-size: 0.4rem;
-      font-family: Source Han Sans, Source Han Sans;
-      font-weight: 600;
-      color: #3b3b3b;
-    }
-  }
+  // .titleCon {
+  //   margin: 0 1.8rem;
+  //   padding: 2.64rem 0 0.4rem;
+  //   display: flex;
+  //   justify-content: space-between;
+  //   border-bottom: 0.01rem solid #ffffff;
+  //   .icon {
+  //     width: 0.54rem;
+  //     height: 0.54rem;
+  //     margin-right: 0.1rem;
+  //     background: url('@/assets/greentech.png') no-repeat center;
+  //     background-size: 100% 100%;
+  //   }
+  //   .titleSelect {
+  //     font-size: 0.55rem;
+  //     font-family: Source Han Sans, Source Han Sans;
+  //     color: #3b3b3b;
+  //     font-weight: bold;
+  //   }
+  //   .titleRight {
+  //     display: flex;
+  //   }
+  //   .titleText {
+  //     font-size: 0.4rem;
+  //     font-family: Source Han Sans, Source Han Sans;
+  //     font-weight: 600;
+  //     color: #3b3b3b;
+  //   }
+  // }
 }
 .swiper {
   position: relative;
-  margin-top: 2rem;
+  top: 30%;
+  // margin-top: 2rem;
   .pic {
     width: 100%;
     height: 2.26rem;

src/pages/TaskManage/Popup/WorkOrderModal.js

@@ -267,156 +267,159 @@ const WorkOrderModal = (props) => {
   }, []);
 
   return (
-    <div className={styles.modalContainer}>
-      <div className={styles.modalTitle}>工单信息</div>
-      <Button
-        className={styles.closeModalBtn}
-        type="text"
-        icon={
-          <CloseCircleFilled
-            style={{ fontSize: '0.32rem', color: 'rgba(155, 151, 151, 1)' }}
-          />
-        }
-        onClick={closePage}
-      />
-      <Divider style={{ margin: '0 0 0.1rem 0' }} />
-      <Spin spinning={loading}>
-        <div>
+    <div className={styles.pages}>
+      <div className={styles.modalContainer}>
+        <div className={styles.modalTitle}>工单信息</div>
+        <Button
+          className={styles.closeModalBtn}
+          type="text"
+          icon={
+            <CloseCircleFilled
+              style={{ fontSize: '0.32rem', color: 'rgba(155, 151, 151, 1)' }}
+            />
+          }
+          onClick={closePage}
+        />
+        <Divider style={{ margin: '0 0 0.1rem 0' }} />
+        <Spin spinning={loading}>
           <div>
-            <SubTitle title="工单信息" radius />
-            <div className={styles.basicalInfo}>
-              <Row style={{ marginTop: '0' }}>
-                <Col span={13} className={styles.fontS32}>
-                  工单类型：
-                  {OrderType.find((item) => item.value === order_type)?.label ||
-                    '-'}
-                </Col>
-                <Col span={8} className={styles.fontS32}>
-                  {/*// @ts-ignore*/}
-                  工单负责人：{orderInfo?.Repairman?.CName || '-'}
-                </Col>
-              </Row>
-              <Row>
-                <Col span={13} className={styles.fontS32}>
-                  工单状态：{orderInfo?.OrderStatus?.label}
-                </Col>
-                <Col span={8} className={styles.fontS32}>
-                  派单人员：{orderInfo?.DispatchMan?.CName}
-                </Col>
-              </Row>
-              <Row>
-                <Col className={styles.fontS32}>
-                  派单时间：{orderInfo?.CreateTime || '-'}
-                </Col>
-              </Row>
-              <Row>
-                <Col span={13} className={styles.fontS32}>
-                  计划完成时间：{orderInfo?.PlanTime || '-'}
-                </Col>
-              </Row>
-              <Row>
-                <Col className={styles.fontS32}>
-                  实际完成时间：{orderInfo?.RepairTime || '-'}
-                </Col>
-              </Row>
-              {orderInfo?.MandateImages?.length > 0 && (
-                <Row>
-                  <Col className={styles.fontS32} span={4}>
-                    任务图片：
-                  </Col>
-                  {renderImg()}
-                </Row>
-              )}
-            </div>
-          </div>
-          {order_type === 3 && (
             <div>
-              <SubTitle title="操作内容" />
-              <div className={styles.additionInfo}>
-                <Row justify={'space-around'} style={{ marginTop: '0' }}>
-                  <Col className={styles.fontS32} span={8}>
-                    是否润滑/加油：{orderInfo?.Lubrication === 1 ? '是' : '否'}
+              <SubTitle title="工单信息" radius />
+              <div className={styles.basicalInfo}>
+                <Row style={{ marginTop: '0' }}>
+                  <Col span={13} className={styles.fontS32}>
+                    工单类型：
+                    {OrderType.find((item) => item.value === order_type)
+                      ?.label || '-'}
                   </Col>
-                  <Col className={styles.fontS32} span={8}>
-                    是否拆检：{orderInfo?.Check === 1 ? '是' : '否'}
-                  </Col>
-                  <Col className={styles.fontS32} span={8}>
-                    是否清洁：{orderInfo?.Clean === 1 ? '是' : '否'}
+                  <Col span={8} className={styles.fontS32}>
+                    {/*// @ts-ignore*/}
+                    工单负责人：{orderInfo?.Repairman?.CName || '-'}
                   </Col>
                 </Row>
-                <Row justify={'space-around'}>
-                  <Col className={styles.fontS32} span={8}>
-                    是否紧固：{orderInfo?.Fasten === 1 ? '是' : '否'}
+                <Row>
+                  <Col span={13} className={styles.fontS32}>
+                    工单状态：{orderInfo?.OrderStatus?.label}
                   </Col>
-                  <Col className={styles.fontS32} span={8}>
-                    是否除锈：{orderInfo?.AntiCorrosive === 1 ? '是' : '否'}
+                  <Col span={8} className={styles.fontS32}>
+                    派单人员：{orderInfo?.DispatchMan?.CName}
                   </Col>
-                  <Col className={styles.fontS32} span={8}>
-                    是否防腐：{orderInfo?.RustRemoval === 1 ? '是' : '否'}
+                </Row>
+                <Row>
+                  <Col className={styles.fontS32}>
+                    派单时间：{orderInfo?.CreateTime || '-'}
+                  </Col>
+                </Row>
+                <Row>
+                  <Col span={13} className={styles.fontS32}>
+                    计划完成时间：{orderInfo?.PlanTime || '-'}
                   </Col>
                 </Row>
-              </div>
-            </div>
-          )}
-          {order_type === 5 && (
-            <div>
-              <SubTitle title="加药详情" />
-              <div
-                style={{
-                  padding: '0.15rem',
-                  background: 'rgba(23, 85, 255, 0.06)',
-                }}
-              >
                 <Row>
-                  <Col className={styles.fontS32}>加药详情：</Col>
-                  <Col className={styles.fontS32} span={18}>
-                    {`药剂名称：${additionalInfo?.name || '-'} 加药量：${
-                      additionalInfo?.dosage || '-'
-                    }升 浓度：${additionalInfo?.concentration || '-'}`}
+                  <Col className={styles.fontS32}>
+                    实际完成时间：{orderInfo?.RepairTime || '-'}
                   </Col>
                 </Row>
+                {orderInfo?.MandateImages?.length > 0 && (
+                  <Row>
+                    <Col className={styles.fontS32} span={4}>
+                      任务图片：
+                    </Col>
+                    {renderImg()}
+                  </Row>
+                )}
               </div>
             </div>
-          )}
-          {stepInfo.length > 0 && (
-            <div>
-              <SubTitle title="工单流程" />
-              <Divider
-                type="horizontal"
-                style={{
-                  height: '0.02rem',
-                  margin: 0,
-                  padding: 0,
-                  color: 'rgba(23, 85, 255, 0.50)',
-                  background: 'rgba(23, 85, 255, 0.50)',
-                }}
-              />
-              <div
-                style={{
-                  padding: '0.15rem 0.2rem',
-                }}
-                className={styles.taskStep}
-              >
-                <Steps
-                  direction="vertical"
-                  progressDot
-                  current={1}
-                  items={stepInfo?.map((item) => {
-                    return {
-                      title: (
-                        <span className={styles.fontS32}>{item.content}</span>
-                      ),
-                      description: (
-                        <span className={styles.fontS28}>{item.time}</span>
-                      ),
-                    };
-                  })}
+            {order_type === 3 && (
+              <div>
+                <SubTitle title="操作内容" />
+                <div className={styles.additionInfo}>
+                  <Row justify={'space-around'} style={{ marginTop: '0' }}>
+                    <Col className={styles.fontS32} span={8}>
+                      是否润滑/加油：
+                      {orderInfo?.Lubrication === 1 ? '是' : '否'}
+                    </Col>
+                    <Col className={styles.fontS32} span={8}>
+                      是否拆检：{orderInfo?.Check === 1 ? '是' : '否'}
+                    </Col>
+                    <Col className={styles.fontS32} span={8}>
+                      是否清洁：{orderInfo?.Clean === 1 ? '是' : '否'}
+                    </Col>
+                  </Row>
+                  <Row justify={'space-around'}>
+                    <Col className={styles.fontS32} span={8}>
+                      是否紧固：{orderInfo?.Fasten === 1 ? '是' : '否'}
+                    </Col>
+                    <Col className={styles.fontS32} span={8}>
+                      是否除锈：{orderInfo?.AntiCorrosive === 1 ? '是' : '否'}
+                    </Col>
+                    <Col className={styles.fontS32} span={8}>
+                      是否防腐：{orderInfo?.RustRemoval === 1 ? '是' : '否'}
+                    </Col>
+                  </Row>
+                </div>
+              </div>
+            )}
+            {order_type === 5 && (
+              <div>
+                <SubTitle title="加药详情" />
+                <div
+                  style={{
+                    padding: '0.15rem',
+                    background: 'rgba(23, 85, 255, 0.06)',
+                  }}
+                >
+                  <Row>
+                    <Col className={styles.fontS32}>加药详情：</Col>
+                    <Col className={styles.fontS32} span={18}>
+                      {`药剂名称：${additionalInfo?.name || '-'} 加药量：${
+                        additionalInfo?.dosage || '-'
+                      }升 浓度：${additionalInfo?.concentration || '-'}`}
+                    </Col>
+                  </Row>
+                </div>
+              </div>
+            )}
+            {stepInfo.length > 0 && (
+              <div>
+                <SubTitle title="工单流程" />
+                <Divider
+                  type="horizontal"
+                  style={{
+                    height: '0.02rem',
+                    margin: 0,
+                    padding: 0,
+                    color: 'rgba(23, 85, 255, 0.50)',
+                    background: 'rgba(23, 85, 255, 0.50)',
+                  }}
                 />
+                <div
+                  style={{
+                    padding: '0.15rem 0.2rem',
+                  }}
+                  className={styles.taskStep}
+                >
+                  <Steps
+                    direction="vertical"
+                    progressDot
+                    current={1}
+                    items={stepInfo?.map((item) => {
+                      return {
+                        title: (
+                          <span className={styles.fontS32}>{item.content}</span>
+                        ),
+                        description: (
+                          <span className={styles.fontS28}>{item.time}</span>
+                        ),
+                      };
+                    })}
+                  />
+                </div>
               </div>
-            </div>
-          )}
-        </div>
-      </Spin>
+            )}
+          </div>
+        </Spin>
+      </div>
     </div>
   );
 };

src/pages/TaskManage/Popup/WorkOrderModal.less

@@ -1,8 +1,13 @@
+.pages {
+  height: 9.5rem;
+}
+
 .modalContainer {
   padding: 0.2rem 0.3rem 0rem 0.3rem;
   background-color: white;
   border-radius: 0.5rem;
-  min-height: 9.5rem;
+  height: 9.4rem;
+  overflow-y: scroll;
 }
 
 .closeModalBtn {

src/pages/TaskManage/Popup/index.js

@@ -117,39 +117,41 @@ const TaskModal = (props) => {
   }, []);
 
   return (
-    <div className={styles.modalContainer}>
-      <Button
-        className={styles.closeModalBtn}
-        type="text"
-        icon={
-          <CloseCircleFilled
-            style={{ fontSize: '0.32rem', color: 'rgba(155, 151, 151, 1)' }}
-          />
-        }
-        onClick={closePage}
-      />
-
-      {mandateIDs && Array.isArray(mandateIDs) ? (
-        <Tabs
-          defaultActiveKey={String(mandateIDs[0])}
-          activeKey={activeKey}
-          items={tabItems}
-          onChange={onTabChange}
+    <div className={styles.pages}>
+      <div className={styles.modalContainer}>
+        <Button
+          className={styles.closeModalBtn}
+          type="text"
+          icon={
+            <CloseCircleFilled
+              style={{ fontSize: '0.32rem', color: 'rgba(155, 151, 151, 1)' }}
+            />
+          }
+          onClick={closePage}
         />
-      ) : (
-        <>
-          {modalTitle}
-          <Divider style={{ margin: '0.1rem 0' }} />
-          <MandateDetail
-            mandateID={mandateIDs}
-            userList={userList}
-            projectID={projectID}
-            ignoreTask={onIgnoreTaskConfirm}
-            dispatchTask={onDispatchTaskConfirm}
-            autoHandleTask={onAutoHandleTaskConfirm}
+
+        {mandateIDs && Array.isArray(mandateIDs) ? (
+          <Tabs
+            defaultActiveKey={String(mandateIDs[0])}
+            activeKey={activeKey}
+            items={tabItems}
+            onChange={onTabChange}
           />
-        </>
-      )}
+        ) : (
+          <>
+            {modalTitle}
+            <Divider style={{ margin: '0.1rem 0' }} />
+            <MandateDetail
+              mandateID={mandateIDs}
+              userList={userList}
+              projectID={projectID}
+              ignoreTask={onIgnoreTaskConfirm}
+              dispatchTask={onDispatchTaskConfirm}
+              autoHandleTask={onAutoHandleTaskConfirm}
+            />
+          </>
+        )}
+      </div>
     </div>
   );
 };

src/pages/TaskManage/Popup/index.less

@@ -1,3 +1,7 @@
+.pages {
+  height: 100vh;
+}
+
 .modalContainer {
   * {
     font-family: Source Han Sans, Source Han Sans;
@@ -5,8 +9,8 @@
   background-color: white;
   border-radius: 0.5rem;
   padding: 0.3rem;
-  min-height: 9.5rem;
-  height: 100vh;
+  height: 9.4rem;
+
   overflow-y: scroll;
   :global {
     .ant-tabs > .ant-tabs-nav,
@@ -45,6 +49,7 @@
   font-size: 0.32rem;
   font-weight: 600;
   padding: 0.28rem 0 0.06rem 0;
+  position: fixed;
 }
 
 .fontS20 {