From 38037382233590b3113faef33c5b3ba59c55307c Mon Sep 17 00:00:00 2001
From: weishengyou <2454197255@qq.com>
Date: Wed, 24 Dec 2025 09:31:25 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E5=B9=B4=E6=A0=87=E7=AD=BE=E9=80=82?=
 =?UTF-8?q?=E9=85=8D=E5=AD=A6=E7=94=9F=E5=A5=96=E6=83=A9=E3=80=81=E5=AD=A6?=
 =?UTF-8?q?=E7=94=9F=E8=B5=84=E5=8A=A9=E6=A8=A1=E5=9D=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/comprehensive/biyeapply.js            | 18 +++++--
 src/api/comprehensive/knzzTufaApply.js        |  1 +
 src/api/stuCQS/basedata/year.js               | 11 ++++
 src/api/stuCQS/good/apply.js                  | 10 ++++
 src/api/stuCQS/good/audit.js                  |  9 ++++
 .../knzzGlApply/cpnt/GlApply.vue              | 14 +++--
 src/views/comprehensive/knzzGlApply/stu.vue   | 10 +++-
 .../knzzZzqApply/cpnt/TufaApply.vue           | 11 +++-
 src/views/comprehensive/knzzZzqApply/stu.vue  | 11 +++-
 .../accommodation-management/fdy.vue          | 24 +++++----
 src/views/poverty/povertyapply/jtjjkn.vue     |  2 +-
 src/views/poverty/povertyapply/stu.vue        | 54 ++++++++++++++++---
 src/views/poverty/stu.vue                     | 41 ++++++++++++--
 src/views/stuCQS/basedata/stuyear/index.vue   |  2 +-
 src/views/stuCQS/good-biye/FdyAll.vue         | 10 +++-
 src/views/stuCQS/good-biye/JwcAll.vue         | 10 +++-
 src/views/stuCQS/good-biye/XwAll.vue          | 10 +++-
 src/views/stuCQS/good-biye/fdy.vue            |  9 +++-
 src/views/stuCQS/good-biye/jwc.vue            | 10 +++-
 src/views/stuCQS/good-biye/want.vue           | 20 +++++--
 src/views/stuCQS/good-biye/xw.vue             | 10 +++-
 src/views/stuCQS/good-class/stu.vue           | 10 +++-
 src/views/stuCQS/good/FdyAll.vue              | 11 +++-
 src/views/stuCQS/good/MeritStudentCadres.vue  | 13 +++--
 src/views/stuCQS/good/MeritStudentView.vue    | 20 +++++--
 src/views/stuCQS/good/XwAll.vue               | 11 +++-
 src/views/stuCQS/good/all.vue                 | 11 +++-
 src/views/stuCQS/good/fdy.vue                 | 11 +++-
 src/views/stuCQS/good/jwc.vue                 | 11 +++-
 src/views/stuCQS/good/xw.vue                  | 11 +++-
 src/views/stuCQS/lake/FdyAll.vue              | 11 +++-
 src/views/stuCQS/lake/JwcAll.vue              | 11 +++-
 src/views/stuCQS/lake/XwAll.vue               | 11 +++-
 src/views/stuCQS/lake/fdy.vue                 | 11 +++-
 src/views/stuCQS/lake/jwc.vue                 | 11 +++-
 src/views/stuCQS/lake/onehundred.vue          | 21 ++++++--
 src/views/stuCQS/lake/xw.vue                  | 13 +++--
 37 files changed, 410 insertions(+), 85 deletions(-)

diff --git a/src/api/comprehensive/biyeapply.js b/src/api/comprehensive/biyeapply.js
index 4c61bf7..12b5e68 100644
--- a/src/api/comprehensive/biyeapply.js
+++ b/src/api/comprehensive/biyeapply.js
@@ -15,6 +15,17 @@ export function listStuSportScore(stuNo) {
   })
 }
 
+/**
+ * 根据学年标签查询学生体测成绩
+ */
+export function listStuSportScoreByTag(stuNo,tag) {
+  return request({
+    url: '/comprehensive/biyeapply/listStuSportScoreByTag/' + stuNo,
+    method: 'get',
+    params:{tag}
+  })
+}
+
 export function getStuScoreMajorRank(stuNo) {
   return request({
     url: '/comprehensive/biyeapply/getStuScoreMajorRank/' + stuNo,
@@ -142,10 +153,11 @@ export function listFdy(params) {
   })
 }
 
-export function listOwnSportScore() {
+export function listOwnSportScoreByTag(tag) {
   return request({
-    url: '/comprehensive/biyeapply/listOwnSportScore',
-    method: 'get'
+    url: '/comprehensive/biyeapply/listOwnSportScoreByTag',
+    method: 'get',
+    params: { tag: tag }
   })
 }
 
diff --git a/src/api/comprehensive/knzzTufaApply.js b/src/api/comprehensive/knzzTufaApply.js
index 4c9f4c7..382f921 100644
--- a/src/api/comprehensive/knzzTufaApply.js
+++ b/src/api/comprehensive/knzzTufaApply.js
@@ -1,6 +1,7 @@
 import request from '@/utils/request'
 
 
+
 export function doReApply(data) {
   return request({
     url: '/comprehensive/knzzTufaApply/doReApply',
diff --git a/src/api/stuCQS/basedata/year.js b/src/api/stuCQS/basedata/year.js
index 07fddfe..5bf30f6 100644
--- a/src/api/stuCQS/basedata/year.js
+++ b/src/api/stuCQS/basedata/year.js
@@ -1,6 +1,7 @@
 import request from '@/utils/request'
 
 
+// 查询所有学年
 export function listAllYear(){
   return request({
     url:'/system/year/listAllYear',
@@ -14,6 +15,7 @@ export function listQiyongYear(){
   })
 }
 
+
 export function listAllEnableYear(){
   return request({
     url: '/system/year/listAllEnableYear',
@@ -84,3 +86,12 @@ export function assignTag(yearId,tag){
     params:{ tag: tag }
   })
 }
+
+//根据标签获取指定学年
+export function getYearByTag(tag){
+  return request({
+    url:'/system/year/by-tag',
+    method: 'get',
+    params:{ tag: tag }
+  })
+}
diff --git a/src/api/stuCQS/good/apply.js b/src/api/stuCQS/good/apply.js
index 02b88cd..d26e545 100644
--- a/src/api/stuCQS/good/apply.js
+++ b/src/api/stuCQS/good/apply.js
@@ -119,6 +119,16 @@ export function listOwnScoreClassRank() {
   })
 }
 
+//获取某学生指定学年的班级排名,是由前端查询的学年标签对应的学年
+export function listOwnScoreClassRankByTag(tag) {
+  return request({
+    url: '/comprehensive/goodapply/listOwnScoreRankByTag',
+    method: 'GET',
+    params: {
+      tag
+    }
+  })
+}
 
 export function listOwnXyjxjApply(params) {
   return request({
diff --git a/src/api/stuCQS/good/audit.js b/src/api/stuCQS/good/audit.js
index 90d594b..99e46e9 100644
--- a/src/api/stuCQS/good/audit.js
+++ b/src/api/stuCQS/good/audit.js
@@ -170,6 +170,15 @@ export function listStuScoreClassRank(stuNo) {
   })
 }
 
+//
+export function listStuScoreClassRankByTag(stuNo,tag) {
+  return request({
+    method: 'GET',
+    url: '/comprehensive/goodapply/listStuScoreClassRankByTag/' + stuNo,
+    params: {tag}
+  })
+}
+
 
 export function listStuYearCourseScore(stuNo, params = {}) {
   return request({
diff --git a/src/views/comprehensive/knzzGlApply/cpnt/GlApply.vue b/src/views/comprehensive/knzzGlApply/cpnt/GlApply.vue
index e432b1b..09123eb 100644
--- a/src/views/comprehensive/knzzGlApply/cpnt/GlApply.vue
+++ b/src/views/comprehensive/knzzGlApply/cpnt/GlApply.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <p style="line-height:33pt; margin:0pt; orphans:0; text-align:center; widows:0">
-      <span v-if="localFormData.listAllYear.length > 0" style="font-family:方正小标宋简体; font-size:20pt">{{ localFormData.listAllYear[1].stuYearName }}</span>
+      <span v-if="localFormData.listAllYear.length > 0" style="font-family:方正小标宋简体; font-size:20pt">{{ localFormData.listAllYear[0].stuYearName }}</span>
       <span style="font-family:方正小标宋简体; font-size:20pt">国家</span><span
         style="font-family:方正小标宋简体; font-size:20pt"
       >励志</span><span
@@ -688,7 +688,7 @@ import { doApply } from '@/api/comprehensive/knzzGlApply'
 import { boolImg, CheckImgExists, isEmpty, fullLoading } from '@/api/helpFunc'
 import { getTokenKeySessionStorage as getToken } from '@/utils/auth'
 import dayjs from 'dayjs'
-import { listAllYear } from '@/api/stuCQS/basedata/year'
+import { listAllYear,getYearByTag } from '@/api/stuCQS/basedata/year'
 
 export default {
     name: 'GlApply',
@@ -848,7 +848,15 @@ export default {
         },
         async getOwnKnrd() {
             let res = await getOwnKnrd()
-            const response = await listAllYear()
+            /* const response = await listAllYear() */
+
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前页面的功能是获取'国家励志奖学金---NLZJ'标签对应的学年信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        尽量避免学年标签字典的更改!!!! */
+
+            const response = await getYearByTag('NLZJ')
             if (res.code == 200) {
                 let data = { ...res.data }
                 let knrd = data.xsqmyj
diff --git a/src/views/comprehensive/knzzGlApply/stu.vue b/src/views/comprehensive/knzzGlApply/stu.vue
index 57dc24b..9f48042 100644
--- a/src/views/comprehensive/knzzGlApply/stu.vue
+++ b/src/views/comprehensive/knzzGlApply/stu.vue
@@ -305,7 +305,7 @@ import { listDisciplinaryApplication } from '@/api/routine/disciplinaryApplicati
 import { getOwnStuScoreMajorRank } from '@/api/comprehensive/biyeapply'
 
 import {
-    listOwnScoreClassRank
+    listOwnScoreClassRank,listOwnScoreClassRankByTag
 } from '@/api/stuCQS/good/apply'
 
 import { listStu as listView, doEdit, doCancel, doReApply } from '@/api/comprehensive/knzzGlApply'
@@ -550,7 +550,13 @@ export default {
         },
         async fetchcjpm() {
             let loading = fullLoading(this)
-            let res = await listOwnScoreClassRank().catch(error => {
+
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前页面的功能是获取'国家励志奖学金---NLZJ'标签对应的学年信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        尽量避免学年标签字典的更改!!!! */
+            let res = await listOwnScoreClassRankByTag('NLZJ').catch(error => {
                 console.error('Error fetching score rank:', error)
                 return { code: 500 }
             })
diff --git a/src/views/comprehensive/knzzZzqApply/cpnt/TufaApply.vue b/src/views/comprehensive/knzzZzqApply/cpnt/TufaApply.vue
index 36e1042..d29aaea 100644
--- a/src/views/comprehensive/knzzZzqApply/cpnt/TufaApply.vue
+++ b/src/views/comprehensive/knzzZzqApply/cpnt/TufaApply.vue
@@ -635,7 +635,7 @@ import {getOwnInfo, getOwnExtraInfo, getOwnKnrd, getOwnFamily} from '@/api/compr
 import {boolImg, CheckImgExists, isEmpty, fullLoading} from '@/api/helpFunc'
 import {getTokenKeySessionStorage as getToken} from '@/utils/auth'
 import {doApply} from '@/api/comprehensive/knzzZzqApply'
-import { listAllEnableYear } from '@/api/stuCQS/basedata/year'
+import { listAllEnableYear ,getYearByTag} from '@/api/stuCQS/basedata/year'
 
 
 
@@ -712,7 +712,14 @@ export default {
   methods: {
     async fetchLeaderData() {
       try {
-        const response = await listAllEnableYear({ /* 你的查询参数 */ })
+        //const response = await listAllEnableYear({ /* 你的查询参数 */ })
+
+        /* 此处使用硬编码，请根据实际情况修改。
+        当前页面的功能是获取'自治区人民政府奖学金---RMZF'标签对应的学年信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const response = await getYearByTag('RMZF')
         this.leaderList = response.data
       } catch (error) {
         console.error('Failed to fetch leader data:', error)
diff --git a/src/views/comprehensive/knzzZzqApply/stu.vue b/src/views/comprehensive/knzzZzqApply/stu.vue
index 1d640d6..3da56c2 100644
--- a/src/views/comprehensive/knzzZzqApply/stu.vue
+++ b/src/views/comprehensive/knzzZzqApply/stu.vue
@@ -276,7 +276,7 @@ import { getTokenKeySessionStorage as getToken } from '@/utils/auth'
 import {selectTestStu} from '@/api/stuCQS/info-fill/sportTest'
 import { getDicts } from '@/api/system/dict/data'
 import { listDisciplinaryApplication } from '@/api/routine/disciplinaryApplication'
-import { listOwnScoreClassRank } from '@/api/stuCQS/good/apply'
+import { listOwnScoreClassRank,listOwnScoreClassRankByTag } from '@/api/stuCQS/good/apply'
 
 import TufaApply from '@/views/comprehensive/knzzZzqApply/cpnt/TufaApply.vue'
 import TufaLook from '@/views/comprehensive/knzzZzqApply/cpnt/TufaLook.vue'
@@ -506,7 +506,13 @@ export default {
       },
       async fetchcjpm() {
         let loading = fullLoading(this)
-        let res = await listOwnScoreClassRank().catch(error => {
+
+        /* 此处使用硬编码，请根据实际情况修改。
+        当前页面的功能是获取'自治区人民政府奖学金---RMZF'标签对应的学年信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        let res = await listOwnScoreClassRankByTag('RMZF').catch(error => {
           console.error('Error fetching score rank:', error)
           return { code: 500 }
         })
@@ -522,6 +528,7 @@ export default {
             return false
           }
         }
+        this.$message.info('无法获取您的专业排名数据')
         return false
       },
         lookVClick(row) {
diff --git a/src/views/dormitory/accommodation-management/fdy.vue b/src/views/dormitory/accommodation-management/fdy.vue
index acefa7b..0419704 100644
--- a/src/views/dormitory/accommodation-management/fdy.vue
+++ b/src/views/dormitory/accommodation-management/fdy.vue
@@ -73,8 +73,8 @@
                 @pagination="getList"
     />
 
-    <!-- 原辅导员审批宿舍管理申请对话框 -->
-    <!-- <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
+    <!-- 添加或修改宿舍管理申请对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="700px" append-to-body>
       <el-form ref="form" class="audit-form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="学号" prop="stuNo">
           <el-input v-model="form.stuNo" readonly />
@@ -155,7 +155,7 @@
         <el-button v-if="this.form.status == 0" type="primary" @click="submitForm">同 意</el-button>
         <el-button v-if="this.form.status == 0" @click="cancel">拒 绝</el-button>
       </div>
-    </el-dialog> -->
+    </el-dialog>
 
     <!-- 查看学生调宿计划对话框 -->
     <el-dialog :visible.sync="taskV" title="查看学生调宿计划" width="90%">
@@ -198,8 +198,14 @@
         </el-form-item>
 
         <el-form-item label="学号" prop="stuNo">
-          <el-input v-model="applyForm.stuNo" style="width: 70%; display: inline-block;" />
-          <el-button type="primary" style="margin-left: 10px;" @click="fetchStudentInfo">查询</el-button>
+          <el-row :gutter="10">
+            <el-col :span="18">
+              <el-input v-model="applyForm.stuNo" />
+            </el-col>
+            <el-col :span="6">
+              <el-button type="primary" style="width: 100%" @click="fetchStudentInfo">查询</el-button>
+            </el-col>
+          </el-row>
         </el-form-item>
         
         <el-form-item label="姓名" prop="stuName">
@@ -215,7 +221,7 @@
             type="date" 
             value-format="yyyy-MM-dd" 
             placeholder="请选择执行时间"
-            :picker-options="{ disabledDate: time => time.getTime() < new Date(new Date().setHours(0, 0, 0, 0)).getTime() }"
+            :picker-options="{ disabledDate: time => time.getTime() < Date.now() }"
           />
         </el-form-item>
         
@@ -523,8 +529,8 @@ export default {
         }
       })
     },
-    /** 原辅导员审批提交按钮 */
-    /* submitForm() {
+    /** 提交按钮 */
+    submitForm() {
       this.$refs['form'].validate(valid => {
         if (this.form.time == null && this.form.type != '3') {
           this.$message.info('请选择执行时间')
@@ -556,7 +562,7 @@ export default {
 
         }
       })
-    }, */
+    },
     campusChange(e) {
       this.form.parkId = null
       this.form.tarBuildingId = null
diff --git a/src/views/poverty/povertyapply/jtjjkn.vue b/src/views/poverty/povertyapply/jtjjkn.vue
index b9fc722..d718479 100644
--- a/src/views/poverty/povertyapply/jtjjkn.vue
+++ b/src/views/poverty/povertyapply/jtjjkn.vue
@@ -1799,7 +1799,7 @@ import {mz_list} from '@/api/helpFunc'
       getCurrentYearFun(){
           let year =  JSON.parse(sessionStorage.getItem('knrdSelectedYear'))
           this.formData.applyYear = year.stuYearName
-          this.formData.stuYearId = year.id
+          this.formData.stuYearId = year.id 
            this.getKnlx()
           // getCurrentYear().then(res=>{
           //   this.formData.applyYear = res.data.stuYearName;
diff --git a/src/views/poverty/povertyapply/stu.vue b/src/views/poverty/povertyapply/stu.vue
index cc6c4fc..a9c48f8 100644
--- a/src/views/poverty/povertyapply/stu.vue
+++ b/src/views/poverty/povertyapply/stu.vue
@@ -304,7 +304,8 @@
 </template>
 
 <script>
-import { listAllEnableYear,listAllYear} from '@/api/stuCQS/basedata/year'
+import { listAllEnableYear,listAllYear,getYearByTag} from '@/api/stuCQS/basedata/year'
+
   import {
     listOwn as listApply,
     getApply,
@@ -319,6 +320,7 @@ import { listAllEnableYear,listAllYear} from '@/api/stuCQS/basedata/year'
   } from 'element-ui'
   export default {
     name: 'Apply',
+    dicts: ['module_tag'],
     data() {
       return {
         // 遮罩层
@@ -402,19 +404,47 @@ import { listAllEnableYear,listAllYear} from '@/api/stuCQS/basedata/year'
       }
     },
     created() {
+      // 再查询列表数据
       this.getList()
+      // 先获取学年数据
       this.listAllStuYear()
     },
     methods: {
       
       //查所有年份
       listAllStuYear(){
-        listAllYear().then(res=>{
-            if(res.code == 200){
-               this.enableYeas = res.data
-               this.stuYearId = this.enableYeas[0].id
+        // 使用全局字典组件获取数据字典值
+        //const tagValue = this.$dict.type.module_tag.find(item => item.dictLabel === '困难认定')?.dictValue
+
+        /* 此处使用硬编码，请根据实际情况修改。
+        当前页面的功能是获取'困难认定---KNRD'标签对应的学年信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        尽量避免学年标签字典的更改!!!! */
+        const tagValue = 'KNRD' /* <---"困难认定"标签对应的标签值 */
+        if (!tagValue) {
+          this.$modal.msgError('未找到标签值')
+          return // 如果没有标签值，则不执行后续操作
+        }
+
+        getYearByTag(tagValue).then(res=>{
+          if(res.code == 200){
+            this.enableYeas = res.data
+            if (this.enableYeas.length > 0) {
+              this.stuYearId = this.enableYeas[0].id
+              // 只有当有数据时才更新会话信息 sessionStorage
+              sessionStorage.setItem('knrdSelectedYear', JSON.stringify({
+                stuYearName: this.enableYeas[0].stuYearName,
+                id: this.enableYeas[0].id
+              }))
+            } else {
+              // 如果没有可用学年，清除 sessionStorage 中的相关数据
+              sessionStorage.removeItem('knrdSelectedYear')
             }
-           
+          }
+        }).catch(error => {
+          console.error('获取学年信息失败:', error)
+          this.$modal.msgError('获取学年信息失败')
         })
       },
       //确认选择学年
@@ -623,6 +653,16 @@ import { listAllEnableYear,listAllYear} from '@/api/stuCQS/basedata/year'
           ...this.queryParams
         }, `apply_${new Date().getTime()}.xlsx`)
       }
-    }
+    },
+    mounted() {
+  // 确保数据字典已加载
+  /* if (!this.$dict.type.module_tag || this.$dict.type.module_tag.length === 0) {
+    // 如果数据字典未加载，重新加载并等待加载完成后再获取学年数据
+    this.$dict.reloadDict('module_tag').then(() => {
+      this.listAllStuYear();
+    });
+  } */
+  this.listAllStuYear();
+},
   }
 </script>
diff --git a/src/views/poverty/stu.vue b/src/views/poverty/stu.vue
index 6fd16e0..c3a1840 100644
--- a/src/views/poverty/stu.vue
+++ b/src/views/poverty/stu.vue
@@ -136,7 +136,7 @@
 </template>
 
 <script>
-import { listAllEnableYear,listAllYear} from '@/api/stuCQS/basedata/year'
+import { listAllEnableYear,listAllYear,getYearByTag} from '@/api/stuCQS/basedata/year'
 import { listApply, getApply, delApply, addApply, updateApply, listOwn,isPoor,revoke} from '@/api/zxj/apply'
 import ImportTable from '../tool/gen/importTable.vue'
 
@@ -221,13 +221,43 @@ export default {
     methods: {
          //查所有年份
         listAllStuYear(){
-            listAllYear().then(res=>{
+            /* listAllYear().then(res=>{
                 if(res.code == 200){
                 this.enableYeas = res.data
                 this.stuYearId = this.enableYeas[0].id
                 }
+            }) */
 
-            })
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前页面的功能是获取'国家助学金---ZXJ'标签对应的学年信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        尽量避免学年标签字典的更改!!!! */
+        const tagValue = 'ZXJ' /* <---"国家助学金---ZXJ"标签对应的标签值 */
+        if (!tagValue) {
+          this.$modal.msgError('未找到标签值')
+          return // 如果没有标签值，则不执行后续操作
+        }
+        getYearByTag(tagValue).then(res=>{
+          if(res.code == 200){
+            this.enableYeas = res.data
+            if (this.enableYeas.length > 0) {
+              this.stuYearId = this.enableYeas[0].id
+              // 只有当有数据时才更新会话信息 sessionStorage
+              sessionStorage.setItem('zxjSelectedYear', JSON.stringify({
+                stuYearName: this.enableYeas[0].stuYearName,
+                id: this.enableYeas[0].id
+              }))
+            } else {
+              // 如果没有可用学年，清除 sessionStorage 中的相关数据
+              sessionStorage.removeItem('zxjSelectedYear')
+            }
+          }
+        }).catch(error => {
+          console.error('获取学年信息失败:', error)
+          this.$modal.msgError('获取学年信息失败')
+        })
+            
         },
         //确认选择学年
         yearConfirm(){
@@ -399,7 +429,10 @@ export default {
             this.download('/comprehensive/zxj/apply/export', {
                 ...this.queryParams
             }, `apply_${new Date().getTime()}.xlsx`)
-        }
+        },
+        mounted() {
+          this.listAllStuYear(); //获取所有学年
+        },
     }
 }
 </script>
diff --git a/src/views/stuCQS/basedata/stuyear/index.vue b/src/views/stuCQS/basedata/stuyear/index.vue
index 96717da..9d4684d 100644
--- a/src/views/stuCQS/basedata/stuyear/index.vue
+++ b/src/views/stuCQS/basedata/stuyear/index.vue
@@ -77,7 +77,7 @@
         </template>
       </el-table-column>
       <!-- 在表格中添加标签展示列（在状态列后添加） -->
-  <el-table-column label="模块标签" align="center" prop="moduleTags">
+  <el-table-column label="学年标签" align="center" prop="moduleTags">
     <template slot-scope="scope">
       <dict-tag 
         :options="dict.type.module_tag" 
diff --git a/src/views/stuCQS/good-biye/FdyAll.vue b/src/views/stuCQS/good-biye/FdyAll.vue
index e7920ea..523f46d 100644
--- a/src/views/stuCQS/good-biye/FdyAll.vue
+++ b/src/views/stuCQS/good-biye/FdyAll.vue
@@ -204,7 +204,7 @@
   </div>
 </template>
 <script>
-import { fdyAudit, fdyExport, getStuScoreMajorRank, listFdyAll, listStuSportScore } from '@/api/comprehensive/biyeapply'
+import { fdyAudit, fdyExport, getStuScoreMajorRank, listFdyAll, listStuSportScore,listStuSportScoreByTag } from '@/api/comprehensive/biyeapply'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
 import {
     applyStatus
@@ -462,7 +462,13 @@ export default {
             }
         },
         async listStuSportScore(stuNo) {
-            let res = await listStuSportScore(stuNo)
+            /* let res = await listStuSportScore(stuNo) */
+            /*当前功能是获取'优秀毕业生---YXBY'标签对应学年的体测成绩。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+            const yearTag = 'YXBY'
+            let res = await listStuSportScoreByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.sport_data = [...res.data.filter(x => x.sportScore != 0)]
             }
diff --git a/src/views/stuCQS/good-biye/JwcAll.vue b/src/views/stuCQS/good-biye/JwcAll.vue
index 0e7b5ee..33dd4db 100644
--- a/src/views/stuCQS/good-biye/JwcAll.vue
+++ b/src/views/stuCQS/good-biye/JwcAll.vue
@@ -243,7 +243,7 @@
   </div>
 </template>
 <script>
-import { getStuScoreMajorRank, jwcAudit, jwcExport, listJwcAll, listStuSportScore } from '@/api/comprehensive/biyeapply'
+import { getStuScoreMajorRank, jwcAudit, jwcExport, listJwcAll, listStuSportScore ,listStuSportScoreByTag} from '@/api/comprehensive/biyeapply'
 import { listClass } from '@/api/stuCQS/basedata/class'
 import { listMajors } from '@/api/stuCQS/basedata/majors'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
@@ -574,7 +574,13 @@ export default {
             }
         },
         async listStuSportScore(stuNo) {
-            let res = await listStuSportScore(stuNo)
+            /* let res = await listStuSportScore(stuNo) */
+            /*当前功能是获取'优秀毕业生---YXBY'标签对应学年的体测成绩。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'YXBY'
+            let res = await listStuSportScoreByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.sport_data = [...res.data.filter(x => x.sportScore != 0)]
             }
diff --git a/src/views/stuCQS/good-biye/XwAll.vue b/src/views/stuCQS/good-biye/XwAll.vue
index bcf1f45..d50a78a 100644
--- a/src/views/stuCQS/good-biye/XwAll.vue
+++ b/src/views/stuCQS/good-biye/XwAll.vue
@@ -199,7 +199,7 @@
   </div>
 </template>
 <script>
-import { getStuScoreMajorRank, listStuSportScore, listXwAll, xwExport } from '@/api/comprehensive/biyeapply'
+import { getStuScoreMajorRank, listStuSportScore,listStuSportScoreByTag, listXwAll, xwExport } from '@/api/comprehensive/biyeapply'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
 import {
     applyStatus
@@ -451,7 +451,13 @@ export default {
             }
         },
         async listStuSportScore(stuNo) {
-            let res = await listStuSportScore(stuNo)
+            /* let res = await listStuSportScore(stuNo) */
+            /*当前功能是获取'优秀毕业生---YXBY'标签对应学年的体测成绩。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'YXBY'
+            let res = await listStuSportScoreByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.sport_data = [...res.data.filter(x => x.sportScore != 0)]
             }
diff --git a/src/views/stuCQS/good-biye/fdy.vue b/src/views/stuCQS/good-biye/fdy.vue
index af6ca6e..b72c805 100644
--- a/src/views/stuCQS/good-biye/fdy.vue
+++ b/src/views/stuCQS/good-biye/fdy.vue
@@ -285,6 +285,7 @@ import {
     fdyAudit, getStuScoreMajorRank,
     listFdy,
     listStuSportScore,
+    listStuSportScoreByTag,
     updateBiyeapply
 } from '@/api/comprehensive/biyeapply'
 
@@ -476,7 +477,13 @@ export default {
             }
         },
         async listStuSportScore(stuNo) {
-            let res = await listStuSportScore(stuNo)
+            /* let res = await listStuSportScore(stuNo) */
+            /*当前功能是获取'优秀毕业生---YXBY'标签对应学年的体测成绩。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+            const yearTag = 'YXBY'
+            let res = await listStuSportScoreByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.sport_data = [...res.data.filter(x => x.sportScore != 0)]
             }
diff --git a/src/views/stuCQS/good-biye/jwc.vue b/src/views/stuCQS/good-biye/jwc.vue
index 3baf50c..ab951d0 100644
--- a/src/views/stuCQS/good-biye/jwc.vue
+++ b/src/views/stuCQS/good-biye/jwc.vue
@@ -284,7 +284,7 @@
   </div>
 </template>
 <script>
-import { getStuScoreMajorRank, jwcAudit, listJwc, listStuSportScore, manyAudit } from '@/api/comprehensive/biyeapply'
+import { getStuScoreMajorRank, jwcAudit, listJwc, listStuSportScore,listStuSportScoreByTag, manyAudit } from '@/api/comprehensive/biyeapply'
 import { listClass } from '@/api/stuCQS/basedata/class'
 import { listMajors } from '@/api/stuCQS/basedata/majors'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
@@ -541,7 +541,13 @@ export default {
             }
         },
         async listStuSportScore(stuNo) {
-            let res = await listStuSportScore(stuNo)
+            /* let res = await listStuSportScore(stuNo) */
+            /*当前功能是获取'优秀毕业生---YXBY'标签对应学年的体测成绩。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'YXBY'
+            let res = await listStuSportScoreByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.sport_data = [...res.data.filter(x => x.sportScore != 0)]
             }
diff --git a/src/views/stuCQS/good-biye/want.vue b/src/views/stuCQS/good-biye/want.vue
index f1c1b9d..d90cd92 100644
--- a/src/views/stuCQS/good-biye/want.vue
+++ b/src/views/stuCQS/good-biye/want.vue
@@ -288,9 +288,9 @@
 </template>
 
 <script>
-import { cancelApply, doApply, getOwnStuScoreMajorRank, listOwnApply, listOwnSportScore, reApply } from '@/api/comprehensive/biyeapply'
+import { cancelApply, doApply, getOwnStuScoreMajorRank, listOwnApply, listOwnSportScore,listOwnSportScoreByTag, reApply } from '@/api/comprehensive/biyeapply'
 
-import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
+import { listAllYear as listYear,getYearByTag } from '@/api/stuCQS/basedata/year'
 import lodash from 'lodash'
 
 import { fullLoading, isEmpty } from '@/api/helpFunc'
@@ -457,7 +457,13 @@ export default {
         async lookRankVClick() {
             let loading = fullLoading(this)
             let res = await getOwnStuScoreMajorRank()
-            let res1 = await listOwnSportScore()
+            /* let res1 = await listOwnSportScore() */
+            /*当前功能是获取'优秀毕业生---YXBY'标签对应学年的体测成绩。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'YXBY'
+            let res1 = await listOwnSportScoreByTag(yearTag)
             loading.close()
             if (res.code == 200) {
                 this.rank_data = [res.data]
@@ -555,7 +561,13 @@ export default {
         },
 
         async listStuYear() {
-            let res = await listYear()
+            /* let res = await listYear() */
+            /*当前功能是获取'优秀毕业生---YXBY'标签对应的学年。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+            const yearTag = 'YXBY'
+            let res = await getYearByTag(yearTag)
             if (res.code == 200) {
                 this.year_list = [...res.data]
             }
diff --git a/src/views/stuCQS/good-biye/xw.vue b/src/views/stuCQS/good-biye/xw.vue
index 68c2d7b..29c8dcc 100644
--- a/src/views/stuCQS/good-biye/xw.vue
+++ b/src/views/stuCQS/good-biye/xw.vue
@@ -261,7 +261,7 @@ import { listOwnClass } from '@/api/stuCQS/info-fill/stu_eva_task'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
 import { listSelect } from '@/api/stuCQS/lake/type'
 import {
-    listXw, xwAudit, getStuScoreMajorRank, listStuSportScore, xwManyAudit
+    listXw, xwAudit, getStuScoreMajorRank, listStuSportScore, listStuSportScoreByTag,xwManyAudit
 } from '@/api/comprehensive/biyeapply'
 
 import {
@@ -488,7 +488,13 @@ export default {
             }
         },
         async listStuSportScore(stuNo) {
-            let res = await listStuSportScore(stuNo)
+            /* let res = await listStuSportScore(stuNo) */
+            /*当前功能是获取'优秀毕业生---YXBY'标签对应学年的体测成绩。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'YXBY'
+            let res = await listStuSportScoreByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.sport_data = [...res.data.filter(x => x.sportScore != 0)]
             }
diff --git a/src/views/stuCQS/good-class/stu.vue b/src/views/stuCQS/good-class/stu.vue
index d92d45c..7584ada 100644
--- a/src/views/stuCQS/good-class/stu.vue
+++ b/src/views/stuCQS/good-class/stu.vue
@@ -284,7 +284,7 @@ import { alipayVali } from '@/api/helpFunc/bank'
 
 import { cancelApply, doApply, getOwnClass, listStu, reApply } from '@/api/stuCQS/good-class/newClassGoodApply'
 
-import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
+import { listAllYear as listYear,getYearByTag } from '@/api/stuCQS/basedata/year'
 
 import { getOwnInfo } from '@/api/stuCQS/basedata/student'
 
@@ -450,7 +450,13 @@ export default {
       }
     },
     async listStuYear() {
-      let res = await listYear()
+      /* let res = await listYear() */
+      /*当前功能是获取'先进班集体---XJBJ'标签对应的学年。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'XJBJ'
+            let res = await getYearByTag(yearTag)
       if (res.code == 200) {
         this.year_list = [...res.data]
       }
diff --git a/src/views/stuCQS/good/FdyAll.vue b/src/views/stuCQS/good/FdyAll.vue
index b00ae82..ffeceba 100644
--- a/src/views/stuCQS/good/FdyAll.vue
+++ b/src/views/stuCQS/good/FdyAll.vue
@@ -282,7 +282,7 @@
 </template>
 <script>
 import {
-    listFdyAllAudit as listFdyAudit, lookDetail, listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam, fdyAudit
+    listFdyAllAudit as listFdyAudit, lookDetail, listStuScoreClassRank,listStuScoreClassRankByTag, listStuYearCourseScore, countStuPass, countStuIam, fdyAudit
     , fdyExport, applyStatus, changeApply
 } from '@/api/stuCQS/good/audit'
 import { listOwnClass } from '@/api/stuCQS/info-fill/stu_eva_task'
@@ -633,7 +633,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'评优评先---PYPS'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+            const yearTag = 'PYPS'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/good/MeritStudentCadres.vue b/src/views/stuCQS/good/MeritStudentCadres.vue
index 07c0013..c43d7cc 100644
--- a/src/views/stuCQS/good/MeritStudentCadres.vue
+++ b/src/views/stuCQS/good/MeritStudentCadres.vue
@@ -284,8 +284,8 @@ import {
 } from '@/api/helpFunc'
 import lodash from 'lodash'
 import {
-  listXyjxjCanType, listTermByYear, applyXyjxj, listOwnXyjxjApply, listOwnScoreClassRank
-  , listOwnYearCourseScore, countOwnPass, countOwnIam, getOwnPassCountByCode, getOwnIamCountByCode
+  listXyjxjCanType, listTermByYear, applyXyjxj, listOwnXyjxjApply, listOwnScoreClassRank,listOwnScoreClassRankByTag,
+  listOwnYearCourseScore, countOwnPass, countOwnIam, getOwnPassCountByCode, getOwnIamCountByCode
   , cancelOwnApply
 } from '@/api/stuCQS/good/apply'
 
@@ -492,7 +492,14 @@ export default {
       }
     },
     async listOwnScoreClassRank() {
-      let res = await listOwnScoreClassRank()
+      /* let res = await listOwnScoreClassRank() */
+      /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'评优评先---PYPS'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+      const yearTag = 'PYPS'
+      let res = await listOwnScoreClassRankByTag(yearTag)
       if (res.code == 200) {
         this.score_list = lodash.cloneDeep(res.data)
         console.log(this.score_list)
diff --git a/src/views/stuCQS/good/MeritStudentView.vue b/src/views/stuCQS/good/MeritStudentView.vue
index f949092..160e8f6 100644
--- a/src/views/stuCQS/good/MeritStudentView.vue
+++ b/src/views/stuCQS/good/MeritStudentView.vue
@@ -276,7 +276,7 @@
 </template>
 <script>
 
-import { cancelOwnApply, reApply } from '@/api/stuCQS/good/apply'
+import { cancelOwnApply, reApply,listOwnScoreClassRankByTag } from '@/api/stuCQS/good/apply'
 
 import {
   goodStuApply, getMyApply, getMyGrade, verifyApplySHXS
@@ -466,7 +466,14 @@ export default {
       // 查询我的成绩
       let res = await getMyGrade(this.courseParams)
       let countRes = await countOwnPassOther()
-      let rankList = await listOwnScoreClassRankOther()
+      /* let rankList = await listOwnScoreClassRankOther() */
+      /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'评优评先---PYPS'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+      const yearTag = 'PYPS'
+      let rankList = await listOwnScoreClassRankByTag(yearTag)
       if (countRes.code == 200) {
         this.count_list = [...countRes.data]
       }
@@ -550,7 +557,14 @@ export default {
         this.course_loading = true;
         const res = await getMyGrade(this.courseParams);
         const countRes = await countOwnPassOther();
-        const rankList = await listOwnScoreClassRankOther();
+        /* const rankList = await listOwnScoreClassRankOther(); */
+        /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'评优评先---PYPS'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+      const yearTag = 'PYPS'
+      let rankList = await listOwnScoreClassRankByTag(yearTag)
         if (countRes.code == 200) {
           this.count_list = [...countRes.data];
         }
diff --git a/src/views/stuCQS/good/XwAll.vue b/src/views/stuCQS/good/XwAll.vue
index 2e10516..bcb2e09 100644
--- a/src/views/stuCQS/good/XwAll.vue
+++ b/src/views/stuCQS/good/XwAll.vue
@@ -283,7 +283,7 @@
 </template>
 <script>
 import {
-    listDeptAudit, lookDetail, listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam, deptAudit
+    listDeptAudit, lookDetail, listStuScoreClassRank,listStuScoreClassRankByTag, listStuYearCourseScore, countStuPass, countStuIam, deptAudit
     , xwExport, applyStatus
 } from '@/api/stuCQS/good/audit'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
@@ -604,7 +604,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'评优评先---PYPS'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+            const yearTag = 'PYPS'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/good/all.vue b/src/views/stuCQS/good/all.vue
index a218933..bd933ec 100644
--- a/src/views/stuCQS/good/all.vue
+++ b/src/views/stuCQS/good/all.vue
@@ -360,7 +360,7 @@
 <script>
 import { isEmpty } from '@/api/helpFunc'
 import {
-    listAllAudit, lookDetail, listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam, deptAudit, importJxj,
+    listAllAudit, lookDetail, listStuScoreClassRank,listStuScoreClassRankByTag, listStuYearCourseScore, countStuPass, countStuIam, deptAudit, importJxj,
     importShxs, importYxbg, applyStatus, voidApply, changeApply
 } from '@/api/stuCQS/good/audit'
 import lodash from 'lodash'
@@ -850,7 +850,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'评优评先---PYPS'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+            const yearTag = 'PYPS'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/good/fdy.vue b/src/views/stuCQS/good/fdy.vue
index 39fa3e2..7b6d199 100644
--- a/src/views/stuCQS/good/fdy.vue
+++ b/src/views/stuCQS/good/fdy.vue
@@ -367,7 +367,7 @@ import {
     fdyAudit,
     fdyExport,
     listFdyAudit,
-    listStuScoreClassRank, listStuYearCourseScore,
+    listStuScoreClassRank,listStuScoreClassRankByTag, listStuYearCourseScore,
     lookDetail
 } from '@/api/stuCQS/good/audit'
 import { listOwnClass } from '@/api/stuCQS/info-fill/stu_eva_task'
@@ -745,7 +745,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'评优评先---PYPS'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'PYPS'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/good/jwc.vue b/src/views/stuCQS/good/jwc.vue
index 88b620f..23ecd9a 100644
--- a/src/views/stuCQS/good/jwc.vue
+++ b/src/views/stuCQS/good/jwc.vue
@@ -370,7 +370,7 @@
 import { isEmpty, groupBy } from '@/api/helpFunc'
 import {
     manyAudit,
-    listJwcAudit, lookDetail, listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam, finalAudit
+    listJwcAudit, lookDetail, listStuScoreClassRank,listStuScoreClassRankByTag, listStuYearCourseScore, countStuPass, countStuIam, finalAudit
 } from '@/api/stuCQS/good/audit'
 import lodash from 'lodash'
 
@@ -622,7 +622,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'评优评先---PYPS'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'PYPS'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/good/xw.vue b/src/views/stuCQS/good/xw.vue
index 12786c4..2d2c48f 100644
--- a/src/views/stuCQS/good/xw.vue
+++ b/src/views/stuCQS/good/xw.vue
@@ -260,7 +260,7 @@
 import { isEmpty, groupBy } from '@/api/helpFunc'
 import {
     manyAudit,
-    listXwAudit, lookDetail, listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam, deptAudit
+    listXwAudit, lookDetail, listStuScoreClassRank,listStuScoreClassRankByTag, listStuYearCourseScore, countStuPass, countStuIam, deptAudit
 } from '@/api/stuCQS/good/audit'
 import lodash from 'lodash'
 
@@ -435,7 +435,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'评优评先---PYPS'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'PYPS'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/lake/FdyAll.vue b/src/views/stuCQS/lake/FdyAll.vue
index bb4012c..5032b9c 100644
--- a/src/views/stuCQS/lake/FdyAll.vue
+++ b/src/views/stuCQS/lake/FdyAll.vue
@@ -270,7 +270,7 @@
 </template>
 <script>
 import {
-    lookDetail, listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam
+    lookDetail, listStuScoreClassRank,listStuScoreClassRankByTag, listStuYearCourseScore, countStuPass, countStuIam
     , applyStatus
 } from '@/api/stuCQS/good/audit'
 import { listOwnClass } from '@/api/stuCQS/info-fill/stu_eva_task'
@@ -592,7 +592,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'静湖之星---JHZX'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'JHZX'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/lake/JwcAll.vue b/src/views/stuCQS/lake/JwcAll.vue
index f0ea2d2..c2ebb8d 100644
--- a/src/views/stuCQS/lake/JwcAll.vue
+++ b/src/views/stuCQS/lake/JwcAll.vue
@@ -316,7 +316,7 @@
 </template>
 <script>
 import {
-    listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam
+    listStuScoreClassRank,listStuScoreClassRankByTag, listStuYearCourseScore, countStuPass, countStuIam
     , applyStatus
 } from '@/api/stuCQS/good/audit'
 import { listOwnClass } from '@/api/stuCQS/info-fill/stu_eva_task'
@@ -695,7 +695,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'静湖之星---JHZX'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'JHZX'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/lake/XwAll.vue b/src/views/stuCQS/lake/XwAll.vue
index b257070..1635207 100644
--- a/src/views/stuCQS/lake/XwAll.vue
+++ b/src/views/stuCQS/lake/XwAll.vue
@@ -267,7 +267,7 @@
 </template>
 <script>
 import {
-    listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam
+    listStuScoreClassRank,listStuScoreClassRankByTag,listStuYearCourseScore, countStuPass, countStuIam
     , applyStatus
 } from '@/api/stuCQS/good/audit'
 import { listOwnClass } from '@/api/stuCQS/info-fill/stu_eva_task'
@@ -558,7 +558,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'静湖之星---JHZX'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'JHZX'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/lake/fdy.vue b/src/views/stuCQS/lake/fdy.vue
index fd31485..646ee61 100644
--- a/src/views/stuCQS/lake/fdy.vue
+++ b/src/views/stuCQS/lake/fdy.vue
@@ -371,7 +371,7 @@ import { listSelect } from '@/api/stuCQS/lake/type'
 import { listFdy, fdyAudit, updateLakeapply } from '@/api/stuCQS/lake/apply'
 
 import {
-    listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam, applyStatus
+    listStuScoreClassRank,listStuScoreClassRankByTag,listStuYearCourseScore, countStuPass, countStuIam, applyStatus
 } from '@/api/stuCQS/good/audit'
 
 import lodash from 'lodash'
@@ -663,7 +663,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'静湖之星---JHZX'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'JHZX'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/lake/jwc.vue b/src/views/stuCQS/lake/jwc.vue
index 1ef791c..3418876 100644
--- a/src/views/stuCQS/lake/jwc.vue
+++ b/src/views/stuCQS/lake/jwc.vue
@@ -375,7 +375,7 @@ import { listSelect } from '@/api/stuCQS/lake/type'
 import { listJwc, jwcAudit, manyAudit } from '@/api/stuCQS/lake/apply'
 
 import {
-    listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam, applyStatus
+    listStuScoreClassRank,listStuScoreClassRankByTag ,listStuYearCourseScore, countStuPass, countStuIam, applyStatus
 } from '@/api/stuCQS/good/audit'
 
 import lodash from 'lodash'
@@ -655,7 +655,14 @@ export default {
         },
         async listStuScoreClassRank() {
             let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'静湖之星---JHZX'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'JHZX'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/lake/onehundred.vue b/src/views/stuCQS/lake/onehundred.vue
index 2c1f18f..a4f3ba0 100644
--- a/src/views/stuCQS/lake/onehundred.vue
+++ b/src/views/stuCQS/lake/onehundred.vue
@@ -551,7 +551,7 @@ import { listOneHundred, listSelect } from '@/api/stuCQS/lake/type'
 
 import { applyLake, applyTen, cancelOwnApply, listOwnApply, reApplyLake } from '@/api/stuCQS/lake/apply'
 
-import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
+import { listAllYear as listYear,getYearByTag } from '@/api/stuCQS/basedata/year'
 import {
   countOwnIam,
   countOwnPass,
@@ -559,6 +559,7 @@ import {
   getOwnPassCountByCode,
   getOwnRankByCode,
   listOwnScoreClassRank,
+  listOwnScoreClassRankByTag,
   listOwnYearCourseScore,
   listXyjxjCanType
 } from '@/api/stuCQS/good/apply'
@@ -871,7 +872,14 @@ export default {
             window.open('http://zhxg.gxsdxy.cn/file/jhzx2023.pdf')
         },
         async listStuYear() {
-            let res = await listYear()
+            /* let res = await listYear() */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'静湖之星---JHZX'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+            const yearTag = 'JHZX'
+            let res = await getYearByTag(yearTag)
             if (res.code == 200) {
                 this.year_list = [...res.data]
             }
@@ -1110,7 +1118,14 @@ export default {
             }
         },
         async listOwnScoreClassRank() {
-            let res = await listOwnScoreClassRank()
+            /* let res = await listOwnScoreClassRank() */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'静湖之星---JHZX'标签对应的学年。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'JHZX'
+            let res = await listOwnScoreClassRankByTag(yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }
diff --git a/src/views/stuCQS/lake/xw.vue b/src/views/stuCQS/lake/xw.vue
index df8bdf2..cf8480c 100644
--- a/src/views/stuCQS/lake/xw.vue
+++ b/src/views/stuCQS/lake/xw.vue
@@ -343,7 +343,7 @@ import { listSelect } from '@/api/stuCQS/lake/type'
 import { listXw, xwAudit } from '@/api/stuCQS/lake/apply'
 
 import {
-    listStuScoreClassRank, listStuYearCourseScore, countStuPass, countStuIam
+    listStuScoreClassRank,listStuScoreClassRankByTag, listStuYearCourseScore, countStuPass, countStuIam
     , applyStatus
 } from '@/api/stuCQS/good/audit'
 
@@ -562,8 +562,15 @@ export default {
             }
         },
         async listStuScoreClassRank() {
-            let stuNo = this.auditForm.stuNo
-            let res = await listStuScoreClassRank(stuNo)
+            let stuNo = this.auditForm.stuNo  
+            /* let res = await listStuScoreClassRank(stuNo) */
+            /* 此处使用硬编码，请根据实际情况修改。
+        当前功能是获取'静湖之星---JHZX'标签对应学年的成绩排名信息。
+        涉及到学年标签字典module_tag，需要在字典管理中查询对应的信息。
+        如果在字典管理更改了 学年标签 的信息，此处也要进行相应修改。
+        ---尽量避免学年标签字典的更改!!!! */
+        const yearTag = 'JHZX'
+            let res = await listStuScoreClassRankByTag(stuNo,yearTag)
             if (res.code == 200) {
                 this.score_list = lodash.cloneDeep(res.data)
             }