diff --git a/web/client/src/sections/homePage/containers/index.js b/web/client/src/sections/homePage/containers/index.js index cf56ff4..f8e1b44 100644 --- a/web/client/src/sections/homePage/containers/index.js +++ b/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'?
已延期
:
未延期
} + { + ((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') ? +
已延期
:
未延期
} }, }, @@ -264,7 +268,7 @@ function Management(props) {
本周在研项目
/Research project this week
- +
@@ -272,15 +276,15 @@ function Management(props) {
待研发项目
/Project to be developed
-
+
-
+
人员情况
/Information on Personnel
{/* */} - { if (name || ajob) { diff --git a/web/client/src/sections/homePage/containers/index.less b/web/client/src/sections/homePage/containers/index.less index 2f847bc..0f0d251 100644 --- a/web/client/src/sections/homePage/containers/index.less +++ b/web/client/src/sections/homePage/containers/index.less @@ -125,12 +125,15 @@ justify-content: space-between; &-box { width: 49%; - // min-height: 200px; - // max-height: 800px; - // overflow-y: auto; + height: 42vh; 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; }