Merge branch 'develop3.0-tmd' into develop3.0

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

@@ -4,7 +4,7 @@
             <div class="stu-info">
                 <ul>
                     <li>
-                        <p><Icon type="ios-home" size="24" />{{$t("studentWeb.exam.studentScore.examName")}}：<span>--</span></p>
+                        <p><Icon type="ios-home" size="24" />{{$t("studentWeb.exam.studentScore.examName")}}：<span>{{$store.getters.getItemTitle.name}}</span></p>
                     </li>
                     <li>
                         <p><Icon type="ios-paper" size="24" />{{$t("studentWeb.exam.studentScore.examType")}}：<span>--</span></p>
@@ -245,7 +245,7 @@
                         "code": this.$store.state.user.schoolCode,
                         "id": this.examData[0].id,
                         "sId": this.$store.state.userInfo.sub,
-                        "cId": this.$store.state.user.studentProfile.classinfo.id,
+                        "cId": this.stuData.claId[0],
                         "gId": this.$store.state.user.studentProfile.classinfo.gradeId
                     }
                     this.$api.studentWeb.getStudentAnalysis(req).then(res => {
@@ -273,6 +273,16 @@
                     })
                 }
             },
+            formUrl(data) {  //处理学生作答数据blob地址
+                let container = data.code
+                let a = ""
+                if (data.blob.indexOf('https://teammodelstorage') > -1) {
+                    a = data.blob
+                } else {
+                    a = `${this.$GLOBAL.BLOB_URL}/${container}/exam/${data.blob}`
+                }
+                return a
+            },
             async getStudentData(data,score,ans) {
                 let paper = []
                 let item = {
@@ -288,6 +298,7 @@
                     }
                     let papers = await this.$evTools.getStuPaper(code)
                     let answer = await this.getItem(ans)
+
                     paper = await this.formPaper(papers)
                     this.testData = paper
                     let objIndex = 0
@@ -320,8 +331,10 @@
                     let code = {
                         scope: this.stuData.papers[0].scope,
                         code: key[(key.length - 1)],
-                        blob: data
+                        blob: data[0]
                     }
+                    let blob = this.formUrl(code)
+                    code.blob = blob
                     datas = await this.$evTools.getComposeItem(code)
                     return datas
                 } else {

TEAMModelOS/ClientApp/src/view/learnactivity/PaperScore.less

@@ -204,6 +204,7 @@
     position: sticky;
     top: 44px;
     z-index: 9999;
+    overflow: auto;
 }
 .question-index-box{
     line-height: 26px;
@@ -211,6 +212,7 @@
     background: white;
     width: 100%;
     display: flex;
+    margin-top: 10px;
 }
 .base-info-btn {
     margin-left: 5px;