修正切換評量時題號顯示錯誤問題 / no改為班級編號 /

TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -8072,7 +8072,7 @@ const LANG_EN_US = {
         enterReview: 'Enter review',
         Approved: 'Approved',
         EventBackstage: 'Event backstage',
-        Warning05: 'Green projects are subjective questions that can be reviewed',
+        Warning05: 'The illuminated question numbers are subjective questions that can be marked.',
         NoSubjectiveQuestions: 'Evaluation of subjective questions without review',
         exportScore: 'Export grades',
         score: 'Score',
@@ -8083,6 +8083,7 @@ const LANG_EN_US = {
         item: 'Item',
         classScoreOverview: 'Class overview',
         releaseCustomExam: 'Set finals to visible',
+        classNumber:'Class number',
     },
     activity: {
         scoreWord: {

TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -8073,7 +8073,7 @@ const LANG_ZH_CN = {
         enterReview: '進入批閱',
         Approved: '已批阅',
         EventBackstage: '活动后台',
-        Warning05: '绿色项目为可批阅之主观题',
+        Warning05: '亮灯题号为可批阅之主观题',
         NoSubjectiveQuestions: '无可批阅主观题之评量',
         exportScore: '汇出成绩',
         score: '分数',
@@ -8084,6 +8084,7 @@ const LANG_ZH_CN = {
         item: '题目',
         classScoreOverview: '所有班级成绩一览',
         releaseCustomExam: '设定决赛为可见',
+        classNumber:'班级编号',
     },
     activity: {
         scoreWord: {

TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -8073,7 +8073,7 @@ const LANG_ZH_TW = {
         enterReview: '進入批閱',
         Approved: '已批閱',
         EventBackstage: '活動後台',
-        Warning05: '綠色項目為可批閱之主觀題',
+        Warning05: '亮燈題號為可批閱之主觀題',
         NoSubjectiveQuestions: '無可批閱主觀題之評量',
         exportScore: '匯出成績',
         score: '分數',
@@ -8084,6 +8084,7 @@ const LANG_ZH_TW = {
         item: '題目',
         classScoreOverview: '所有班級成績一覽',
         releaseCustomExam: '設定決賽為可見',
+        classNumber:'班級編號',
     },
     activity: {
         scoreWord: {

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

@@ -626,6 +626,7 @@ export default {
         },
         paper: {
             handler(newValue, oldValue) {
+                this.dataLoading = true;
                 // 加上題目索引
                 if (newValue.item && newValue.item.length) {
                     let index = 0 //题目索引
@@ -644,20 +645,34 @@ export default {
                             i.index = index++
                             //this.paperScore.push(i.score || 0)
                         }
-                        if (!i.score) i.score = 0                       
+                        if (!i.score) i.score = 0
                     })
-                   
-                    if (this.isExamMark) { // 批閱模式 先篩選出主觀題
+
+                    if (this.isExamMark) { // 批閱模式 先篩選出主觀題                        
                         for (let i = 0; i < newValue.item.length; i++) {
-                            if (newValue.item[i].type === 'subjective' || newValue.item[i].type === 'complete') {
-                                this.quIndex = i;
-                                break;
+                            if (newValue.item[i].type === "compose") {
+                                for (let j = 0; j < newValue.item[i].children.length; j++) {
+                                    if (newValue.item[i].children[j].type === 'subjective' || newValue.item[i].children[j].type === 'complete') {
+                                        this.quIndex = j;
+                                        break;
+                                    }
+                                }
+                            } else {
+                                if (newValue.item[i].type === 'subjective' || newValue.item[i].type === 'complete') {
+                                    this.quIndex = i;
+                                    break;
+                                }
                             }
                         }
                     }
                 }
                 this.paperInfo = newValue
                 //this.handleInitPaper(newPaper)
+                //this.dataLoading = false;
+                // 延遲處理 加上遮罩效果
+                setTimeout(() => {
+                    this.dataLoading = false; // 完成後關閉 loading
+                }, 500);  // 模擬一個處理延遲
             },
             deep: true,
             immediate: true

TEAMModelOS/ClientApp/src/view/learnactivity/tabs/htAnswerTable.vue

@@ -1,5 +1,6 @@
 <template>
 	<div class="answer-table-container">
+		<!-- <Loading :top="200" type="1" style="text-align:center" v-show="dataLoading"></Loading> -->
 		<vuescroll v-show="!isMarkView">
 			<!-- 概要数字统计-->
 			<div class="data-count-wrap">
@@ -56,7 +57,7 @@
 					
 					<!-- <Cascader v-model="chooseTarget" :data="targetsData" :clearable="false" transfer @on-change="targetChange" 
 					style="width: 200px; display: inline-block; margin-right: 15px"></Cascader> -->
-					<span v-show="isExamMark">No：</span>
+					<span v-show="isExamMark">{{ $t("htcommunity.classNumber") }}：</span>
 					<Select filterable v-model="noSelectValue" class="filter-select" @on-change="changeNoSelectData" size="large"  v-show="isExamMark"  style="width:150px" transfer>
 						<Option v-for="(item, index) in noSelectData" :value="item.no" :key="index">{{ item.no }}</Option>
 					</Select>
@@ -128,7 +129,7 @@
 		<vuescroll v-show="isMarkView">
 			<div>
 				<div class="light-iview-select light-iview-input mark-view-header">
-					<span v-show="isExamMark">No：</span>
+					<span v-show="isExamMark">{{ $t("htcommunity.classNumber") }}：</span>
 					<Select filterable v-model="noSelectValue" class="filter-select" @on-change="changeNoSelectData" size="large" v-show="isExamMark"  style="width:150px" transfer>
 						<Option v-for="(item, index) in noSelectData" :value="item.no" :key="index">{{ item.no }}</Option>
 					</Select>