Merge branch 'master' into 24年二季度其他

# Conflicts:
#	src/enums/commonEnums.js
#	src/views/projectManagement/modules/PublishRemindModal.vue

src/enums/commonEnums.js

@@ -8,7 +8,8 @@ export const ProjectTypeEnums = {
   STANDARD_MEMBER_PRO: {name: '标协会员项目', value: 5},
   STANDARD_CERTIFICATE_PRO: {name: '标协证书项目', value: 6},
   DRAFT_PRO: {name: '起草组项目', value: 7},
-  PACK_PRO: { name: '打包项目', value: 8 }
+  PACK_PRO: { name: '打包项目', value: 8 },
+  SAFETY_CENTER_PRO: { name: '功能安全中心项目', value: 9 }
 }
 
 // 参会人员身份类型
@@ -73,7 +74,15 @@ export const MeetingTypeEnums = {
   committee: { name: '分标委会议', value: '5' },
   council: { name: '理事会会议', value: '6' },
   draftGroup: { name: '起草会会议', value: '7' },
-  overseas: { name: '海外会议', value: '8' }
+  overseas: { name: '海外会议', value: '8' },
+  safetyCenter: { name: '功能安全中心会议', value: '9' }
+}
+
+// 功能安全中心-项目类型
+export const SafetyCenterProjectTypeEnums = {
+  safetyCenter: { name: '功能安全中心', value: '1' },
+  studyGroup: { name: '研究组', value: '2' },
+  projectGroup: { name: '项目组', value: '3' }
 }
 
 export const OpeTypeEnums = {