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

@@ -9,16 +9,10 @@
                     <svg-icon v-if="nextItem.eventType == '作業'" icon-class="doc" />
                     <svg-icon v-if="nextItem.eventType == '課前預習'"
                               icon-class="selflearninginTime" />
-                    <svg-icon v-if="
-                nextItem.eventType == '評量' &&
-                nextItem.eventSubject != '綜合學科'
-              "
+                    <svg-icon v-if=" nextItem.eventType == '評量' && nextItem.eventSubject != '綜合學科' "
                               icon-class="test"
                               class="reset-testIcon" />
-                    <svg-icon v-if="
-                nextItem.eventType == '評量' &&
-                nextItem.eventSubject == '綜合學科'
-              "
+                    <svg-icon v-if=" nextItem.eventType == '評量' && nextItem.eventSubject == '綜合學科'"
                               icon-class="multiTest"
                               class="reset-testIcon" />
                     <svg-icon v-if="nextItem.eventType == '投票'" icon-class="vote" />
@@ -36,13 +30,7 @@
                 <button @click="gotoNextItem()">確定</button>
             </div>
         </div>
-
-
-
-        <LessonTestPop v-if="openEva" />
-
-
-
+        <LessonTestPop :papers="selectData"  v-if="this.$store.getters.getisOpenLessonTestPopNow"  />
         <div>
             <EventBasicInfo :paper="paperData" />
             <div v-if="this.$store.getters.getItemTitle.isDone == false && this.$store.getters.getItemTitle.endTime <= '2020.02.10' &&this.$store.getters.getItemTitle.allowRetryNow == false">
@@ -165,12 +153,12 @@
                   v-if="this.$store.getters.getItemTitle.isDone == true"
                   :animated="false">
                 <TabPane :label="$t('studentWeb.exam.contentPage')" name="tab1">
-                    <br />
+                    <!--<br />
                     <div class="dec animate__animated animate__headShake">
                         <span class="warm-hint">{{ $t("studentWeb.exam.practiceHint") }}</span>
-                    </div>
+                    </div>-->
                     <!--單一學科試卷-->
-                    <div class="title-rect-group">
+                    <!--<div class="title-rect-group">
                         <div class="title-rect" />
                         <h2 class="title-rect-name">{{ $t("studentWeb.exam.examLink") }}</h2>
                     </div>
@@ -189,18 +177,18 @@
                             </span>
                             {{ transSubjecttoEn(this.$store.getters.getItemTitle.eventSubject)}}
                             Exam
-                        </div>
+                        </div>-->
                         <!--依試卷是否完成顯示打勾狀態-->
                         <!--li :class="{
                             finished: true,
                           }">
                           <Icon class="doneicon" type="ios-checkmark" size="36" />
                         </li-->
-                    </div>
+                    <!--</div>-->
 
                     <!----->
                     <!--多學科試卷-->
-                    <div v-if="paperData.length >1">
+                    <!--<div v-if="paperData.length >1">
                         <ul v-for="(item, index) in multiSubject"
                             :key="index"
                             class="tasks"
@@ -216,18 +204,18 @@
                                     <svg-icon icon-class="test" class="title-icon" />
                                 </span>
                                 {{ transSubjecttoEn(item) }} Exam
-                            </li>
+                            </li>-->
                             <!--依試卷是否完成顯示打勾狀態-->
-                        </ul>
-                    </div>
+                        <!--</ul>
+                    </div>-->
 
                     <!----->
 
                 </TabPane>
                 <!--评量分析数据返回-->
-                <TabPane :label="$t('studentWeb.exam.scorePage')" name="tab2">
+                <!--<TabPane :label="$t('studentWeb.exam.scorePage')" name="tab2">
                     <LessonTestReport />
-                </TabPane>
+                </TabPane>-->
             </Tabs>
         </div>
     </div>
@@ -271,12 +259,12 @@
                 isHintNextItem: false,
                 showHint: false,
                 paperData: [],
-                openEva: false
+                openEva: false,
+                selectData: {}
             };
         },
         methods: {
             getPaperData() {
-                console.log(this.$store.getters.getPaperInfo)
                 if (this.$store.getters.getPaperInfo.name !== undefined) {
                     let paper = this.$store.getters.getPaperInfo
                     let req = {
@@ -286,7 +274,6 @@
                         school: paper.school
                     }
                     this.$api.studentWeb.FindStudentPaper(req).then(res => {
-                        console.log(res)
                         let resData = res.props
                         let sub = []
                         for (let item of resData) {
@@ -296,12 +283,10 @@
                                 sub = item
                             }
                         }
-                        console.log(sub)
                         for (let i = 0; i < this.paperData.length; i++) {
                             this.paperData[i].subject = sub.subjects[i]
                             this.paperData[i].stuAns = res.stuAns[i]
                         }
-                        console.log(this.paperData)
                     })
                 }
             },
@@ -315,9 +300,7 @@
 
             getisHint(data) {
                 this.isHintNextItem = data;
-                console.log(this.isHintNextItem);
                 this.previewNext();
-                console.log(localStorage.getItem("hintNextItem")) //讀取是否顯示提示下一個
                 if (localStorage.getItem("hintNextItem") != "false") {
                     setTimeout(() => {
                         this.showHint = true;
@@ -361,10 +344,8 @@
                         nextItems[0].eventName ==
                         this.mockdata[this.mockdata.length - 1].eventName
                     ) {
-                        console.log("沒有下一個!");
                         this.nextItem = "allfinished";
                     }
-                    console.log("下一個：" + nextItems[0].eventName);
                     this.nextItem = nextItems[0];
                 }
             },
@@ -385,11 +366,26 @@
             opentest: function () {
                 this.$store.commit("ToggleLessonTestPop");
             },
-            opentestWithSubject: function (item) {
-                this.openEva = false
+            opentestWithSubject(item) {
                 if (item.name !== '') {
-                    this.$store.commit("ToggleLessonTestPopWithSubject", item);
-                    this.openEva = true
+                    this.getPaper(item)
+
+                }
+            },
+            async getPaper(data) {
+                this.selectData = {}
+                if (data.blob !== undefined && data.blob !== "") {
+                    let key = data.code.split('-')
+                    let code = {
+                        scope: data.scope,
+                        code: key[(key.length - 1)],
+                        blob: data.blob
+                    }
+                    this.selectData = await this.$evTools.getStuPaper(code)
+                    if (this.selectData.item) {
+                        this.$store.commit("ToggleLessonTestPopWithSubject", data)
+                        this.$store.commit("SetPaperInfo", this.selectData)
+                    }
                 }
             },
             transSubjecttoEn(type) {

TEAMModelOS/ClientApp/src/utils/editorTools.js

@@ -185,10 +185,10 @@ export default {
 									reader.onload = function(e) {
 										// editor.cmd.do('insertHTML', '<img data-url=' + e.target.result + ' data-name=' + fileList[0].name +
 										// 	' src=' + audioImg + ' class="richText-audio"></img>');
-										// editor.txt.append('<span data-url=' + e.target.result + ' data-name=' + fileList[0].name +
-										// 	' class="richText-audio"></span>');	
-										editor.txt.append('<audio data-name=' + fileList[0].name + ' src=' + e.target.result +
-											' class="richText-audio" width="300" controls="controls"></audio>');		
+										editor.txt.append('<span contenteditable="false" data-url=' + e.target.result + ' data-name=' + fileList[0].name +
+											' class="richText-audio"></span>');	
+										// editor.txt.append('<audio data-name=' + fileList[0].name + ' src=' + e.target.result +
+										// 	' class="richText-audio" width="300" controls="controls"></audio>');		
 									}
 								}
 								// 返回 true 可关闭 panel

TEAMModelOS/ClientApp/src/view/evaluation/bank/TestPaperList.vue

@@ -92,11 +92,9 @@
 			doFilter() {
 				this.dataLoading = true
 				this.getPaperList(this.filterParams)
-				// this.getResultCount(this.findCountParams)
 			},
 
 			onFilterChange(filterParams) {
-				console.log(filterParams)
 				let isSchool = filterParams.code === this.$store.state.userInfo.schoolCode
 				this.filterParams = {
 					'@DESC': filterParams.filterSort,

TEAMModelOS/ClientApp/src/view/evaluation/index/CreatePaper.vue

@@ -687,15 +687,17 @@
 				console.log(paper)
 				let schoolInfo = await this.getSchoolBaseInfo()
 				console.log(schoolInfo)
-				this.subjectList = schoolInfo ? this.schoolInfo.period.filter(i => i.id === paper.periodId)[0].subjects : []
+				if(paper.scope === 'school'){
+					this.subjectList = schoolInfo ? this.schoolInfo.period.filter(i => i.id === paper.periodId)[0].subjects : []
+				}
 				this.evaluationInfo = {
 					id: paper.id,
 					name: paper.name,
 					code:paper.code,
 					type: paper.scope,
-					paperPeriod: schoolInfo ? this.schoolInfo.period.map(i => i.id).indexOf(paper.periodId) : null,
-					paperGrade: schoolInfo ? paper.gradeIds : [],
-					paperSubject: schoolInfo ? this.subjectList.map(i => i.id).indexOf(paper.subjectId) : [],
+					paperPeriod: schoolInfo && paper.scope === 'school' ? this.schoolInfo.period.map(i => i.id).indexOf(paper.periodId) : null,
+					paperGrade: schoolInfo && paper.scope === 'school' ? paper.gradeIds : [],
+					paperSubject: schoolInfo && paper.scope === 'school' ? this.subjectList.map(i => i.id).indexOf(paper.subjectId) : [],
 					score: paper.score,
 					item: paper.item,
 					multipleRule:paper.multipleRule,