Merge branch 'develop3.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop3.0-tmd

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

@@ -290,12 +290,13 @@
                     subItem: [],
                 }
                 if (data !== undefined) {
-                    let key = this.$store.getters.getItemTitle.code.split('-')
-                    let code = {
-                        scope: this.$store.getters.getItemTitle.scope,
-                        code: key[(key.length - 1)],
-                        blob: data.blob
-                    }
+                    console.log(data)
+                    console.log(this.$store.getters.getItemTitle.scope)
+                        let code = {
+                            scope: data.scope,
+                            code: this.$store.getters.getItemTitle.scope == 'school' ? data.school : data.creatorId,
+                            blob: data.blob
+                        }
                     let papers = await this.$evTools.getStuPaper(code)
                     let answer = await this.getItem(ans)
                     paper = await this.formPaper(papers)
@@ -326,10 +327,10 @@
             async getItem(data) {
                 let datas = []
                 if (data !== undefined) {
-                    let key = this.$store.getters.getItemTitle.code.split('-')
+                    let key = this.$store.getters.getItemTitle
                     let code = {
                         scope: this.stuData.papers[0].scope,
-                        code:key[key.length - 1],
+                        code: key.scope == 'school' ? key.school : key.creatorId,
                         blob: data[0]
                     }
                     let blob = this.formUrl(code)

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

@@ -394,8 +394,7 @@
                     let req = {
                         id: this.$store.getters.getItemTitle.id,
                         answer: this.checkers,
-                        //studentId: this.$store.state.userInfo.sub,
-                        studentId: '24915',
+                        studentId: this.$store.state.userInfo.sub,
                         classId: this.$store.getters.getExamInfo.allClass,
                         subjectId: this.$store.getters.getExamInfo.subject.id,
                         multipleRule: this.$store.getters.getExamInfo.multipleRule,

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

@@ -110,8 +110,7 @@
                     let codes = this.$store.getters.getItemTitle.code.split('-')
                     let req = {
                         id: paper.id,
-                        studentId:'24915',
-                        //studentId: this.$store.state.userInfo.sub,
+                        studentId: this.$store.state.userInfo.sub,
                         code: codes[1],
                         scode: paper.scode
                     }
@@ -140,12 +139,14 @@
                                             k++
                                         }
                                     }
+                                    console.log(this.paperData)
                                     if (k == 0 && this.paperData[i].progress == 'finish') {
                                         isTest++
                                     }
                                 }
                             }
                         }
+                        console.log(isTest)
                         if (isTest == this.paperData.length ) {
                             this.isTestOver = true
                         }

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventList.vue

@@ -230,12 +230,9 @@
                         }
                     }
                     let params = {
-                        userid: '24915',
+                        userid: this.$store.state.userInfo.sub,
                         userType: "schoolid",
                         school: this.$store.state.user.schoolCode
-                        //"userid": this.$store.state.userInfo.sub,
-                        //"classes": classInfo,
-                        //"school": this.$store.state.user.schoolCode
                     }
                     this.$api.studentWeb.getActivityInfo(params).then(res => {
                         if (res) {

TEAMModelOS/ClientApp/src/components/student-web/HomeView/MissionListCard.vue

@@ -103,8 +103,7 @@
                         }
                     }
                     let params = {
-                        //userid: this.$store.state.userInfo.sub,
-                        userid: '24915',
+                        userid: this.$store.state.userInfo.sub,
                         userType: "schoolid",
                         school: this.$store.state.user.schoolCode
                     }

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/studentWeb.js

@@ -403,7 +403,7 @@ export default {
         submitSuccess: '提交成功',
         overTime: '不在作答时间范围内！',
         answerErr: '作答数据错误！',
-        fileErr: '问价获取失败！'
+        fileErr: '问卷获取失败！'
     },
     'informview-title': '通知总览',
     view: '前往检视',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js

@@ -403,7 +403,7 @@ export default {
         submitSuccess: '提交成功',
         overTime: '不在作答時間範圍內！ ',
         answerErr: '作答數據錯誤！ ',
-        fileErr: '問價獲取失敗！ '
+        fileErr: '問卷獲取失敗！ '
     },
     'informview-title': '通知總覽',
     view: '前往檢視',