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

jero-web/src/components/tableCollection/index.vue

@@ -773,7 +773,7 @@
                 console.log('配置')
                 this.columns.push({
                   dataIndex: res.db_field_name,
-                  align: 'center',
+                  align: 'left',
                   ellipsis: true,
                   sorter: res.sort,
                   width: 500
@@ -789,7 +789,7 @@
                 this.columns.push({
                   title: res.db_field_txt,
                   dataIndex: res.db_field_name,
-                  align: 'center',
+                  align: 'left',
                   // ellipsis: true,
                   fixed: res.click5 ? 'left' : '',
                   sorter: res.sort,
@@ -1041,6 +1041,7 @@
   }
 </style>
 <style scoped lang="less">
+  @import'~@assets/less/common.less';
   .box {
     width: 100%;
     height: calc(100% - 100px);

jero-web/src/components/tableCollection/index1.vue

@@ -572,7 +572,7 @@
               if (res.type) {
                 this.columns.push({
                   dataIndex: res.db_field_name,
-                  align: 'center',
+                  align: 'left',
                   ellipsis: true,
                   sorter: res.sort,
                   width: 500
@@ -588,7 +588,7 @@
                 this.columns.push({
                   title: res.db_field_txt,
                   dataIndex: res.db_field_name,
-                  align: 'center',
+                  align: 'left',
                   // ellipsis: true,
                   fixed: res.fixedLeft ? 'left' : '',
                   sorter: res.sort,