Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/common/BaseQuickPaper.vue

@@ -146,7 +146,7 @@
 							</span>
 						</span>
 						<span v-if="item.type !== 'subjective' || item.answerType === 'audio'">{{ $t("evaluation.quickPaper.ans") }}:</span>
-						<Input v-if="item.type !== 'subjective' || item.answerType === 'audio'" v-model="item.answer" :type="(item.type === 'single' || item.type === 'multiple') && answerInputMode === 'number' ? 'number' : 'text'" @mousewheel.native.prevent @compositionend="onCompositionEnd" @on-change="onOrderInputChange(item, index)" @on-keydown="onOrderInputRule($event, item, index)" :placeholder="$t('evaluation.quickPaper.tip6')" style="width: 220px; margin: 0 10px; " />
+						<Input v-if="item.type !== 'subjective' || item.answerType === 'audio'" v-model="item.answer" :type="(item.type === 'single' || item.type === 'multiple') && answerInputMode === 'number' ? 'number' : 'text'" @mousewheel.native.prevent  @on-change="onOrderInputChange(item, index)" @on-keydown="onOrderInputRule($event, item, index)" :placeholder="$t('evaluation.quickPaper.tip6')" style="width: 220px; margin: 0 10px; " />
 						<span style="margin: 0 10px">{{ $t("syllabus.score") }}</span>
 						<InputNumber v-model="item.score" :min="1" :max="100"></InputNumber>
 						<span style="margin-left: 10px; cursor: pointer" @click="doRemoveItem(index)"><Icon type="md-trash" color="#FA8C16" size="18" /></span>
@@ -384,9 +384,6 @@
 					});
 				}
 			},
-			onCompositionEnd(e){
-				console.log(e);
-			},
 			/* 针对多选强制排序 */
 			onOrderInputChange(item, index) {
 				if (item.type === "multiple") {
@@ -441,9 +438,13 @@
 					}
 				}
 			},
+			removeChinese(val){
+				console.error('val',val)
+				this.singleAns = this.singleAns.replaceAll(val.data,'')
+				console.error('val',this.singleAns)
+			},
 			/* 单选答案输入监听规则 */
 			onSingleInput(e) {
-				console.error(e.key);
 				let isNum = !isNaN(Number(e.key)) && (Number(e.key) > 0);
 				// 判断e.key是不是A到K的大写字母
 				let isUpperCase = /^[A-Z]+$/.test(e.key);
@@ -935,7 +936,7 @@
 			display: inline-block;
 			background: #ededed;
 			padding: 8px 15px;
-			width: 75px;
+			width: 78px;
 			margin: 10px 0;
 			text-align: center;
 		}

TEAMModelOS/ClientApp/src/view/evaluation/bank/ExerciseList.vue

@@ -96,7 +96,7 @@
         <div class="action-tool">
           <Checkbox v-model="isAllOpen" @on-change="onHandleToggle">{{ $t('evaluation.exerciseList.showAllAnswer') }}</Checkbox>
         </div>
-        <div class="action-tool">
+        <div class="action-tool" v-if="isSchool">
           <div style="display: flex;align-items: center;">
             <span style="margin-right: 10px;">{{ $t('evaluation.exerciseList.relatePoints') }}:</span>
             <Tag v-for="(item,index) in relatePoints" :key="item" :name="item" closable @on-close="handleClosePoint(index)">{{ item }}</Tag>
@@ -956,6 +956,9 @@ export default {
     hasSchool() {
       return this.$store.state.userInfo.hasSchool;
     },
+    isSchool() {
+				return this.$route.name === "schoolBank";
+			},
     //已选题目的id
     ids() {
       return this.selectedArr.map(i => i.id)

TEAMModelOS/ClientApp/src/view/learnactivity/tabs/AnswerTable.vue

@@ -1289,18 +1289,18 @@
 			calcOverView(data) {
 				//评测进行中计算未作答
 				console.log(data);
-				this.overviewInfo.noAnswer = 0;
-				if (this.examInfo.progress == "going") {
-					data.studentAnswers.forEach((item) => {
-						if (item.length == 0) {
-							this.overviewInfo.noAnswer++;
-						}
-					});
-				}
-				//评测结束计算缺考
-				else {
-					this.overviewInfo.noAnswer = data.status?.filter((item) => item == 1).length || 0;
-				}
+				this.overviewInfo.noAnswer = data.status.filter(i => i === 1).length; // 0515 获取数据方式调整
+				// if (this.examInfo.progress == "going") {
+				// 	data.studentAnswers.forEach((item) => {
+				// 		if (item.length == 0) {
+				// 			this.overviewInfo.noAnswer++;
+				// 		}
+				// 	});
+				// }
+				// //评测结束计算缺考
+				// else {
+				// 	this.overviewInfo.noAnswer = data.status?.filter((item) => item == 1).length || 0;
+				// }
 
 				this.overviewInfo.answered = data.studentAnswers.length - this.overviewInfo.noAnswer;
 				// 计算已评分未评分

TEAMModelOS/ClientApp/src/view/research-center/ResearchMgt.less

@@ -3,6 +3,10 @@
 	// padding: 5px 25px;
 	background-color: #f6f7f7;
 
+	/deep/ .ivu-picker-panel-sidebar{
+		width: 190px !important;
+		margin-left: -190px !important;
+	}
 	.static-box {
 		display: flex;
 		background-color: #ffffff;