Browse Source

单科、报告添加实考人数

liurongli 1 month ago
parent
commit
6ef3fcd984

+ 1 - 1
src/App.vue

@@ -18,7 +18,7 @@ export default {
     },
     methods: {
         SubmitLogin() {
-            const username = '4305962347221073';
+            const username = '376050cy_xiyanzuo_1';
             const password = '123456';
             // const type = '1';
             const schoolType = sessionStorage.getItem('schoolType');

+ 16 - 18
src/components/FiltersItem_ruoyan.vue

@@ -5,12 +5,10 @@
                 <div class="tag_group_title">{{ filterItem.name }}:</div>
                 <div class="tag_group_content">
                     <template v-for="item in filterItem.list">
-                        <template v-if="showTable(item)">
-                            <div class="tag_item" @click="selectItem(index, item.value, filterItem)"
-                                :class="item.value == filterItem.value ? 'active' : ''">
-                                {{ item.label }}
-                            </div>
-                        </template>
+                        <div class="tag_item" @click="selectItem(index, item.value, filterItem)"
+                            :class="item.value == filterItem.value ? 'active' : ''">
+                            {{ item.label }}
+                        </div>
                     </template>
                 </div>
             </div>
@@ -40,20 +38,20 @@ export default {
             this.$emit('selectItem', d, item)
         },
 
-        showTable(item) {
-            const showTotalScore = this.$store.state.report.showTotalScore
+        // showTable(item) {
+        //     const showTotalScore = this.$store.state.report.showTotalScore
 
-            // isTotal:是否总分 0-不是 1-是
-            // subjectGroupType:学科分组类型 0-不分组 1-分组
-            const { isTotal, subjectGroupType } = item
+        //     // isTotal:是否总分 0-不是 1-是
+        //     // subjectGroupType:学科分组类型 0-不分组 1-分组
+        //     const { isTotal, subjectGroupType } = item
 
-            //  当 isTotal 为 1 或 subjectGroupType 为 1 且 showTotalScore 为 false 的时候隐藏总分
-            if ((isTotal === 1 || subjectGroupType === 1) && !showTotalScore) {
-                return false
-            } else {
-                return true
-            }
-        }
+        //     //  当 isTotal 为 1 或 subjectGroupType 为 1 且 showTotalScore 为 false 的时候隐藏总分
+        //     if ((isTotal === 1 || subjectGroupType === 1) && !showTotalScore) {
+        //         return false
+        //     } else {
+        //         return true
+        //     }
+        // }
     }
 }
 </script>

+ 4 - 0
src/views/analysisReport/studentPage/downloadPdf/studentReport.vue

@@ -816,6 +816,10 @@ export default {
                         name:'区排',
                         prop:'regionRank',
                         display:res?.data?.regionRankStatus === 0
+                    },{
+                        name:'实考人数',
+                        prop:'examNum',
+                        display:res?.data?.examNumStatus === 0
                     },{
                         name:'赋分等级',
                         prop:'rateScoreName',

+ 2 - 3
src/views/analysisReport/studentPage/mainPage.vue

@@ -97,12 +97,11 @@ export default {
         filteredFilterData() {
             // 检查当前是否在个人画像页面
             const isPersonalProfilePage = this.$route.path === '/studentAnalysisReport/reportDetails/personalProfile';
-            
-            if (!isPersonalProfilePage) {
+            const isPersonalWrongQuestions = this.$route.path === this.pathTwo;
+            if (!isPersonalProfilePage && !isPersonalWrongQuestions) {
                 // 非个人画像页面,返回原始数据
                 return this.filterData;
             }
-            
             // 深拷贝原始数据,避免直接修改
             const updatedFilterData = JSON.parse(JSON.stringify(this.filterData));
             

+ 4 - 0
src/views/analysisReport/studentPage/scrolReport/transcript_single.vue

@@ -77,6 +77,10 @@
               <span class="title">区排</span>
               <span class="value">{{ subjectData?.data?.regionRank ?? '-' }}</span>
             </div>
+            <div class="score_item" v-if="subjectData?.data?.examNumStatus === 0">
+              <span class="title">实考人数</span>
+              <span class="value">{{ subjectData?.data?.examNum ?? '-' }}</span>
+            </div>
             <div class="score_item" v-if="subjectData?.data?.rateScoreStatus === 0">
               <span class="title">赋分等级</span>
               <span class="value">{{ subjectData?.data?.rateScoreName ?? '-' }}</span>