Browse Source

個人評量一覽 追加統測活動顯示tag

jeff 9 tháng trước cách đây
mục cha
commit
01633a1756

+ 2 - 1
TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -2868,7 +2868,8 @@ const LANG_EN_US = {
             copyContent2: 'Are you sure to modify this assessment?',
             paperExam: 'SelfPace Test (Instant Paper)',
             loadAll: 'All data has been loaded',
-            crossSchool: "Cross-school assessment, you can't view the participants in the current school"
+            crossSchool: "Cross-school assessment, you can't view the participants in the current school",
+            jointExam: 'Event'
         },
 
         //CreateEv

+ 2 - 1
TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -2867,7 +2867,8 @@ const LANG_ZH_CN = {
             copyContent2: '确认修改当前评测吗?',
             paperExam: '纸本测验',
             loadAll: '已加载所有数据',
-            crossSchool: '跨校评测,在当前学校无法查看发布对象'
+            crossSchool: '跨校评测,在当前学校无法查看发布对象',
+            jointExam: '活动评量'
         },
 
         //CreateEv

+ 2 - 1
TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -2870,7 +2870,8 @@ const LANG_ZH_TW = {
             copyContent2: '確認修改當前評量嗎? ',
             paperExam: '紙本測驗',
             loadAll: '已載入所有數據',
-            crossSchool: '跨校評量,在當前學校無法查看發布對象'
+            crossSchool: '跨校評量,在當前學校無法查看發布對象',
+            jointExam: '活動評量'
         },
 
         //建立評量學校/個人

+ 8 - 1
TEAMModelOS/ClientApp/src/view/learnactivity/ExamMgt.vue

@@ -62,6 +62,10 @@
 								<span class="evaluation-status-tag ev-tag-common" :style="{ color: item.scoreColor }">
 									{{ item.scoreText }}
 								</span>
+								<!-- 統測評量 -->
+								<span class="evaluation-status-tag ev-tag-common" :style="{ color: jointExamTagColor }" v-if="item.isJointExam">
+									{{ $t("learnActivity.mgtScEv.jointExam") }}
+								</span>
 								<Icon class="exam-target" size="20" type="ios-people" @click="getExamTarget(item)" />
 							</div>
 							<!-- 立即结束 和评测状态 按钮-->
@@ -234,7 +238,8 @@
 					source: "",
 					name: ""
 				},
-				semesterRange: null
+				semesterRange: null,
+                jointExamTagColor: '#2db7f5'
 			};
 		},
 		computed: {
@@ -560,6 +565,7 @@
 									item.scoreText = statusInfo.scoreText;
 									item.scoreColor = statusInfo.scoreColor;
 									item.curSchool = !(item.scope === "school" && item.school != this.$store.state.userInfo.schoolCode);
+									item.isJointExam = (item.jointExamId && typeof item.jointExamId === "string" && item.jointExamId.length > 0) ? true : false;
 								});
 								this.evaListShow.push(...res.examInfo);
 								if (isFresh && res.examInfo.length) {
@@ -698,6 +704,7 @@
 									resData.scoreText = statusInfo.scoreText;
 									resData.scoreColor = statusInfo.scoreColor;
 									resData.curSchool = !(resData.scope === "school" && resData.school != this.$store.state.userInfo.schoolCode);
+                                    resData.isJointExam = (resData.jointExamId && typeof resData.jointExamId === "string" && resData.jointExamId.length > 0) ? true : false;
 									//设置各科题号信息
 									this.setPaperQuInfo(resData.papers);
 								}