Merge branch 'develop3.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0-tmd

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/QuesNaire.vue

@@ -41,6 +41,11 @@
 			<p style="font-size: 30px;color:#00ad6c;font-weight: 600; margin:20px;">{{ $t('survey.studentWeb.already') }}</p>
 		</div>
 		
+		<div v-if="!alreadyAnswered && surveyInfo.progress === 'finish'" style="text-align: center;padding-top: 15%;">
+			<Icon type="md-stopwatch" color="#00ad6c" size="80"/>
+			<p style="font-size: 30px;color:#00ad6c;font-weight: 600; margin:20px;">{{ $t('survey.studentWeb.overtime') }}</p>
+		</div>
+		
 
 		<!--問卷完成後，在時間結束前仍可修改答案再提交-->
 		<div v-if="surveyInfo.progress !== 'finish' && !alreadyAnswered">

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/survey.js

@@ -87,6 +87,7 @@ export default {
 		description:'描述',
 		content:'内容',
 		submit:'提交问卷',
-		already:'该活动已成功提交作答记录'
+		already:'该活动已成功提交作答记录',
+		overtime:'当前活动已结束'
 	}
 }

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/survey.js

@@ -87,6 +87,7 @@ export default {
 		description: '描述',
 		content: '內容',
 		submit: '提交問卷',
-		already:'該活動已成功提交作答記錄'
+		already:'該活動已成功提交作答記錄',
+		overtime:'當前活動已結束'
 	}
 }