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
@@ -156,7 +156,7 @@
columns: [
{
title: this.$t('entryName'),
align: 'center',
align: 'left',
width: '17%',
dataIndex: 'projectName',
sorter:true,
@@ -164,17 +164,17 @@
},
{
title: this.$t('ListTitle'),
align: 'center',
align: 'left',
dataIndex: 'title'
},
{
title: this.$t('Version'),
align: 'center',
align: 'left',
dataIndex: 'version'
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 200,
scopedSlots: { customRender: 'operation' }
@@ -362,7 +362,7 @@
color: #000F16;
display: inline-block;
font-weight: 500;
font-size: 16px;
font-size: 14px;
margin-right: 16px;
margin-top: 3px;
text-align: right;