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/composePaper.vue

@@ -1,8 +1,8 @@
 <template>
     <div class="content">
         <div id="textArea"> </div>
-        <Modal v-model="markStatus" fullscreen title="作答" footer-hide>
-            <BaseMyCanvas v-if="markStatus" :bgImg="markBg" @onCloseModal="closeModal" :isStudent="markStatus" @onSaveCanvas="saveMark"></BaseMyCanvas>
+        <Modal v-model="markStatus" fullscreen title="作答" footer-hide  ref="compose">
+                <BaseMyCanvas v-if="markStatus" :bgImg="markBg" @onCloseModal="closeModal" :isStudent="markStatus" @onSaveCanvas="saveMark"></BaseMyCanvas>
         </Modal>
         <iframe class="frame"id="answerIframe" :srcdoc="itemInfo.question"></iframe>
     </div>
@@ -69,7 +69,6 @@
                     this.editor.txt.html(img.outerHTML)
                     this.markStatus = false
                 }
-                console.log(data)
             },
             initEditor() {
                 this.editorContent = ""
@@ -110,7 +109,9 @@
                 answerIframe.contentWindow.document.body.style.minWidth = '600px'
                 answerIframe.contentWindow.document.body.style.backgroundColor = '#f5f5f5'
                 let iframe = document.getElementById('answerIframe').contentWindow.document.getElementsByTagName('p')
+                console.log(iframe[1].style)
                 iframe[1].style.lineHeight = '50px'
+                iframe[1].style.paddingBottom = '50px'
                 html2canvas(answerIframe.contentWindow.document.body).then(canvas => {
                     this.markStatus = true
                     this.markBg = canvas.toDataURL("image/png");
@@ -157,4 +158,7 @@
         /*margin-left:10px;*/
         /*line-height: 50px;*/
     }
+    .canvas-tools {
+        bottom: -50px;
+    }
 </style>

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

@@ -378,7 +378,8 @@ export default {
                 "studentId": this.studentAnswer.id,
                 "subjectId": this.subjectId,
                 "classId": this.studentAnswer.classId,
-                "code": this.paperInfo.code,
+                // "code": this.paperInfo.code,//这种方式paper code规则调整了，会多Paper-"
+                "code": this.scope == 'school' ? this.$store.state.userInfo.schoolCode : this.$store.state.userInfo.TEAMModelId,//暂时取代上面的方式
             }).then(
                 res => {
                     this.$Message.success(this.$t('learnActivity.score.markOk'))
@@ -490,11 +491,13 @@ export default {
         saveScore() {
             let requestData = {
                 "id": this.examId,
-                "code": this.paperInfo.code,
+                // "code": this.paperInfo.code,//这种方式paper code规则调整了，会多Paper-"
+                "code": this.scope == 'school' ? this.$store.state.userInfo.schoolCode : this.$store.state.userInfo.TEAMModelId,//暂时取代上面的方式
                 "point": this.studentAnswer.scores,
                 "studentId": this.studentAnswer.id,
                 "classId": this.studentAnswer.classId,
-                "school": this.paperInfo.code,
+                // "school": this.paperInfo.code,//这种方式paper code规则调整了，会多Paper-"
+                "school": this.scope == 'school' ? this.$store.state.userInfo.schoolCode : this.$store.state.userInfo.TEAMModelId,//暂时取代上面的方式
                 "subjectId": this.subjectId
             }
             this.$api.learnActivity.UpsertAllRecord(requestData).then(res => {