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

TEAMModelBI/ClientApp/src/view/participation/copy.vue

@@ -173,16 +173,18 @@ function clickschool (val, state) {
 }
 //确认拷贝
 function confirmClick () {
-  console.log(targetData.value, props, '查看准备拷贝的目标')
+  console.log(targetData.value, '查看准备拷贝的目标')
   for (let items of targetData.value) {
-    if (items.modelValue) { ElMessage.error('请选择试卷拷贝学校信息'); return }
+    if (!items.modelValue) { ElMessage.error('请选择试卷拷贝学校信息'); return }
   }
   let subjectText = ''
   let result = targetData.value[2].listdata.find((item) => { return item.id === targetData.value[2].modelValue })
-  // targetData.value[3].modelValue.forEach((value) => { value = String(value) })
-  // for (let item of targetData.value[3].modelValue) {
-  //   item = item.toString()
-  // }
+  targetData.value[3].modelValue.forEach((value) => { value = String(value) })
+  let tostringModel = []
+  for (let item of targetData.value[3].modelValue) {
+    // item = item.toString()
+    tostringModel.push(item.toString())
+  }
   subjectText = result.name
   let data = {
     'papers':
@@ -190,7 +192,7 @@ function confirmClick () {
         { "oldId": props.paperdata.id, "oldSc": props.paperdata.schoolcode }
       ],
     newSc: [
-      { "newSc": targetData.value[0].modelValue[1], "newPrdId": targetData.value[1].modelValue, "newSubId": targetData.value[2].modelValue, "newSubName": subjectText, "newGrId": [targetData.value[3].modelValue.toString()] }
+      { "newSc": targetData.value[0].modelValue[1], "newPrdId": targetData.value[1].modelValue, "newSubId": targetData.value[2].modelValue, "newSubName": subjectText, "newGrId": tostringModel }
     ]
   }
   console.log(data, '提交的数据')

TEAMModelOS.SDK/Models/Cosmos/School/ExamInfo.cs

@@ -121,6 +121,7 @@ namespace TEAMModelOS.SDK.Models
         public int? publish { get; set; } = 0;
         //评分状态，0未评分，1已评分
         public int sStatus { get; set; } = 0;
+        public int isCompletion { get; set; }
         //容器名称 container name
         //public string cn { get; set; }
 

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -2581,6 +2581,7 @@ const LANG_EN_US = {
             perviewLabel: 'Exam Files Preview',
             importLabel: 'Import Instruction',
             answerPreview: 'Answering Preview',
+            completeScore: 'Auto-grading cloze questions',
             errTips1: 'Cannot be empty!',
             errTips2: 'Please select type！',
             errTips3: 'Please select type！',

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -2581,6 +2581,7 @@ const LANG_ZH_CN = {
             perviewLabel: '试卷预览',
             importLabel: '导入说明',
             answerPreview: '作答预览',
+            completeScore: '填空题自动评分',
             errTips1: '评测名称不能为空',
             errTips2: '测试类型不能为空',
             errTips3: '评量模式不能为空',

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -2583,6 +2583,7 @@ const LANG_ZH_TW = {
             perviewLabel: '試卷預覽',
             importLabel: '匯入說明',
             answerPreview: '作答預覽',
+            completeScore: '填充題自動評分',
             errTips1: '評量名稱不能為空！',
             errTips2: '測試類型不能為空！',
             errTips3: '評量模式不能為空！',

TEAMModelOS/ClientApp/src/view/learnactivity/CreatePrivEva.vue

@@ -66,6 +66,9 @@
                             <FormItem :label="$t('learnActivity.createEv.endTime')" prop="endTime">
                                 <DatePicker :options="dateOpt1" type="datetime" format="yyyy/MM/dd HH:mm" v-model="endTime" split-panels :placeholder="$t('learnActivity.createEv.eTimeHolder')" style="width:100%" @on-change="getDate($event,1)"></DatePicker>
                             </FormItem>
+                            <FormItem>
+                                <Checkbox v-model="evaluationInfo.isCompletion">{{ $t('learnActivity.createEv.completeScore') }}</Checkbox>
+                            </FormItem>
                         </Form>
                     </vuescroll>
                 </div>
@@ -169,7 +172,8 @@ export default {
                 startTime: undefined,
                 endTime: undefined,
                 paperInfo: [],
-                papers: []
+                papers: [],
+                isCompletion: 0
             },
             mode: '',
             selectBefore: [],
@@ -467,7 +471,8 @@ export default {
                 endTime: this.evaluationInfo.endTime,
                 scope: this.evaluationInfo.scope,
                 createDate: Math.round(new Date()),
-                owner: 'teacher' //后面新增字段
+                owner: 'teacher', //后面新增字段
+                isCompletion: this.evaluationInfo.isCompletion ? 1 : 0
             }
 
             this.$api.learnActivity.SaveExamInfo(requestData).then(
@@ -601,7 +606,10 @@ export default {
             let rule = this.evaluationInfo.paperInfo
             if (data) {
                 let paperDto = []
-                let typeArr = ['single', 'multiple', 'judge', 'complete']
+                let typeArr = ['single', 'multiple', 'judge']
+                if(this.evaluationInfo.isCompletion) {
+                    typeArr.push('complete')
+                }
                 for (let i = 0; i < data.length; i++) {
                     if (data[i].blob.indexOf('/exam/') == 0) {
                         paperDto.push(data[i])

TEAMModelOS/ClientApp/src/view/learnactivity/CreateSchoolEva.vue

@@ -83,6 +83,9 @@
                                 </label>
                                 <InputNumber :max="100" :min="1" v-model="evaluationInfo.touch" style="width:100%" :formatter="value => `${value}${$t('schoolBaseInfo.scoreUnit')}`" :parser="value => value.replace($t('schoolBaseInfo.scoreUnit'), '')"></InputNumber>
                             </FormItem>
+                            <FormItem>
+                                <Checkbox v-model="evaluationInfo.isCompletion">{{ $t('learnActivity.createEv.completeScore') }}</Checkbox>
+                            </FormItem>
                         </Form>
                     </vuescroll>
                 </div>
@@ -238,7 +241,8 @@ export default {
                 paperInfo: [],
                 papers: [],
                 income: 0,
-                touch: 0
+                touch: 0,
+                isCompletion: 0
             },
             mode: '',
             befPeriod: {
@@ -672,9 +676,10 @@ export default {
                 createDate: Math.round(new Date()),
                 owner: 'school', //后面新增字段
                 income: this.evaluationInfo.income,
-                touch: this.evaluationInfo.touch
+                touch: this.evaluationInfo.touch,
+                isCompletion: this.evaluationInfo.isCompletion ? 1 : 0
             }
-
+            
             this.$api.learnActivity.SaveExamInfo(requestData).then(
                 res => {
                     if (res.error) {
@@ -789,7 +794,10 @@ export default {
             let rule = this.evaluationInfo.paperInfo
             if (data) {
                 let paperDto = []
-                let typeArr = ['single', 'multiple', 'judge', 'complete']
+                let typeArr = ['single', 'multiple', 'judge']
+                if(this.evaluationInfo.isCompletion) {
+                    typeArr.push('complete')
+                }
                 for (let i = 0; i < data.length; i++) {
                     console.log(data[i])
                     if (data[i].blob.indexOf('/exam/') == 0) {