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

TEAMModelOS/ClientApp/src/api/questionnaire.js

@@ -30,6 +30,6 @@ export default {
 	},
 	// 查询问卷作答记录
 	GetAnswerdRecord: function(data) {
-	    return post('/common/survey/answered', data)
+	    return post('/common/survey/answered-list', data)
 	},
 }

TEAMModelOS/ClientApp/src/components/questionnaire/BaseJudge.vue

@@ -10,11 +10,11 @@
 				<div v-for="(item,index) in options" :key="index" :ref="'optionBox' + index" class="option-editor-wrap" style="margin-top:10px;display:flex">
 					<span class="fl-center option-order">{{String.fromCharCode(64 + parseInt(index+1))}}</span>
 					<div :ref="'singleOption'+index" :data-index="index" style="text-align:left" class="qn-option-editor" @click="optionClick(item)"></div>
-					<span class="fl-center option-delete" @click="deleteOption(index)">
-						<Icon type="md-close" /></span>
+					<!-- <span class="fl-center option-delete" @click="deleteOption(index)">
+						<Icon type="md-close" /></span> -->
 				</div>
 			</div>
-			<p class="option-add"><span @click="addOption()"> + 添加选项 </span></p>
+			<!-- <p class="option-add"><span @click="addOption()"> + 添加选项 </span></p> -->
 		</div>
 	</div>
 </template>

TEAMModelOS/ClientApp/src/components/student-web/EventBasicInfo.vue

@@ -17,10 +17,10 @@
         <span class="base-info-text">{{paper.length > 1? $t('studentWeb.event.allSubject'):paper[0].subject.name }}</span>
           <!--<span class="base-info-text" v-if="getCurrentLang()=='en'">{{ transSubjecttoEn(this.$store.getters.getItemTitle.eventSubject) }}</span>-->
         </li>
-        <li v-show="this.$store.getters.getItemTitle.eventType == 'vote'">
+        <!--<li>
           <svg-icon icon-class="teacher" class="base-info-icon" />投票类型：
           <span class="base-info-text">{{ this.$store.getters.getItemTitle.times }}</span>
-        </li>
+        </li>-->
         <li>
           <svg-icon icon-class="time" class="base-info-icon" />
           <span>{{ !eventType ?  $t('studentWeb.baseInfo.period') :  $t('studentWeb.baseInfo.postTime') }}</span>

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

@@ -1,15 +1,13 @@
 <template>
 	<div class="quesnaire">
-		<div v-if="WarmMessageisOpen" class="warmMessage">
+		<!-- <div v-if="WarmMessageisOpen" class="warmMessage">
 			<div class="messageCard animate__animated animate__fadeInDown">
-				<!--全部都有作答的提示框-->
 				<div v-if="showMessageNum == 1">
 					<h2>提交成功</h2>
 					<svg-icon icon-class="quesnaireFinished" class="quesnairefinished-icon" />
 
 					<p>提交成功，活動結束前仍可進行修改再次提交</p>
 				</div>
-				<!--有題目沒作答的提示框-->
 				<div v-if="showMessageNum == 2">
 					<h2>有必答題目未回答</h2>
 					<svg-icon icon-class="quesnaireUnfinished" class="quesnairefinished-icon" />
@@ -25,7 +23,6 @@
 			</div>
 		</div>
 		<br />
-		<EventBasicInfo />
 
 		<div v-if="this.$store.getters.getItemTitle.isDone == false">
 			<div v-if="this.$store.getters.getItemTitle.endTime <= '2020.02.10'">
@@ -36,10 +33,12 @@
 				</div>
 				<QuesNaireReport />
 			</div>
-		</div>
-
-		<div v-if="alreadyAnswered">
-			<p style="font-size: 24px;color:#00ad6c;font-weight: bold; margin:20px;">该活动已提交作答记录！无需重复作答！</p>
+		</div> -->
+		<br />
+		<EventBasicInfo />
+		<div v-if="alreadyAnswered" style="text-align: center;padding-top: 15%;">
+			<Icon type="md-checkmark-circle-outline" color="#00ad6c" size="80"/>
+			<p style="font-size: 30px;color:#00ad6c;font-weight: 600; margin:20px;">{{ $t('survey.studentWeb.already') }}</p>
 		</div>
 		
 
@@ -48,10 +47,9 @@
 			<BillBoardandLightBox :activityData="surveyInfo" />
 			<div class="title-rect-group">
 				<div class="title-rect" />
-				<h2 class="title-rect-name">問卷內容</h2>
+				<h2 class="title-rect-name">{{ $t('survey.studentWeb.content') }}</h2>
 			</div>
 			<br />
-			<span class="mustAns"><strong>*為必答問題</strong></span>
 
 			<div v-for="(item, index) in surveyInfo.items" :key="index" class="survey-item">
 				<br />
@@ -75,7 +73,7 @@
 			<br />
 			<button class="uploadBtn" @click="submitMessage()">
 				<svg-icon icon-class="quesnaire" class="uloadBtn-icon" />
-				<span>提交問卷</span>
+				<span>{{ $t('survey.studentWeb.submit') }}</span>
 			</button>
 		</div>
 
@@ -157,6 +155,7 @@
 					switch (res.msgid){
 						case 1:
 							this.$Message.success('提交成功！')
+							this.alreadyAnswered = true
 							break;
 						case 2:
 							this.$Message.error('不在作答时间范围内！')
@@ -226,7 +225,7 @@
 						"code": this.$store.getters.getItemTitle.scode
 					}
 					let isAnswerd = await this.isAnswerd(params)
-					if(isAnswerd){
+					if(!isAnswerd){
 						this.$api.studentWeb.getSurveyInfo(params).then(async res => {
 							if (res) {
 								console.log('获取问卷数据')

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

@@ -239,7 +239,6 @@ export default {
             },
             //投票活动的时间状态 data投票活动信息  time 已投票数据
             timeStatus(data, time) {
-                console.log(data)
                 let date = (new Date()).getTime() //当前时间
                 let status = false //判断当前活动是否继续进行投票
                 let dataTime = ''
@@ -422,7 +421,6 @@ export default {
             //判断投票数量是否有变化
             voteInfo: {
                 handler() {
-                    console.log(this.voteInfo)
                     if (this.voteInfo.name !== undefined) {
                         let arr = []
                         for (let item of this.voteInfo.options) {

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

@@ -73,5 +73,11 @@ export default {
 		noCompleteTip:'请填写完整',
 		confirmTitle:'温馨提示',
 		confirmText:'确认删除该题目？'
+	},
+	studentWeb:{
+		description:'描述',
+		content:'内容',
+		submit:'提交问卷',
+		already:'该活动已成功提交作答记录'
 	}
 }

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

@@ -73,5 +73,11 @@ export default {
 		noCompleteTip: '請填寫完整',
 		confirmTitle: '溫馨提示',
 		confirmText: '確認删除該題目？'
+	},
+	studentWeb: {
+		description: '描述',
+		content: '內容',
+		submit: '提交問卷',
+		already:'該活動已成功提交作答記錄'
 	}
 }

TEAMModelOS/ClientApp/src/view/knowledge-point/index/Index.vue

@@ -300,12 +300,7 @@
 							okText: '确认',
 							cancelText: '取消',
 							onOk: () => {
-								console.log('单个')
-								//this.isLoading = true
 								blockItem.points.push(...addPointIds)
-                                //setTimeout(function () {
-                                //    this.isLoading = false
-                                //}, 400)
 							}
 						})
 					} else {
@@ -321,12 +316,7 @@
 							okText: '确认',
 							cancelText: '取消',
 							onOk: () => {
-								console.log('多个')
-								//this.isLoading = true
 								blockItem.points.push(this.curDragPoint)
-                                //setTimeout(function () {
-                                //    this.isLoading = false
-                                //}, 400)
 							}
 						})
 					}
@@ -514,7 +504,6 @@
 				}
 				this.currentSubjectIndex = index
 				this.currentParams.subjectId = this.subjectList[index].id
-				// this.currentParams.type = this.isShowPoints ? 1 : 0
 				this.activeSubjectIndex = index
 				this.isLoadBlocks = true
 				this.getPointsData()
@@ -529,6 +518,7 @@
 				} else {
 					let that = this
 					let blockPoints = []
+                    that.checkedPointList.length = 0
 					this.activeBlockIndex = index
 					this.currentBlock = item
 					if (item && item.points.length) {

TEAMModelOS/ClientApp/src/view/schoolmgmt/ClassroomSetting/ClassroomSetting.vue

@@ -11,7 +11,7 @@
                         <Icon type="ios-arrow-down" style="margin-left:8px;"></Icon>
                     </span>
                     <DropdownMenu slot="list" v-for="(item,index) in periods" :value="item.id" :key="index">
-                        <DropdownItem :name="item.id">{{ item.name }}5453435</DropdownItem>
+                        <DropdownItem :name="item.id">{{ item.name }}</DropdownItem>
                     </DropdownMenu>
                 </Dropdown>
                 <div v-if="!isSearch" style="float:right;">