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

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

@@ -2767,8 +2767,10 @@ const LANG_EN_US = {
         layFlat: 'Flat',
         tree: 'Tree',
         chart: 'Chart',
-        imported: 'Imported',
-        pointsNum: 'key concepts',
+        imported1: 'Total',
+        imported2: 'Key concepts',
+        imported3: 'Add and import',
+        imported4: 'Key concepts',
     },
     // 活动模块
     learnActivity: {
@@ -6278,7 +6280,8 @@ const LANG_EN_US = {
         arbAllQu: 'Arbitration questions has been processed.',
         continueArb: 'Continue',
         quitArb: 'Exit',
-        taskErr: 'Failed to search the marking tasks'
+        taskErr: 'Failed to search the marking tasks',
+        message1: "The student's answer was not found"
     },
     // 教师管理
     teachContent: {

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

@@ -2766,7 +2766,9 @@ const LANG_ZH_CN = {
         layFlat: '平铺',
         tree: '树状',
         chart: '图表',
-        imported: '已导入',
+        imported1: '共',
+        imported2: '个知识点',
+        imported3: '新增并导入',
         pointsNum: '个知识点',
     },
     // 活动模块
@@ -6275,7 +6277,8 @@ const LANG_ZH_CN = {
         arbAllQu: '仲裁题目已经处理完成',
         continueArb: '继续仲裁',
         quitArb: '退出仲裁',
-        taskErr: '查询阅卷任务失败'
+        taskErr: '查询阅卷任务失败',
+        message1: '未查到该学生答案',
     },
     // 教师管理
     teachContent: {

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

@@ -2769,8 +2769,10 @@ const LANG_ZH_TW = {
         layFlat: '打平',
         tree: '樹狀',
         chart: '圖表',
-        imported: '已匯入',
-        pointsNum: '個知識點',
+        imported1: '共',
+        imported2: '個知識點',
+        imported3: '新增並匯入',
+        imported4: '個知識點',
     },
     // 活动模块
     learnActivity: {
@@ -6278,7 +6280,8 @@ const LANG_ZH_TW = {
         arbAllQu: '仲裁題目已經處理完成',
         continueArb: '繼續仲裁',
         quitArb: '退出仲裁',
-        taskErr: '查詢閱卷任務失敗'
+        taskErr: '查詢閱卷任務失敗',
+        message1: '未找到該學生答案'
     },
     // 教师管理
     teachContent: {

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

@@ -129,7 +129,8 @@
                             <span>
                                 <Icon type="md-cube" color="#40A8F0" size="16" />
                                 <span style="margin-left: 5px;">{{ $t("knowledge.point") }}</span>
-                                <span v-show="uploadNum">({{ $t('knowledge.imported') }}{{ uploadNum }}{{ $t('knowledge.pointsNum') }})</span>
+                                <span v-show="uploadNum">
+                                    ({{ $t('knowledge.imported1') }}{{ filePointNum }}{{ $t('knowledge.imported2') }}，{{ $t('knowledge.imported3') }}{{ uploadNum }}{{ $t('knowledge.pointsNum') }})</span>
                                 <!-- <Input v-special-char icon="ios-close" v-model="searchPoint" v-show="subTree.length && !updated" :placeholder="$t('knowledge.searchPoint')" autofocus style="width: 300px;margin-left: 20px;" @on-click="onSearchClear" @on-blur="isSearchPoint = false" @on-change="onSearchPointChange" @on-enter="onSearchPointChange" @on-clear="onSearchClear" /> -->
                             </span>
                             <div>
@@ -287,6 +288,7 @@ export default {
             isSearchBlock: false,
             activeBlockIndex: null,
             uploadNum: 0,
+            filePointNum: 0,
         }
     },
     created() {
@@ -414,6 +416,7 @@ export default {
                         this.currentPoint = undefined
                         this.addMode = 0
                         this.uploadNum = 0
+                        this.filePointNum = 0
                         this.schoolParams = {
                             schoolCode: this.originData.id,
                             subjectId: this.subjectList[index].subjectId,
@@ -566,6 +569,7 @@ export default {
                 })
             }
             this.uploadNum = 0
+            this.filePointNum = 0
         },
         doBatchDelete() {},
         // 新增知识点事件
@@ -676,6 +680,7 @@ export default {
                     for (let i = 0; i < data.results.length; i++) {
                         for (const key in data.results[i]) {
                             if(data.results[i][key]) {
+                                this.filePointNum += 1
                                 data.results[i][key] = data.results[i][key].trim()
                                 if(key === 'level1') {
                                     pointTree.push({
@@ -776,6 +781,8 @@ export default {
                         this.$Message.success(this.$t("knowledge.import.sucTip"))
                         this.batchUploadModal = false
                         this.updated = true
+                    } else {
+                        this.filePointNum = 0
                     }
                     this.isParsing = false
                 }

TEAMModelOS/ClientApp/src/view/task/marking/err/ErrPaper.vue

@@ -42,7 +42,7 @@
                 </p>
                 <div>
                     <!-- <img width="300" src="@/assets/image/school_plan.jpg"> -->
-                    <span class="view-origin-paper">
+                    <span class="view-origin-paper" @click="showStuAns(errListShow[handleIndex])">
                         {{$t('task.viewOriginal')}}
                     </span>
                 </div>
@@ -62,6 +62,12 @@
                 <Input v-special-char v-model="advice" maxlength="50" show-word-limit type="textarea" :placeholder="$t('task.suggestHolder')" style="width: 800px" />
             </div>
         </Modal>
+        <Modal v-model="answerStatus" :title="$t('task.stuAnswer')" width="800">
+            <div class="err-info-item" style="margin-top:10px">
+                <span v-if="!stuAnswer.answer.length">未查到该学生答案</span>
+                <span v-else v-html="stuAnswer.answer[errPaperIndex][0]"></span>
+            </div>
+        </Modal>
     </div>
 </template>
 <script>
@@ -82,7 +88,10 @@ export default {
             curBarIndex: 1,
             errStatus: false,
             errList: [],
-            errListShow:[]
+            errListShow:[],
+            stuAnswer: {answer: []},
+            errPaperIndex: -1,
+            answerStatus: false,
         }
     },
     methods: {
@@ -104,7 +113,8 @@ export default {
                                     quNo: eItem.index,
                                     err: eItem.err,
                                     improve: eItem.improve,
-                                    id: sItem.id
+                                    id: sItem.id,
+                                    blob: sItem.blob,
                                 })
                             })
                         })
@@ -162,7 +172,21 @@ export default {
                     return item.improve
                 })
             }
-        }
+        },
+        // 查看原卷
+        async showStuAns(errInfo) {
+            this.errPaperIndex = errInfo.quNo
+            if(this.stuAnswer.stuId != errInfo.stuId) {
+                let sas = this.$store.state.user.schoolProfile.blob_sas //目前只有校本评测安排阅卷任务
+                let blobUrl = JSON.parse(decodeURIComponent(localStorage.school_profile, "utf-8")).blob_uri //目前只有校本评测安排阅卷任务
+                let answer = JSON.parse(await this.$tools.getFile(`${blobUrl}/exam/${errInfo.blob}?${sas}`))
+                this.stuAnswer = {
+                    stuId: errInfo.stuId,
+                    answer
+                }
+            }
+            this.answerStatus = true
+        },
     },
     watch: {
         taskInfo: {