Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/ClientApp/src/components/vote/BaseVoteForm.less

@@ -8,6 +8,7 @@
 
 .component-vote-form {
     padding: 20px 20px 50px 20px;
+	font-family: 'NotoSerif', '΢ÈíÕýºÚÌå', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 	
 	.vote-class{
 		display: flex;

TEAMModelOS/ClientApp/src/components/vote/BaseVoteForm.vue

@@ -260,11 +260,12 @@
 								this.voteForm.repeat = []
 							}
 							console.log(this.voteForm)
+							let classSelectScope = this.$refs.classSelectRef.evaluationInfo.scope
 							let params = Object.assign({}, this.defaultParams)
 							let target = []
 							let fileName = this.$tools.guid()
 							let isReset = this.voteForm.isReset.length > 0
-							let isPersonal = this.$route.name === 'personalVote' && this.$refs.classSelectRef.evaluationInfo.scope  === 'private'
+							let isPersonal = this.$route.name === 'personalVote' &&  classSelectScope === 'private'
 							params.code = this.getCurCode
 							params.scope = isPersonal ? 'private' : 'school'
 							params.name = this.voteForm.name
@@ -286,8 +287,13 @@
 							if (this.isEdit && this.editInfo.id && this.editInfo.code) {
 								params.id = this.editInfo.id
 							}
-							params.classes = this.voteForm.classes
-							console.log(params)
+							if(classSelectScope === 'school'){
+								params.classes = this.voteForm.classes
+							}else{
+								params.stuLists = this.voteForm.classes
+							}
+							console.log('提交的投票对象',params)
+							// return
 							/* 保存BLOB以及COSMOS */
 							this.saveorUpdateVote(params).then(res => {
 								this.$Message.success((this.isEdit && this.editInfo.id) ? this.$t('vote.form.editSuc') : this.$t(
@@ -523,9 +529,10 @@
 				// if(!this.classRooms.length){
 				// 	this.classRooms = await this.getClassrooms(this.userInfo.TEAMModelId)
 				// }
-				if(item.classes.length){
-					this.classNameArr = await this.getClassNameByIds(item.classes)
+				if(item.id){
+					this.classNameArr = item.classes.length ? await this.getClassNameByIds(item.classes) : await this.getClassNameByIds(item.stuLists)
 				}
+				console.log(this.classNameArr)
 				this.voteForm = null
 				this.voteOptionsContent = []
 				this.voteOptions = []

TEAMModelOS/ClientApp/src/view/answersheet/index.vue

@@ -375,7 +375,6 @@
 			goBack() {
 				let params = {}
 				let curEditPaper = localStorage.getItem('c_edit_paper')
-				console.log(curEditPaper.paperGrade)
 				// 如果是从新建试卷或者编辑试卷 跳转过来的 则返回过去的时候带上编辑的信息
 				if (this.$route.params.paper && (this.fromRouter === 'newSchoolPaper' || this.fromRouter ===
 						'newPrivatePaper') && curEditPaper) {
@@ -383,7 +382,6 @@
 						paper: JSON.parse(curEditPaper)
 					}
 				}
-				console.log(params.paper.paperGrade)
 				// 如果是从试卷库预览试卷跳转过来的 就返回试卷库
 				if (this.$route.params.paper && (this.fromRouter === 'schoolBank' || this.fromRouter === 'personalBank')) {
 					params = {

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseChild.vue

@@ -13,11 +13,12 @@
 					<div class="child-item-option-text" v-html="option.value"></div>
 				</div>
 			</div>
-			<div class="item-btn-toggle" v-if="isShowScore">
+			<div class="item-btn-toggle">
 				<template>
-					<InputNumber  :min="0" v-model="item.score"
+					<InputNumber  :min="0" v-model="item.score"  v-if="isShowScore"
 						style="display: inline-block ;width: 50px;margin-right: 10px;height: 30px;" @click.stop>
 					</InputNumber>
+					<span v-if="!isShowScore" style="margin-right: 10px;color: #2db7f5;font-weight: bold;">{{ item.score }}</span>
 					<span style="margin-right: 20px;">{{$t('evaluation.paperList.score')}}</span>
 				</template>
 			</div>

TEAMModelOS/ClientApp/src/view/evaluation/index/CreatePaper.vue

@@ -1137,6 +1137,8 @@
 											this.isLoading = false
 										}
 									)
+								}else{
+									console.error(blobFile)
 								}
 							
 								}catch(e) {

TEAMModelOS/ClientApp/src/view/vote/ManageVote.less

@@ -14,6 +14,7 @@
     height: 100%;
     display: flex;
     flex-direction: column;
+	font-family: 'NotoSerif', '微软正黑体', 'Microsoft JhengHei UI', 'Microsoft JhengHei', Sans-serif;
 	
 	.hw-header{
 		height: 50px;

TEAMModelOS/ClientApp/src/view/vote/ManageVote.vue

@@ -177,6 +177,7 @@
 						code: this.tabIndex === 0 ? this.$store.state.userInfo.schoolCode : this.$store.state.userInfo
 							.TEAMModelId,
 						classes: [],
+						stuLists:[],
 						options: [{
 							code: 'A',
 							value: ''