故障提交

web/client/src/sections/homePage/containers/index.js

@@ -58,7 +58,7 @@ function Management(props) {
       dataIndex: 'build_time',
       key: 'build_time',
       align: 'center',
-      defaultSortOrder: 'ascend',
+      defaultSortOrder: 'descend',
       sorter: {
         compare: (a, b) => {
           const one = moment(a.build_time).format('YYYYMMDD')
@@ -93,7 +93,11 @@ function Management(props) {
       render: (dom, record) => {
         const current = new Date()
         return <>
-          {(record.progress == '研发中' && Number(moment(current).format('YYYYMMDD')) > Number(moment(record.build_time).format('YYYYMMDD')))&&moment(record.build_time).format('YYYY-MM-DD')!=='1999-01-01'||(record.progress == '测试中' && Number(moment(current).format('YYYYMMDD')) > Number(moment(record.publish_time).format('YYYYMMDD')))&&moment(record.build_time).format('YYYY-MM-DD')!=='1999-01-01'? <div style={{ color: '#fb3838' }}>已延期</div>:<div style={{ color: '#23d96e' }}>未延期</div>  } 
+          {
+            ((record.progress == '研发中' && Number(moment(current).format('YYYYMMDD')) > Number(moment(record.build_time).format('YYYYMMDD'))) && moment(record.build_time).format('YYYY-MM-DD') !== '1999-01-01')
+              || ((record.progress == '测试中' && Number(moment(current).format('YYYYMMDD')) > Number(moment(record.publish_time).format('YYYYMMDD'))) && moment(record.build_time).format('YYYY-MM-DD') !== '1999-01-01')
+              || ((record.progress == '需求评审中' && Number(moment(current).format('YYYYMMDD')) > Number(moment(record.build_time).format('YYYYMMDD'))) && moment(record.build_time).format('YYYY-MM-DD') !== '1999-01-01') ?
+              <div style={{ color: '#fb3838' }}>已延期</div> : <div style={{ color: '#23d96e' }}>未延期</div>} 
         </>
       },
     },
@@ -264,7 +268,7 @@ function Management(props) {
             <div className={CX("index-main-box-title")}>本周在研项目</div>
             <div className={CX("index-main-box-en")}>/Research project this week</div>
             <Spin spinning={false}>
-              <Table dataSource={projectData} columns={projectCol} size="small" pagination={false} scroll={{ y: height*0.3 }}/>
+              <Table dataSource={projectData} columns={projectCol} size="small" pagination={false} scroll={{ y: '32vh' }}/>
             </Spin>
           </div>
          
@@ -272,15 +276,15 @@ function Management(props) {
             <img className={CX("index-main-box-point")} src={pointImg} />
             <div className={CX("index-main-box-title")}>待研发项目</div>
             <div className={CX("index-main-box-en")}>/Project to be developed</div>
-            <Table dataSource={waitData} columns={waitCol} size="small" pagination={false} scroll={{ y: height*0.3 }}/>
+            <Table dataSource={waitData} columns={waitCol} size="small" pagination={false} scroll={{ y: '32vh' }}/>
           </div>
         </div>
-        <div className={CX("index-main-box")} style={{width:'90%',margin:'0 auto',marginTop:'1rem',height:'42vh'}}>
+        <div className={CX("index-main-box")} style={{width:'90%',margin:'0 auto',marginTop:'2.8rem',height:'42vh'}}>
             <img className={CX("index-main-box-point")} src={pointImg} />
             <div className={CX("index-main-box-title")}>人员情况</div>
             <div className={CX("index-main-box-en")}>/Information on Personnel</div>
             {/* <Scroller containerId={"article-container-query"} height={"80%"}> */}
-            <ProTable options={false} actionRef={ref} dataSource={peopleData} columns={peopleCol} size="small" pagination={false} scroll={{ y: height*0.3 }}
+            <ProTable options={false} actionRef={ref} dataSource={peopleData} columns={peopleCol} size="small" pagination={false} scroll={{ y: '20vh' }}
             request={async () => {
               
               if (name || ajob) {

web/client/src/sections/homePage/containers/index.less

@@ -125,12 +125,15 @@
 justify-content: space-between;
     &-box {
       width: 49%;
-      // min-height: 200px;
+     height: 42vh;
-      // max-height: 800px;
-      // overflow-y: auto;
       box-shadow: 0px 0px 5px 0px rgba(0, 0, 0, 0.5);
       text-align: left;
       padding: 5px;
+       .ant-table-tbody > tr > td{
+
+        background-color: #ffffff !important;
+
+    }      
 .ant-pro-card-body{
   padding: 0px 24px 0 24px !important;
 }