From 6c56be7c415ab5c300f8cbcb113acbf5c9af001c Mon Sep 17 00:00:00 2001
From: weishengyou <2454197255@qq.com>
Date: Mon, 12 Jan 2026 17:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E7=BB=BC=E5=90=88=E7=B4=A0=E8=B4=A8?=
 =?UTF-8?q?=E6=9D=BF=E5=9D=97=E7=9A=84=E7=BB=BC=E5=90=88=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=A7=93=E5=90=8D=E3=80=81=E5=AD=A6=E5=8F=B7?=
 =?UTF-8?q?=E3=80=81=E5=AD=A6=E9=99=A2=E3=80=81=E4=B8=93=E4=B8=9A=E3=80=81?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7,=E4=BB=A5=E6=96=B9=E4=BE=BF=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/stuCQS/audit/statistics/index.vue   | 89 ++++++++++++++++--
 src/views/stuCQS/info-fill/ce/index.vue       | 92 ++++++++++++++++---
 src/views/stuCQS/info-fill/classtwo/index.vue | 88 +++++++++++++++---
 src/views/stuCQS/info-fill/iam/index.vue      | 91 +++++++++++++++---
 .../stuCQS/info-fill/iam/initialization.vue   | 78 +++++++++++++++-
 src/views/stuCQS/info-fill/rankings/index.vue | 87 ++++++++++++++++--
 src/views/stuCQS/info-fill/sport/index.vue    | 86 ++++++++++++++---
 7 files changed, 541 insertions(+), 70 deletions(-)

diff --git a/src/views/stuCQS/audit/statistics/index.vue b/src/views/stuCQS/audit/statistics/index.vue
index 3f4fb13..7989c3b 100644
--- a/src/views/stuCQS/audit/statistics/index.vue
+++ b/src/views/stuCQS/audit/statistics/index.vue
@@ -1,11 +1,26 @@
 <template>
   <div v-loading.fullscreen.lock="loading" class="app-container">
     <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
-      <!-- 选择院系 -->
-      <el-form-item label="选择查询" prop="deptId">
-        <el-cascader ref="cas" v-model="class_cas" style="width: 500px;" :options="cascaderData"
-                     :props="{ checkStrictly: true }" clearable filterable @change="handleChange"
-        />
+      <el-form-item label="学院" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择学院" filterable clearable @change="changeDept">
+          <el-option v-for="(v, i) in deptList" :key="i" :label="v.label" :value="v.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="专业" prop="majorId">
+        <el-select v-model="queryParams.majorId" placeholder="请先选择学院再选择专业" filterable clearable @change="changeMajor">
+          <el-option v-for="(v, i) in majorList" :key="i" :label="v.majorName" :value="v.majorId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班级" prop="classId">
+        <el-select v-model="queryParams.classId" placeholder="请先选择专业再选择班级" filterable clearable>
+          <el-option v-for="(v, i) in classList" :key="i" :label="v.className" :value="v.classId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="姓名" prop="stuName">
+        <el-input v-model="queryParams.stuName" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="学号" prop="stuNo">
+        <el-input v-model="queryParams.stuNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <!-- 选择学年 -->
       <el-form-item label="选择学年" prop="stuYearId">
@@ -87,6 +102,10 @@ import * as echarts from 'echarts'
 import { scoreDistribution } from '@/api/stuCQS/statistics'
 import { treeStudent } from '@/api/stuCQS/basedata/student'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
+import { getDeptName } from '@/api/system/dept'
+import { listMajors } from '@/api/stuCQS/basedata/majors'
+import { listClass } from '@/api/stuCQS/basedata/class'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 
 export default {
@@ -143,6 +162,11 @@ export default {
         pageNum: 1,
         pageSize: 10,
         stuYearId: 1,
+        deptId: null,
+        majorId: null,
+        classId: null,
+        stuName: null,
+        stuNo: null
       },
       // 表单参数
       form: {},
@@ -152,17 +176,62 @@ export default {
       stu_year_list: [],
       // 当前分数分布情况
       currentSD: [],
-      isDisabled: false
+      isDisabled: false,
+      
+      deptList: [],//学院列表
+      majorList: [],//专业列表
+      classList: [],//班级列表
+      gradeList: [],//年级列表
     }
   },
   created() {
     //this.getList();
     this.getCascaderData()
     this.getStuYear()
+    this.listDept()
+    this.listGrade()
     //this.getScoreDistribution()
 
   },
   methods: {
+    async listGrade() {
+      let res = await listGrade()
+      this.gradeList = [...res.rows]
+    },
+
+    async listDept() {
+      let res = await getDeptName()
+      this.deptList = [...res.data]
+    },
+    
+    async changeMajor() {
+      if(this.queryParams.majorId) {
+        let sdata = {
+          pageNum: 1,
+          pageSize: 100,
+          majorId: this.queryParams.majorId
+        }
+        let res = await listClass(sdata)
+        this.classList = [...res.rows]
+      } else {
+        this.queryParams.classId = null
+        this.classList = []
+      }
+    },
+    async changeDept() {
+      if(this.queryParams.deptId) {
+        let sdata = {
+          collegeId: this.queryParams.deptId,
+          pageNum: 1,
+          pageSize: 100
+        }
+        let res = await listMajors(sdata)
+        this.majorList = [...res.rows]
+      } else {
+        this.queryParams.majorId = null
+        this.majorList = []
+      }
+    },
     exportChange(value) {
       this.exportForm = {
         ...this.exportForm,
@@ -281,11 +350,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      let cas = this.$refs.cas
-      cas.inputValue = ''
-      this.class_cas = []
-      this.queryParams.classId = null
+      this.queryParams.deptId = null
       this.queryParams.majorId = null
+      this.queryParams.classId = null
+      this.majorList = []
+      this.classList = []
       this.resetForm('queryForm')
       this.handleQuery()
     },
diff --git a/src/views/stuCQS/info-fill/ce/index.vue b/src/views/stuCQS/info-fill/ce/index.vue
index be208ef..50364c4 100644
--- a/src/views/stuCQS/info-fill/ce/index.vue
+++ b/src/views/stuCQS/info-fill/ce/index.vue
@@ -3,10 +3,20 @@
     <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true"
              label-width="100px"
     >
-      <el-form-item label="班级" prop="deptId">
-        <el-cascader ref="cas" v-model="class_cas" style="width: 500px;" :options="cascaderData"
-                     :props="{ checkStrictly: false }" clearable filterable @change="handleChange"
-        />
+      <el-form-item label="学院" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择学院" filterable clearable @change="changeDept">
+          <el-option v-for="(v, i) in deptList" :key="i" :label="v.label" :value="v.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="专业" prop="majorId">
+        <el-select v-model="queryParams.majorId" placeholder="请先选择学院再选择专业" filterable clearable @change="changeMajor">
+          <el-option v-for="(v, i) in majorList" :key="i" :label="v.majorName" :value="v.majorId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班级" prop="classId">
+        <el-select v-model="queryParams.classId" placeholder="请先选择专业再选择班级" filterable clearable>
+          <el-option v-for="(v, i) in classList" :key="i" :label="v.className" :value="v.classId" />
+        </el-select>
       </el-form-item>
       <el-form-item label="学年" prop="stuYearId">
         <el-select v-model="queryParams.stuYearId" placeholder="请选择学年" clearable
@@ -154,6 +164,10 @@ import { isEmpty } from '@/api/helpFunc'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
 import store from '@/store'
 import { listEnableYear } from '@/api/stuCQS/basedata/year'
+import { getDeptName } from '@/api/system/dept'
+import { listMajors } from '@/api/stuCQS/basedata/majors'
+import { listClass } from '@/api/stuCQS/basedata/class'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 
 export default {
@@ -203,6 +217,11 @@ export default {
                 stuId: null,
                 stuYearId: null,
                 ceScore: null,
+                deptId: null,
+                majorId: null,
+                classId: null,
+                name: null,
+                stuNo: null
             },
             // 表单参数
             form: {},
@@ -211,13 +230,20 @@ export default {
             },
             cascaderData: null,
 
-            selectYearList: []
+            selectYearList: [],
+            
+            deptList: [],//学院列表
+            majorList: [],//专业列表
+            classList: [],//班级列表
+            gradeList: [],//年级列表
         }
     },
     created() {
         //this.getList();
         this.listEnableYear()
         this.listAllStuYear()
+        this.listDept()
+        this.listGrade()
         this.getCascaderData()
 
         let temp = store.getters.roles
@@ -229,6 +255,45 @@ export default {
 
     },
     methods: {
+        async listGrade() {
+          this.gradeList = []
+          let res = await listGrade()
+          this.gradeList = [...res.rows]
+        },
+
+        async listDept() {
+          let res = await getDeptName()
+          this.deptList = [...res.data]
+        },
+        
+        async changeMajor() {
+          if(this.queryParams.majorId) {
+            let sdata = {
+              pageNum: 1,
+              pageSize: 100,
+              majorId: this.queryParams.majorId
+            }
+            let res = await listClass(sdata)
+            this.classList = [...res.rows]
+          } else {
+            this.queryParams.classId = null
+            this.classList = []
+          }
+        },
+        async changeDept() {
+          if(this.queryParams.deptId) {
+            let sdata = {
+              collegeId: this.queryParams.deptId,
+              pageNum: 1,
+              pageSize: 100
+            }
+            let res = await listMajors(sdata)
+            this.majorList = [...res.rows]
+          } else {
+            this.queryParams.majorId = null
+            this.majorList = []
+          }
+        },
         async listEnableYear() {
             let res = await listEnableYear()
             if (res.code == 200) {
@@ -248,12 +313,12 @@ export default {
             })
         },
         // 级联选择的项
-        handleChange(value) {
+        /*handleChange(value) {
             this.queryParams = {
                 ...this.queryParams,
                 classId: value[2],
             }
-        },
+        },*/
 
         // 下载申请信息模板
         downloadMode() {
@@ -401,12 +466,13 @@ export default {
         },
         /** 重置按钮操作 */
         resetQuery() {
-            let cas = this.$refs.cas
-            cas.inputValue = ''
-            this.class_cas = []
-            this.queryParams.classId = null
-            this.resetForm('queryForm')
-            this.handleQuery()
+          this.queryParams.deptId = null
+          this.queryParams.majorId = null
+          this.queryParams.classId = null
+          this.majorList = []
+          this.classList = []
+          this.resetForm('queryForm')
+          this.handleQuery()
         },
         // 多选框选中数据
         handleSelectionChange(selection) {
diff --git a/src/views/stuCQS/info-fill/classtwo/index.vue b/src/views/stuCQS/info-fill/classtwo/index.vue
index 8d464a0..cb2375f 100644
--- a/src/views/stuCQS/info-fill/classtwo/index.vue
+++ b/src/views/stuCQS/info-fill/classtwo/index.vue
@@ -1,10 +1,20 @@
 <template>
   <div v-loading.fullscreen.lock="loading" class="app-container">
     <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="100px">
-      <el-form-item label="班级" prop="deptId">
-        <el-cascader ref="cas" v-model="class_cas" style="width: 500px;" :options="cascaderData"
-                     :props="{ checkStrictly: false }" clearable filterable @change="handleChange"
-        />
+      <el-form-item label="学院" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择学院" filterable clearable @change="changeDept">
+          <el-option v-for="(v, i) in deptList" :key="i" :label="v.label" :value="v.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="专业" prop="majorId">
+        <el-select v-model="queryParams.majorId" placeholder="请先选择学院再选择专业" filterable clearable @change="changeMajor">
+          <el-option v-for="(v, i) in majorList" :key="i" :label="v.majorName" :value="v.majorId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班级" prop="classId">
+        <el-select v-model="queryParams.classId" placeholder="请先选择专业再选择班级" filterable clearable>
+          <el-option v-for="(v, i) in classList" :key="i" :label="v.className" :value="v.classId" />
+        </el-select>
       </el-form-item>
       <el-form-item label="学年" prop="stuYearId">
         <el-select v-model="queryParams.stuYearId" placeholder="请选择学年" clearable @keyup.enter.native="handleQuery">
@@ -186,6 +196,10 @@ import { listAllStuYear } from '@/api/stuCQS/info-fill/score'
 import * as XLSX from 'xlsx'
 import { workbook2blob, openDownloadDialog } from '@/api/helpFunc'
 import { listEnableYear } from '@/api/stuCQS/basedata/year'
+import { getDeptName } from '@/api/system/dept'
+import { listMajors } from '@/api/stuCQS/basedata/majors'
+import { listClass } from '@/api/stuCQS/basedata/class'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 
 export default {
@@ -235,6 +249,11 @@ export default {
         material: null,
         description: null,
         auditStatus: null,
+        deptId: null,
+        majorId: null,
+        classId: null,
+        name: null,
+        stuNo: null
       },
       // 表单参数
       form: {},
@@ -265,7 +284,12 @@ export default {
       //附件
       material_list: [],
 
-      selectYearList: []
+      selectYearList: [],
+      
+      deptList: [],//学院列表
+      majorList: [],//专业列表
+      classList: [],//班级列表
+      gradeList: [],//年级列表
     }
   },
   watch: {
@@ -280,14 +304,53 @@ export default {
   created() {
     //this.getList();
     this.listEnableYear()
-
-    this.getStuTree()
     this.getStuYear()
+    this.listDept()
+    this.listGrade()
+    this.getStuTree()
     this.listClassTwoChild()
     this.listAllStuYear()
     this.getCascaderData()
   },
   methods: {
+    async listGrade() {
+      let res = await listGrade()
+      this.gradeList = [...res.rows]
+    },
+
+    async listDept() {
+      let res = await getDeptName()
+      this.deptList = [...res.data]
+    },
+    
+    async changeMajor() {
+      if(this.queryParams.majorId) {
+        let sdata = {
+          pageNum: 1,
+          pageSize: 100,
+          majorId: this.queryParams.majorId
+        }
+        let res = await listClass(sdata)
+        this.classList = [...res.rows]
+      } else {
+        this.queryParams.classId = null
+        this.classList = []
+      }
+    },
+    async changeDept() {
+      if(this.queryParams.deptId) {
+        let sdata = {
+          collegeId: this.queryParams.deptId,
+          pageNum: 1,
+          pageSize: 100
+        }
+        let res = await listMajors(sdata)
+        this.majorList = [...res.rows]
+      } else {
+        this.queryParams.majorId = null
+        this.majorList = []
+      }
+    },
 
     async listEnableYear() {
       let res = await listEnableYear()
@@ -309,12 +372,12 @@ export default {
       })
     },
     // 级联选择的项
-    handleChange(value) {
+    /*handleChange(value) {
       this.queryParams = {
         ...this.queryParams,
         classId: value[2],
       }
-    },
+    },*/
 
     // 下载申请信息模板
     downloadMode() {
@@ -507,10 +570,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      let cas = this.$refs.cas
-      cas.inputValue = ''
-      this.class_cas = []
+      this.queryParams.deptId = null
+      this.queryParams.majorId = null
       this.queryParams.classId = null
+      this.majorList = []
+      this.classList = []
       this.resetForm('queryForm')
       this.handleQuery()
     },
diff --git a/src/views/stuCQS/info-fill/iam/index.vue b/src/views/stuCQS/info-fill/iam/index.vue
index a0c8a1c..c8b9a5c 100644
--- a/src/views/stuCQS/info-fill/iam/index.vue
+++ b/src/views/stuCQS/info-fill/iam/index.vue
@@ -3,10 +3,20 @@
     <el-form v-show="showSearch" ref="queryForm" class="lookForm" :model="queryParams" size="small" :inline="true"
              label-width="68px"
     >
-      <el-form-item label="班级" prop="deptId">
-        <el-cascader ref="cas" v-model="class_cas" style="width: 500px;" :options="cascaderData"
-                     :props="{ checkStrictly: false }" clearable filterable @change="handleChange"
-        />
+      <el-form-item label="学院" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择学院" filterable clearable @change="changeDept">
+          <el-option v-for="(v, i) in deptList" :key="i" :label="v.label" :value="v.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="专业" prop="majorId">
+        <el-select v-model="queryParams.majorId" placeholder="请先选择学院再选择专业" filterable clearable @change="changeMajor">
+          <el-option v-for="(v, i) in majorList" :key="i" :label="v.majorName" :value="v.majorId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班级" prop="classId">
+        <el-select v-model="queryParams.classId" placeholder="请先选择专业再选择班级" filterable clearable>
+          <el-option v-for="(v, i) in classList" :key="i" :label="v.className" :value="v.classId" />
+        </el-select>
       </el-form-item>
       <el-form-item label="学年" prop="stuYearId">
         <el-select v-model="queryParams.stuYearId" placeholder="请选择学年" clearable @keyup.enter.native="handleQuery">
@@ -140,7 +150,10 @@ import { listIamChild } from '@/api/stuCQS/basedata/cphRules'
 import { isEmpty, fullLoading } from '@/api/helpFunc'
 import store from '@/store'
 import { listOwnClass, listOwnStuByClass } from '@/api/stuCQS/info-fill/stu_eva_task'
-
+import { getDeptName } from '@/api/system/dept'
+import { listMajors } from '@/api/stuCQS/basedata/majors'
+import { listClass } from '@/api/stuCQS/basedata/class'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 
 export default {
@@ -176,7 +189,12 @@ export default {
         material: null,
         description: null,
         auditStatus: null,
-        stuYearId: null
+        stuYearId: null,
+        deptId: null,
+        majorId: null,
+        classId: null,
+        name: null,
+        stuNo: null
       },
       // 表单参数
       form: {},
@@ -234,7 +252,11 @@ export default {
       lookCheckForm: {},
       auditList: [],
       recordList: [],
-
+      
+      deptList: [],//学院列表
+      majorList: [],//专业列表
+      classList: [],//班级列表
+      gradeList: [],//年级列表
     }
   },
   watch: {
@@ -248,8 +270,11 @@ export default {
   },
   created() {
     //this.getList();
-    this.getStuTree()
     this.getStuYear()
+    this.listDept()
+    this.listGrade()
+    this.loading = false
+    this.getStuTree()
     this.listIamChild()
     this.getCascaderData()
     let temp = store.getters.roles
@@ -391,12 +416,12 @@ export default {
       })
     },
     // 级联选择的项
-    handleChange(value) {
+    /*handleChange(value) {
       this.queryParams = {
         ...this.queryParams,
         classId: value[2],
       }
-    },
+    },*/
     async changeClass(val) {
       let class_id = val[val.length - 1]
       let res = await getStuByClass(class_id)
@@ -430,6 +455,15 @@ export default {
       return res
     },
 
+    async listDept() {
+      let res = await getDeptName()
+      this.deptList = [...res.data]
+    },
+    async listGrade() {
+      let res = await listGrade()
+      this.gradeList = [...res.rows]
+    },
+
     async listIamChild() {
       let res = await listIamChild()
       this.child_list = [...res.data]
@@ -487,10 +521,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      let cas = this.$refs.cas
-      cas.inputValue = ''
-      this.class_cas = []
+      this.queryParams.deptId = null
+      this.queryParams.majorId = null
       this.queryParams.classId = null
+      this.majorList = []
+      this.classList = []
       this.resetForm('queryForm')
       this.handleQuery()
     },
@@ -558,7 +593,35 @@ export default {
       this.download('system/iam/export', {
         ...this.queryParams
       }, `iam_${new Date().getTime()}.xlsx`)
-    }
+    },
+    async changeMajor() {
+      if(this.queryParams.majorId) {
+        let sdata = {
+          pageNum: 1,
+          pageSize: 100,
+          majorId: this.queryParams.majorId
+        }
+        let res = await listClass(sdata)
+        this.classList = [...res.rows]
+      } else {
+        this.queryParams.classId = null
+        this.classList = []
+      }
+    },
+    async changeDept() {
+      if(this.queryParams.deptId) {
+        let sdata = {
+          collegeId: this.queryParams.deptId,
+          pageNum: 1,
+          pageSize: 100
+        }
+        let res = await listMajors(sdata)
+        this.majorList = [...res.rows]
+      } else {
+        this.queryParams.majorId = null
+        this.majorList = []
+      }
+    },
   }
 }
 </script>
diff --git a/src/views/stuCQS/info-fill/iam/initialization.vue b/src/views/stuCQS/info-fill/iam/initialization.vue
index ae7583f..7c7b132 100644
--- a/src/views/stuCQS/info-fill/iam/initialization.vue
+++ b/src/views/stuCQS/info-fill/iam/initialization.vue
@@ -1,6 +1,24 @@
 <template>
   <div class="app-container">
     <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
+      <el-form-item label="学院" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择学院" filterable clearable @change="changeDept">
+          <el-option v-for="(v, i) in deptList" :key="i" :label="v.label" :value="v.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="专业" prop="majorId">
+        <el-select v-model="queryParams.majorId" placeholder="请先选择学院再选择专业" filterable clearable @change="changeMajor">
+          <el-option v-for="(v, i) in majorList" :key="i" :label="v.majorName" :value="v.majorId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班级" prop="classId">
+        <el-select v-model="queryParams.classId" placeholder="请先选择专业再选择班级" filterable clearable>
+          <el-option v-for="(v, i) in classList" :key="i" :label="v.className" :value="v.classId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="queryParams.name" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
+      </el-form-item>
       <el-form-item label="学号" prop="stuNo">
         <el-input v-model="queryParams.stuNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
@@ -100,6 +118,10 @@
 <script>
 import { listIdeologyscore, getIdeologyscore, delIdeologyscore, addIdeologyscore, updateIdeologyscore, doInit } from '@/api/comprehensive/ideologyscore/ideologyscore'
 import { isEmpty, fullLoading } from '@/api/helpFunc'
+import { getDeptName } from '@/api/system/dept'
+import { listMajors } from '@/api/stuCQS/basedata/majors'
+import { listClass } from '@/api/stuCQS/basedata/class'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 export default {
   name: 'Ideologyscore',
@@ -132,6 +154,10 @@ export default {
         stuYearId: null,
         description: null,
         status: null,
+        deptId: null,
+        majorId: null,
+        classId: null,
+        name: null
       },
       // 表单参数
       form: {},
@@ -140,13 +166,58 @@ export default {
         delFlag: [
           { required: true, message: '删除标记不能为空', trigger: 'blur' }
         ],
-      }
+      },
+      
+      deptList: [],//学院列表
+      majorList: [],//专业列表
+      classList: [],//班级列表
+      gradeList: [],//年级列表
     }
   },
   created() {
     this.getList()
+    this.listDept()
+    this.listGrade()
   },
   methods: {
+    async listGrade() {
+      let res = await listGrade()
+      this.gradeList = [...res.rows]
+    },
+
+    async listDept() {
+      let res = await getDeptName()
+      this.deptList = [...res.data]
+    },
+    
+    async changeMajor() {
+      if(this.queryParams.majorId) {
+        let sdata = {
+          pageNum: 1,
+          pageSize: 100,
+          majorId: this.queryParams.majorId
+        }
+        let res = await listClass(sdata)
+        this.classList = [...res.rows]
+      } else {
+        this.queryParams.classId = null
+        this.classList = []
+      }
+    },
+    async changeDept() {
+      if(this.queryParams.deptId) {
+        let sdata = {
+          collegeId: this.queryParams.deptId,
+          pageNum: 1,
+          pageSize: 100
+        }
+        let res = await listMajors(sdata)
+        this.majorList = [...res.rows]
+      } else {
+        this.queryParams.majorId = null
+        this.majorList = []
+      }
+    },
     async doInit() {
       let loading = fullLoading(this)
       let res = await doInit()
@@ -195,6 +266,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
+      this.queryParams.deptId = null
+      this.queryParams.majorId = null
+      this.queryParams.classId = null
+      this.majorList = []
+      this.classList = []
       this.resetForm('queryForm')
       this.handleQuery()
     },
diff --git a/src/views/stuCQS/info-fill/rankings/index.vue b/src/views/stuCQS/info-fill/rankings/index.vue
index b40b38b..34009ff 100644
--- a/src/views/stuCQS/info-fill/rankings/index.vue
+++ b/src/views/stuCQS/info-fill/rankings/index.vue
@@ -1,13 +1,26 @@
 <template>
   <div v-loading.fullscreen.lock="loading" class="app-container">
     <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="68px">
+      <el-form-item label="学院" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择学院" filterable clearable @change="changeDept">
+          <el-option v-for="(v, i) in deptList" :key="i" :label="v.label" :value="v.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="专业" prop="majorId">
+        <el-select v-model="queryParams.majorId" placeholder="请先选择学院再选择专业" filterable clearable @change="changeMajor">
+          <el-option v-for="(v, i) in majorList" :key="i" :label="v.majorName" :value="v.majorId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班级" prop="classId">
+        <el-select v-model="queryParams.classId" placeholder="请先选择专业再选择班级" filterable clearable>
+          <el-option v-for="(v, i) in classList" :key="i" :label="v.className" :value="v.classId" />
+        </el-select>
+      </el-form-item>
       <el-form-item label="学号" prop="stuNo">
         <el-input v-model="queryParams.stuNo" placeholder="请输入学号" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
-      <el-form-item label="班级" prop="deptId">
-        <el-cascader ref="cas" v-model="queryParams.classId" style="width: 500px;" :options="cascaderData"
-                     :props="{ checkStrictly: false }" clearable filterable @change="handleChange"
-        />
+      <el-form-item label="姓名" prop="xsxm">
+        <el-input v-model="queryParams.xsxm" placeholder="请输入姓名" clearable @keyup.enter.native="handleQuery" />
       </el-form-item>
       <el-form-item label="学年" prop="stuYearId">
         <el-select v-model="queryParams.stuYearId" placeholder="请选择学年" clearable @keyup.enter.native="handleQuery">
@@ -176,6 +189,11 @@ import { treeStudent } from '@/api/stuCQS/basedata/student'
 import * as XLSX from 'xlsx'
 import { isEmpty, isNumber } from '@/api/helpFunc'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
+import { getDeptName } from '@/api/system/dept'
+import { listMajors } from '@/api/stuCQS/basedata/majors'
+import { listClass } from '@/api/stuCQS/basedata/class'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
+
 export default {
   name: 'Rankings',
   data() {
@@ -230,7 +248,10 @@ export default {
         nopass: null,
         status: null,
         createDate: null,
-        updateDate: null
+        updateDate: null,
+        deptId: null,
+        majorId: null,
+        classId: null
       },
       // 表单参数
       form: {},
@@ -246,24 +267,69 @@ export default {
         currentPage: 1,
         pagesize: 10,
         total: 0,
-      }
+      },
+      
+      deptList: [],//学院列表
+      majorList: [],//专业列表
+      classList: [],//班级列表
+      gradeList: [],//年级列表
     }
   },
   created() {
     this.listAllStuYear()
     this.getList()
+    this.listDept()
+    this.listGrade()
     this.getCascaderData()
     this.listAllStuYear()
   },
 
   methods: {
+    async listGrade() {
+      let res = await listGrade()
+      this.gradeList = [...res.rows]
+    },
+
+    async listDept() {
+      let res = await getDeptName()
+      this.deptList = [...res.data]
+    },
+    
+    async changeMajor() {
+      if(this.queryParams.majorId) {
+        let sdata = {
+          pageNum: 1,
+          pageSize: 100,
+          majorId: this.queryParams.majorId
+        }
+        let res = await listClass(sdata)
+        this.classList = [...res.rows]
+      } else {
+        this.queryParams.classId = null
+        this.classList = []
+      }
+    },
+    async changeDept() {
+      if(this.queryParams.deptId) {
+        let sdata = {
+          collegeId: this.queryParams.deptId,
+          pageNum: 1,
+          pageSize: 100
+        }
+        let res = await listMajors(sdata)
+        this.majorList = [...res.rows]
+      } else {
+        this.queryParams.majorId = null
+        this.majorList = []
+      }
+    },
     // 级联选择的项
-    handleChange(value) {
+    /*handleChange(value) {
       this.queryParams = {
         ...this.queryParams,
         classId: value[2],
       }
-    },
+    },*/
     //列出所有学年
     async listAllStuYear() {
       let res = await listYear()
@@ -440,8 +506,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      this.class_cas = []
+      this.queryParams.deptId = null
+      this.queryParams.majorId = null
       this.queryParams.classId = null
+      this.majorList = []
+      this.classList = []
       this.resetForm('queryForm')
       this.handleQuery()
     },
diff --git a/src/views/stuCQS/info-fill/sport/index.vue b/src/views/stuCQS/info-fill/sport/index.vue
index 046b2f8..bf1742c 100644
--- a/src/views/stuCQS/info-fill/sport/index.vue
+++ b/src/views/stuCQS/info-fill/sport/index.vue
@@ -1,10 +1,20 @@
 <template>
   <div v-loading.fullscreen.lock="fullLoading" class="app-container">
     <el-form v-show="showSearch" ref="queryForm" :model="queryParams" size="small" :inline="true" label-width="100px">
-      <el-form-item label="班级" prop="deptId">
-        <el-cascader ref="cas" v-model="class_cas" style="width: 500px;" :options="cascaderData"
-                     :props="{ checkStrictly: false }" clearable filterable @change="handleChange"
-        />
+      <el-form-item label="学院" prop="deptId">
+        <el-select v-model="queryParams.deptId" placeholder="请选择学院" filterable clearable @change="changeDept">
+          <el-option v-for="(v, i) in deptList" :key="i" :label="v.label" :value="v.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="专业" prop="majorId">
+        <el-select v-model="queryParams.majorId" placeholder="请先选择学院再选择专业" filterable clearable @change="changeMajor">
+          <el-option v-for="(v, i) in majorList" :key="i" :label="v.majorName" :value="v.majorId" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班级" prop="classId">
+        <el-select v-model="queryParams.classId" placeholder="请先选择专业再选择班级" filterable clearable>
+          <el-option v-for="(v, i) in classList" :key="i" :label="v.className" :value="v.classId" />
+        </el-select>
       </el-form-item>
       <el-form-item label="学年" prop="stuYearId">
         <el-select v-model="queryParams.stuYearId" placeholder="请选择学年" clearable @keyup.enter.native="handleQuery">
@@ -188,6 +198,10 @@ import { isEmpty,fullLoading } from '@/api/helpFunc'
 import { listAllYear as listYear } from '@/api/stuCQS/basedata/year'
 
 import { listEnableYear } from '@/api/stuCQS/basedata/year'
+import { getDeptName } from '@/api/system/dept'
+import { listMajors } from '@/api/stuCQS/basedata/majors'
+import { listClass } from '@/api/stuCQS/basedata/class'
+import { listGrade } from '@/api/stuCQS/basedata/grade'
 
 export default {
   name: 'SportTest',
@@ -252,6 +266,11 @@ export default {
         stuId: null,
         testScore: null,
         stuYearId: null,
+        deptId: null,
+        majorId: null,
+        classId: null,
+        name: null,
+        stuNo: null
       },
       // 表单参数
       form: {},
@@ -259,7 +278,12 @@ export default {
       rules: {
       },
 
-      selectYearList: []
+      selectYearList: [],
+      
+      deptList: [],//学院列表
+      majorList: [],//专业列表
+      classList: [],//班级列表
+      gradeList: [],//年级列表
     }
   },
   created() {
@@ -267,10 +291,50 @@ export default {
 
     //this.getList();
     this.listAllStuYear()
+    this.listDept()
+    this.listGrade()
     this.getCascaderData()
 
   },
   methods: {
+    async listGrade() {
+      let res = await listGrade()
+      this.gradeList = [...res.rows]
+    },
+
+    async listDept() {
+      let res = await getDeptName()
+      this.deptList = [...res.data]
+    },
+    
+    async changeMajor() {
+      if(this.queryParams.majorId) {
+        let sdata = {
+          pageNum: 1,
+          pageSize: 100,
+          majorId: this.queryParams.majorId
+        }
+        let res = await listClass(sdata)
+        this.classList = [...res.rows]
+      } else {
+        this.queryParams.classId = null
+        this.classList = []
+      }
+    },
+    async changeDept() {
+      if(this.queryParams.deptId) {
+        let sdata = {
+          collegeId: this.queryParams.deptId,
+          pageNum: 1,
+          pageSize: 100
+        }
+        let res = await listMajors(sdata)
+        this.majorList = [...res.rows]
+      } else {
+        this.queryParams.majorId = null
+        this.majorList = []
+      }
+    },
     async listEnableYear() {
       let res = await listEnableYear()
       if (res.code == 200) {
@@ -349,13 +413,12 @@ export default {
       })
     },
     // 级联选择的项
-    handleChange(value) {
+    /*handleChange(value) {
       this.queryParams = {
         ...this.queryParams,
         classId: value[2],
       }
-    },
-
+    },*/
     // 下载申请信息模板
     downloadMode() {
       // 第一个sheet工作簿，如果需要创建多个，对应let多个sheetXdata即可
@@ -498,10 +561,11 @@ export default {
     },
     /** 重置按钮操作 */
     resetQuery() {
-      let cas = this.$refs.cas
-      cas.inputValue = ''
-      this.class_cas = []
+      this.queryParams.deptId = null
+      this.queryParams.majorId = null
       this.queryParams.classId = null
+      this.majorList = []
+      this.classList = []
       this.resetForm('queryForm')
       this.handleQuery()
     },