Merge remote-tracking branch 'origin/feature_dev_20221129_UI' into fix_2nd_period

# Conflicts:
#	jero-web/src/components/tableCollection/index1.vue
#	jero-web/src/views/businessSupport/collectionOfRegulatoryOpinions/components/initiatingProcess.vue
#	jero-web/src/views/documentManage/collection/index.vue
#	jero-web/src/views/projectManagement/components/ParameterItemCollectionList.vue
#	jero-web/src/views/projectManagement/components/listOfRegulations.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/components/projectStatusAndProgress.vue
#	jero-web/src/views/projectManagement/projectStatusBoard/index.vue
This commit is contained in:
高嵩
2022-12-30 15:53:39 +08:00
129 changed files with 1418 additions and 765 deletions
@@ -99,7 +99,7 @@
columns: [
{
title: this.$t('standard'),
align: 'center',
align: 'left',
dataIndex: 'serialNumber',
scopedSlots: { customRender: 'standard' },
ellipsis: true,
@@ -108,7 +108,7 @@
},
{
title: this.$t('title'),
align: 'center',
align: 'left',
dataIndex: 'title',
ellipsis: true,
width: 180,
@@ -116,7 +116,7 @@
},
{
title: this.$t('ProcessType'),
align: 'center',
align: 'left',
dataIndex: 'flowType',
ellipsis: true,
sorter:true,
@@ -124,7 +124,7 @@
},
{
title: this.$t('areaOfResponsibility'),
align: 'center',
align: 'left',
dataIndex: 'dutyTerritory',
ellipsis: true,
sorter:true,
@@ -132,7 +132,7 @@
},
{
title: this.$t('problemType'),
align: 'center',
align: 'left',
dataIndex: 'problemType',
ellipsis: true,
sorter:true,
@@ -140,7 +140,7 @@
},
{
title: this.$t('Sponsor'),
align: 'center',
align: 'left',
dataIndex: 'initiator',
ellipsis: true,
sorter:true,
@@ -148,7 +148,7 @@
},
{
title: this.$t('personLiable'),
align: 'center',
align: 'left',
dataIndex: 'duty',
ellipsis: true,
sorter:true,
@@ -316,7 +316,7 @@
}
.title-text {
width: 32px;
width: 110px;
color: #000F16;
display: inline-block;
font-weight: 500;
@@ -357,4 +357,12 @@
text-justify: inter-ideograph;
word-break: break-all
}
/deep/.ant-table-thead > tr > th {
font-weight: bolder;
}
/*/deep/.ant-table-tbody > tr > td {*/
/* color: #040B29 ;*/
/*}*/
</style>