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
@@ -235,7 +235,7 @@
// },
{
title: this.$t('StudioEngineer'),
align: 'center',
align: 'left',
width: 180,
sorter:true,
ellipsis: true,
@@ -250,7 +250,7 @@
},
{
title: this.$t('explain'),
align: 'center',
align: 'left',
width: 280,
ellipsis: true,
dataIndex: 'explanation'
@@ -264,7 +264,7 @@
// },
{
title: this.$t('ModelPlatform'),
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
sorter:true,
@@ -272,7 +272,7 @@
},
{
title: this.$t('DigitalPlatform'),
align: 'center',
align: 'left',
width: 180,
ellipsis: true,
sorter:true,
@@ -280,7 +280,7 @@
},
{
title: this.$t('operation'),
align: 'center',
align: 'left',
fixed: 'right',
width: 302,
scopedSlots: { customRender: 'operation' }