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

TEAMModelFunction/TriggerVote.cs

@@ -40,9 +40,7 @@ namespace TEAMModelFunction
                 adcode = $"Activity-{tdata.creatorId}";
                 blobcntr = tdata.creatorId;
             }
-#if DEBUG
             await _dingDing.SendBotMsg($"投票活动【{tdata.name}-{tdata.id}-ttl={tdata.ttl}】正在操作", GroupNames.成都开发測試群組);
-#endif
             Vote vote = await client.GetContainer("TEAMModelOS", "Common").ReadItemAsync<Vote>(input.Id, new Azure.Cosmos.PartitionKey($"{tdata.code}"));
             List<ChangeRecord> voteRecords = await _azureStorage.FindListByDict<ChangeRecord>(new Dictionary<string, object>() { { "RowKey", input.Id }, { "PartitionKey", vote.progress } });
             if (vote != null) {

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

@@ -305,11 +305,14 @@
                     objItem: [],
                     subItem: [],
                 }
+                console.log('5636123322',data)
                 if (data !== undefined) {
+                    let codes = this.$store.getters.getItemTitle.scope == 'school' ? data.school : data.creatorId
                         let code = {
                             scope: data.scope,
-                            code: this.$store.getters.getItemTitle.scope == 'school' ? data.school : data.creatorId,
-                            blob: data.blob
+                            code: codes,
+                            blob: data.blob,
+                            examId:codes
                         }
                     let papers = await this.$evTools.getStuPaper(code)
                     let answer = await this.getItem(ans)

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

@@ -72,7 +72,7 @@
                     </span>
                     <div class="questioDes">
                         <div class="questionType" v-if="getQue(queNo).parent == undefined">
-                            <span>{{getTestType(getQue(queNo).type)}}</span>
+                            <span>{{getTestType(getQue(queNo).type)}}54345645</span>
                         </div>
                         <div class="que-item" v-if="getQue(queNo).type != 'compose' && getQue(queNo).parent == undefined">
                             <span>{{ queNo +1 }}.</span>

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

@@ -181,15 +181,18 @@
                 }
             },
             async getPaper(data) {
+                console.log('321651231',data)
                 this.isExamDown = false
                 this.isLoad = true
                 this.selectData = {}
                 this.chooseData = {}
+                let codes = this.$store.getters.getItemTitle.scope == 'school' ? data.school : data.creatorId
                 if (data.blob !== undefined && data.blob !== "") {
                     let code = {
                         scope: data.scope,
-                        code: this.$store.getters.getItemTitle.scope == 'school' ? data.school : data.creatorId,
-                        blob: data.blob
+                        code: codes,
+                        blob: data.blob,
+                        examId: codes
                     }
                     let exam = {}
                     for (let item of this.examData) {
@@ -197,7 +200,7 @@
                             exam = item
                         }
                     }
-                    if (exam.id == undefined) {
+                    if (exam.id == undefined) { 
                         this.selectData = await this.$evTools.getStuPaper(code)
                         this.examData.push(this.selectData)
                     } else {

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

@@ -421,7 +421,8 @@ export default {
                         for (let index in resData.papers) {
                             let blob = resData.papers[index].blob
                             resData.papers[index].examScope = resData.scope
-                            resData.papers[index].examId = resData.id
+                            // resData.papers[index].examId = resData.id
+                            resData.papers[index].examId = resData.scope === 'school' ? this.$store.state.userInfo.schoolCode : this.$store.state.userInfo.TEAMModelId //试卷容器名字
                             resData.papers[index] = await this.$evTools.getFullPaper(resData.papers[index])
                             if (!resData.papers[index].subjectId) {
                                 resData.papers[index].subjectId = blob.substring(blob.lastIndexOf('/') + 1)