Merge branch 'develop' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -1462,6 +1462,20 @@
 										menuName: "manageHomeWork",
 										isShow: true
 									},
+									// 活动报名
+									{
+										icon: "iconfont icon-yishu",
+										name: this.$t("system.menu.activity"),
+										router: "#",
+										tag: "",
+										role: "admin|teacher",
+										permission: "",
+										child: [],
+										menuName: "privActivity",
+										// menuName: 'myCourse',
+										isShow: this.isShowActi || this.isWenJiangArea,
+										to: "privActivity"
+									},
 									{
 										icon: "iconfont icon-vote",
 										name: this.$t("system.menu.prtVote"),
@@ -1482,20 +1496,6 @@
 										menuName: "personalSurvey",
 										isShow: true
 									},
-									// 活动报名
-									{
-										icon: "iconfont icon-yishu",
-										name: this.$t("system.menu.activity"),
-										router: "#",
-										tag: "",
-										role: "admin|teacher",
-										permission: "",
-										child: [],
-										menuName: "privActivity",
-										// menuName: 'myCourse',
-										isShow: this.isShowActi || this.isWenJiangArea,
-										to: "privActivity"
-									},
 									// 自主学习和作业活动暂时隐藏
 									// {
 									//     icon: 'iconfont icon-learning-self',

TEAMModelOS/ClientApp/src/view/areaMgmt/AreaLayout.vue

@@ -401,7 +401,7 @@
 					// 研修平台
 					{
 						icon: "iconfont icon-basic-setting",
-						name: this.$t("system.menu.trainSystem"),
+						name: '培训平台',
 						router: "",
 						tag: "",
 						subName: "trainCenter",
@@ -504,7 +504,7 @@
 					},
 					{
 						icon: "iconfont icon-resource",
-						name: `培训平台`,
+						name: `教师发展`,
 						router: "#",
 						tag: "",
 						role: "",