Merge branch 'master' into xbnl_20260904(应知应会区分学生/教职工)

src/views/safetyEducationExaminationNew/dataStatistics/LabPersonMatch.vue

@@ -72,47 +72,47 @@
     <!-- 表格 -->
     <div class="page-content-box">
       <el-table class="table-box" :data="tableData" border size="small">
-        <el-table-column prop="deptName" label="学院" >>
+        <el-table-column prop="deptName" label="学院" >
           <template slot-scope="scope">
             <span :style="scope.row.type == 2?'color:#184c93;font-weight:700;':''">{{scope.row.deptName}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="level1Count" label="Ⅰ级人数" width="120" align="center" >>
+        <el-table-column prop="level1Count" label="Ⅰ级人数" width="120" align="center" >
           <template slot-scope="scope">
             <span :style="scope.row.type == 2?'color:#184c93;font-weight:700;':''">{{scope.row.level1Count}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="level2Count" label="Ⅱ级人数" width="120" align="center" >>
+        <el-table-column prop="level2Count" label="Ⅱ级人数" width="120" align="center" >
           <template slot-scope="scope">
             <span :style="scope.row.type == 2?'color:#184c93;font-weight:700;':''">{{scope.row.level2Count}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="level3Count" label="Ⅲ级人数" width="120" align="center" >>
+        <el-table-column prop="level3Count" label="Ⅲ级人数" width="120" align="center" >
           <template slot-scope="scope">
             <span :style="scope.row.type == 2?'color:#184c93;font-weight:700;':''">{{scope.row.level3Count}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="level4Count" label="Ⅳ级人数" width="120" align="center" >>
+        <el-table-column prop="level4Count" label="Ⅳ级人数" width="120" align="center" >
           <template slot-scope="scope">
             <span :style="scope.row.type == 2?'color:#184c93;font-weight:700;':''">{{scope.row.level4Count}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="noLabNeedCount" v-if="checkIndex == 2" label="无需进入实验室人数" width="160" align="center">>
+        <el-table-column prop="noLabNeedCount" v-if="checkIndex == 2" label="无需进入实验室人数" width="160" align="center">
           <template slot-scope="scope">
             <span :style="scope.row.type == 2?'color:#184c93;font-weight:700;':''">{{scope.row.noLabNeedCount}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="unboundCount" v-if="checkIndex == 2" label="未匹配人数" width="140" align="center">>
+        <el-table-column prop="unboundCount" v-if="checkIndex == 2" label="未匹配人数" width="140" align="center">
           <template slot-scope="scope">
             <span :style="scope.row.type == 2?'color:#184c93;font-weight:700;':''">{{scope.row.unboundCount}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="unboundCount" v-if="checkIndex == 3" label="未匹配人数" width="140" align="center">>
+        <el-table-column prop="unboundCount" v-if="checkIndex == 3" label="未匹配人数" width="140" align="center">
           <template slot-scope="scope">
             <span :style="scope.row.type == 2?'color:#184c93;font-weight:700;':''">{{scope.row.unboundCount}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="totalCount" label="总人数" width="140" align="center">>
+        <el-table-column prop="totalCount" label="总人数" width="140" align="center">
           <template slot-scope="scope">
             <span :style="scope.row.type == 2?'color:#184c93;font-weight:700;':''">{{scope.row.totalCount}}</span>
           </template>
@@ -218,7 +218,6 @@ export default {
     //弹窗返回
     drawerReturnButton(){
       this.$set(this, 'drawerType', 0)
-      this.$refs.drawer.closeDrawer();
     },
     //查询当前登录用户身份-校级/院级
     systemUserGetPost(){
@@ -322,7 +321,7 @@ export default {
             // value.max 是三个 series 中的最大值，向上取整到 50 的倍数
             return Math.ceil(value.max / 50) * 50
           },
-          interval: 50,
+          splitNumber:5,
           splitLine: { lineStyle: { color: '#f0f0f0' } },
           axisLabel: { fontSize: 11, color: '#aaa' },
           axisLine: { show: false },

src/views/safetyEducationExaminationNew/dataStatistics/components/dataReport/ExamSituation.vue

@@ -18,6 +18,7 @@
             <p @click="checkButton(2)" :class="checkIndex == 2?'check-table-button':''">研究生</p>
             <p @click="checkButton(3)" :class="checkIndex == 3?'check-table-button':''">本科生</p>
             <p @click="checkButton(1)" :class="checkIndex == 1?'check-table-button':''">教职工</p>
+            <p @click="checkButton(4)" :class="checkIndex == 4?'check-table-button':''">博士</p>
           </div>
         </div>
         <!-- 导出按钮 -->
@@ -233,7 +234,6 @@ export default {
     //弹窗返回
     drawerReturnButton(){
       this.$set(this, 'drawerType', 0)
-      this.$refs.drawer.closeDrawer();
     },
     //查询当前登录用户身份-校级/院级
     systemUserGetPost(){
@@ -359,7 +359,7 @@ export default {
             // value.max 是三个 series 中的最大值，向上取整到 50 的倍数
             return Math.ceil(value.max / 50) * 50
           },
-          interval: 50,
+          splitNumber:5,
           splitLine: { lineStyle: { color: '#f0f0f0' } },
           axisLabel: { fontSize: 11, color: '#aaa' },
           axisLine: { show: false },
@@ -682,7 +682,7 @@ export default {
     align-items: center;
     margin-bottom: 16px;
     .card-title { font-size: 16px; font-weight: 700; color: #222; }
-    .header-right { width:610px;display: flex; align-items: center; gap: 20px; }
+    .header-right { width:690px;display: flex; align-items: center; gap: 20px; }
   }
 
   /* 分组筛选按钮 */
@@ -701,7 +701,8 @@ export default {
         font-size: 14px;
         &:nth-child(1) { border-top-left-radius: 4px; border-bottom-left-radius: 4px; }
         &:nth-child(2) { border-left: none; border-right: none; }
-        &:nth-child(3) { border-top-right-radius: 4px; border-bottom-right-radius: 4px; }
+        &:nth-child(3) { border-right: none; }
+        &:nth-child(4) { border-top-right-radius: 4px; border-bottom-right-radius: 4px; }
       }
       .check-table-button{
         border: 1px solid #0183fa!important;

src/views/safetyEducationExaminationNew/dataStatistics/components/dataReport/StudyHourStats.vue

@@ -18,6 +18,7 @@
         <el-option label="研究生" value="2" />
         <el-option label="本科生" value="3" />
         <el-option label="教职工" value="1" />
+        <el-option label="博士" value="4" />
       </el-select>
       <!--<el-cascader-->
         <!--v-if="adminType == 1"-->
@@ -186,7 +187,7 @@ export default {
 
       chart.setOption({
         legend: {
-          data: ['研究生', '本科生', '教职工'],
+          data: ['研究生', '本科生', '教职工', '博士'],
           top: 10,
           right: 'center',
           itemWidth: 14,
@@ -209,7 +210,7 @@ export default {
           max: (value) => {
             return Math.ceil(value.max / 50) * 50
           },
-          interval: 50,
+          splitNumber:5,
           splitLine: { lineStyle: { color: '#f0f0f0' } },
           axisLabel: { fontSize: 11, color: '#aaa' },
           axisLine: { show: false },
@@ -278,6 +279,19 @@ export default {
               formatter: '{c}',
             },
           },
+          {
+            name: '博士',
+            type: 'bar',
+            data: data.map(d => d.doctoralCreditsHours),
+            itemStyle: { color: '#00CED1' },
+            label: {
+              show: true,
+              position: 'top',
+              fontSize: 11,
+              color: '#555',
+              formatter: '{c}',
+            },
+          },
         ],
         tooltip: {
           trigger: 'axis',

src/views/safetyEducationExaminationNew/dataStatistics/components/dataReport/userListPage.vue

@@ -28,6 +28,7 @@
               <p @click="queryParams.personType = 2" :class="queryParams.personType == 2?'check-table-button':''">研究生</p>
               <p @click="queryParams.personType = 3" :class="queryParams.personType == 3?'check-table-button':''">本科生</p>
               <p @click="queryParams.personType = 1" :class="queryParams.personType == 1?'check-table-button':''">教职工</p>
+              <p @click="queryParams.personType = 4" :class="queryParams.personType == 4?'check-table-button':''">博士</p>
             </div>
           </div>
         </el-form-item>
@@ -35,7 +36,7 @@
           <el-select v-if="adminType == 1"
                      v-model="queryParams.deptId"
                      placeholder="学院"
-                     style="width: 180px">
+                     style="width: 160px">
             <el-option
               v-for="dict in optionListA"
               :key="dict.deptId"
@@ -71,7 +72,7 @@
           <el-select
             v-model="queryParams.examResult"
             placeholder="考试结果"
-            style="width: 150px">
+            style="width: 130px">
             <el-option key="1" label="已通过" value="1"/>
             <el-option key="0" label="未通过" value="0"/>
           </el-select>
@@ -80,7 +81,7 @@
           <el-select
             v-model="queryParams.makeupResult"
             placeholder="补考结果"
-            style="width: 150px">
+            style="width: 130px">
             <el-option key="1" label="已通过" value="1"/>
             <el-option key="0" label="未通过" value="0"/>
           </el-select>
@@ -166,12 +167,14 @@
     data() {
       return {
         exportConfig:{
-          api:'/exam/elStatistics/exam/grouped/chart-detail-export',              //导出接口地址
-          ids:'',                                        //勾选导出,勾选的IDS
-          fileName:'数据报表-人员明细',                         //导出文件的命名
-          customKey:null,                                //自定义参数KEY(非必填)
-          customValue:null,                               //自定义参数VALUE(非必填)
-          screenData:{}                                  //导出筛选数据(非必要-如有该参数组件会显示导出筛选数据按钮)
+          api:'/exam/elStatistics/exam/grouped/chart-detail-export',
+          userIds:'',
+          fileName:'数据报表-人员明细',
+          customKey:null,
+          customValue:null,
+          allData:{},
+          screenData:{},
+          type:1,
         },
         adminType:0,
         optionList:[],
@@ -279,9 +282,14 @@
         })
       },
       setExportConfig(){
+        //全部条件
+        this.exportConfig.allData = {
+          academicYear:this.queryParams.academicYear,
+          examTypeId:this.queryParams.examTypeId,
+          deptId:this.adminType == 1?this.queryParams.deptId:localStorage.getItem('deptId'),
+        };
+        //筛选条件
         this.exportConfig.screenData = {
-          page:this.queryParams.page,
-          pageSize:this.queryParams.pageSize,
           academicYear:this.queryParams.academicYear,
           category:this.queryParams.category,
           personType:this.queryParams.personType,
@@ -337,6 +345,7 @@
           this.formatTreeData(list);
           if(list[0]){
             this.$set(this,'optionListA',list[0].child);
+            this.optionListA.unshift({ deptName:'全部学院', deptId:'' })
           }else{
             this.$set(this,'optionListA',[]);
           }
@@ -421,7 +430,8 @@
             font-size: 14px;
             &:nth-child(1) { border-top-left-radius: 4px; border-bottom-left-radius: 4px; }
             &:nth-child(2) { border-left: none; border-right: none; }
-            &:nth-child(3) { border-top-right-radius: 4px; border-bottom-right-radius: 4px; }
+            &:nth-child(3) { border-right: none; }
+            &:nth-child(4) { border-top-right-radius: 4px; border-bottom-right-radius: 4px; }
           }
           .check-table-button{
             border: 1px solid #0183fa!important;

src/views/safetyEducationExaminationNew/dataStatistics/components/exportComponent/exportComponent.vue

@@ -34,7 +34,8 @@
       <img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAGCAQAAABQ+cdNAAAAAXNSR0IArs4c6QAAAFxJREFUCNdFiLENwCAQxH4SqEDMlCJiB/QHzAINJTOxQNJDnaCAlHNzNrHyB1s+N3aaIg5ofONazNc4UNRcMPBsBpeoichJJPQvdSQnac0L5Bk6shf0zxlUVGeWvWfOMytyOTQwAAAAAElFTkSuQmCC">
     </div>
     <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;color:#333;" :command="{command:3}">导出全部数据</el-dropdown-item>
+      <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;color:#333;" :command="{command:1}">导出全部数据</el-dropdown-item>
+      <el-dropdown-item style="border-bottom:1px solid #E0E0E0;margin:0 10px;color:#333;" :command="{command:3}">导出筛选数据</el-dropdown-item>
       <el-dropdown-item style="margin:0 10px;color:#333;" :command="{command:2}">导出选中数据</el-dropdown-item>
     </el-dropdown-menu>
   </el-dropdown>
@@ -60,21 +61,21 @@
       /** 导出按钮操作 */
       exportButton(item) {
         let self = this;
-        console.log('self.exportConfig.screenData',self.exportConfig.screenData)
         let currentDate=this.getCurrentTime()
         if(item.command == 1){
+          if(self.exportConfig.type == 2){
+            if(!self.exportConfig.allData.examId){
+              this.msgError('请先选择考试并查询')
+              return
+            }
+          }
           self.$confirm(`确认导出全部数据?`, "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"
           }).then(async () => {
-            let obj = {
-              userIds :''
-            }
-            if(self.exportConfig.customKey){
-              obj[self.exportConfig.customKey] = self.exportConfig.customValue
-            }
-            self.download(self.exportConfig.api,obj, self.exportConfig.fileName+currentDate+'.xlsx')
+            let screenData = JSON.parse(JSON.stringify(self.exportConfig.allData))
+            self.download(self.exportConfig.api,screenData, self.exportConfig.fileName+currentDate+'.xlsx')
             if(self.$parent.$refs['table-box']){
               self.$parent.$refs['table-box'].clearSelection();
             }else if(self.$parent.$parent.$refs['table-box']){
@@ -105,7 +106,7 @@
             this.msgError('请勾选数据')
           }
         }else if(item.command == 3){
-          self.$confirm(`确认导出全部数据?`, "提示", {
+          self.$confirm(`确认导出当前筛选条件查出的数据?`, "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
             type: "warning"

src/views/safetyEducationExaminationNew/dataStatistics/components/regularExam/ExamSituation.vue

@@ -18,6 +18,7 @@
             <p @click="checkButton(2)" :class="checkIndex == 2?'check-table-button':''">研究生</p>
             <p @click="checkButton(3)" :class="checkIndex == 3?'check-table-button':''">本科生</p>
             <p @click="checkButton(1)" :class="checkIndex == 1?'check-table-button':''">教职工</p>
+            <p @click="checkButton(4)" :class="checkIndex == 4?'check-table-button':''">博士</p>
           </div>
         </div>
         <!-- 导出按钮 -->
@@ -93,7 +94,11 @@
 
     <div class="page-content-box">
       <el-table class="table-box" :data="dataList" border :span-method="objectSpanMethod">
-        <el-table-column prop="deptName" label="学院" />
+        <el-table-column prop="deptName" label="学院">
+          <template slot-scope="scope">
+            <span :style="scope.row.type == 2?'color:#184c93;font-weight:700;':''">{{scope.row.deptName}}</span>
+          </template>
+        </el-table-column>
         <!--<el-table-column prop="examTypeName" label="考试类型" width="200" />-->
         <el-table-column prop="expectedCount" label="应考人数" width="160" align="center" />
         <el-table-column prop="examCount" label="实考人数" width="160" align="center" />
@@ -210,7 +215,6 @@ export default {
     //弹窗返回
     drawerReturnButton(){
       this.$set(this, 'drawerType', 0)
-      this.$refs.drawer.closeDrawer();
     },
     //查询当前登录用户身份-校级/院级
     systemUserGetPost(){
@@ -286,7 +290,7 @@ export default {
             // value.max 是三个 series 中的最大值，向上取整到 50 的倍数
             return Math.ceil(value.max / 50) * 50
           },
-          interval: 50,
+          splitNumber:5,
           splitLine: { lineStyle: { color: '#f0f0f0' } },
           axisLabel: { fontSize: 11, color: '#aaa' },
           axisLine: { show: false },
@@ -483,7 +487,14 @@ export default {
         obj.deptId = localStorage.getItem('deptId');
       }
       examElStatisticsExamList(obj).then(response => {
-        this.$set(this,'dataList',response.data.records);
+        response.data.schoolSummary.type = 2
+        let list = [];
+        if(this.adminType == 1&&!this.queryParams.deptId){
+          list = response.data.records.concat([response.data.schoolSummary]);
+        }else{
+          list = response.data.records;
+        }
+        this.$set(this,'dataList',list);
         this.$set(this,'total',response.data.total);
       });
     },
@@ -543,7 +554,7 @@ export default {
     align-items: center;
     margin-bottom: 16px;
     .card-title { font-size: 16px; font-weight: 700; color: #222; }
-    .header-right { width:370px;display: flex; align-items: center; gap: 20px; }
+    .header-right { width:450px;display: flex; align-items: center; gap: 20px; }
   }
 
   /* 分组筛选按钮 */
@@ -562,7 +573,8 @@ export default {
         font-size: 14px;
         &:nth-child(1) { border-top-left-radius: 4px; border-bottom-left-radius: 4px; }
         &:nth-child(2) { border-left: none; border-right: none; }
-        &:nth-child(3) { border-top-right-radius: 4px; border-bottom-right-radius: 4px; }
+        &:nth-child(3) { border-right: none; }
+        &:nth-child(4) { border-top-right-radius: 4px; border-bottom-right-radius: 4px; }
       }
       .check-table-button{
         border: 1px solid #0183fa!important;

src/views/safetyEducationExaminationNew/dataStatistics/components/regularExam/StudyHourStats.vue

@@ -18,6 +18,7 @@
         <el-option label="研究生" value="2" />
         <el-option label="本科生" value="3" />
         <el-option label="教职工" value="1" />
+        <el-option label="博士" value="4" />
       </el-select>
       <!--<el-cascader-->
         <!--v-if="adminType == 1"-->
@@ -186,7 +187,7 @@ export default {
 
       chart.setOption({
         legend: {
-          data: ['研究生', '本科生', '教职工'],
+          data: ['研究生', '本科生', '教职工', '博士'],
           top: 10,
           right: 'center',
           itemWidth: 14,
@@ -209,7 +210,7 @@ export default {
           max: (value) => {
             return Math.ceil(value.max / 50) * 50
           },
-          interval: 50,
+          splitNumber:5,
           splitLine: { lineStyle: { color: '#f0f0f0' } },
           axisLabel: { fontSize: 11, color: '#aaa' },
           axisLine: { show: false },
@@ -278,6 +279,19 @@ export default {
               formatter: '{c}',
             },
           },
+          {
+            name: '博士',
+            type: 'bar',
+            data: data.map(d => d.doctoralCreditsHours),
+            itemStyle: { color: '#00CED1' },
+            label: {
+              show: true,
+              position: 'top',
+              fontSize: 11,
+              color: '#555',
+              formatter: '{c}',
+            },
+          },
         ],
         tooltip: {
           trigger: 'axis',

src/views/safetyEducationExaminationNew/dataStatistics/components/regularExam/userListPage.vue

@@ -15,8 +15,8 @@
           </el-select>
         </el-form-item>
         <el-form-item label="" prop="examId">
-          <el-select filterable
-                     v-model="queryParams.examId" clearable placeholder="请输入或选择考试名称" style="width: 300px">
+          <el-select filterable style="width: 280px"
+                     v-model="queryParams.examId" clearable placeholder="请输入或选择考试名称">
             <el-option
               v-for="dict in optionListB"
               :key="dict.examId"
@@ -39,6 +39,7 @@
               <p @click="queryParams.personType = 2" :class="queryParams.personType == 2?'check-table-button':''">研究生</p>
               <p @click="queryParams.personType = 3" :class="queryParams.personType == 3?'check-table-button':''">本科生</p>
               <p @click="queryParams.personType = 1" :class="queryParams.personType == 1?'check-table-button':''">教职工</p>
+              <p @click="queryParams.personType = 4" :class="queryParams.personType == 4?'check-table-button':''">博士</p>
             </div>
           </div>
         </el-form-item>
@@ -59,7 +60,7 @@
           <el-select
             v-model="queryParams.examResult"
             placeholder="考试结果"
-            style="width: 150px">
+            style="width: 130px">
             <el-option key="1" label="已通过" value="1"/>
             <el-option key="0" label="未通过" value="0"/>
           </el-select>
@@ -68,7 +69,7 @@
           <el-select
             v-model="queryParams.makeupResult"
             placeholder="补考结果"
-            style="width: 150px">
+            style="width: 130px">
             <el-option key="1" label="已通过" value="1"/>
             <el-option key="0" label="未通过" value="0"/>
           </el-select>
@@ -150,12 +151,14 @@
     data() {
       return {
         exportConfig:{
-          api:'/exam/elStatistics/exam/list-detail-export',              //导出接口地址
-          ids:'',                                        //勾选导出,勾选的IDS
-          fileName:'常规考试-人员明细',                         //导出文件的命名
-          customKey:null,                                //自定义参数KEY(非必填)
-          customValue:null,                               //自定义参数VALUE(非必填)
-          screenData:{}                                  //导出筛选数据(非必要-如有该参数组件会显示导出筛选数据按钮)
+          api:'/exam/elStatistics/exam/list-detail-export',
+          userIds:'',
+          fileName:'常规考试-人员明细',
+          customKey:null,
+          customValue:null,
+          allData:{},
+          screenData:{},
+          type:2,
         },
         adminType:0,
         optionList:[],
@@ -207,7 +210,7 @@
         this.$set(this.exportConfig,'userIds',selection.map(item => item.userId));
       },
       getRowKeys(row) {
-        return row.userId
+        return row.userId+row.examId
       },
       //查询按钮
       handleQuery(){
@@ -254,9 +257,14 @@
         })
       },
       setExportConfig(){
+        //全部条件
+        this.exportConfig.allData = {
+          academicYear:this.queryParams.academicYear,
+          examId:this.queryParams.examId,
+          deptId:this.adminType == 1?this.queryParams.deptId:localStorage.getItem('deptId'),
+        };
+        //筛选条件
         this.exportConfig.screenData = {
-          page:this.queryParams.page,
-          pageSize:this.queryParams.pageSize,
           academicYear:this.queryParams.academicYear,
           examId:this.queryParams.examId,
           category:this.queryParams.category,
@@ -278,6 +286,7 @@
           this.formatTreeData(list);
           if(list[0]){
             this.$set(this,'optionListA',list[0].child);
+            this.optionListA.unshift({ deptName:'全部学院', deptId:'' })
           }else{
             this.$set(this,'optionListA',[]);
           }
@@ -354,7 +363,8 @@
             font-size: 14px;
             &:nth-child(1) { border-top-left-radius: 4px; border-bottom-left-radius: 4px; }
             &:nth-child(2) { border-left: none; border-right: none; }
-            &:nth-child(3) { border-top-right-radius: 4px; border-bottom-right-radius: 4px; }
+            &:nth-child(3) { border-right: none; }
+            &:nth-child(4) { border-top-right-radius: 4px; border-bottom-right-radius: 4px; }
           }
           .check-table-button{
             border: 1px solid #0183fa!important;

src/views/safetyEducationExaminationNew/dataStatistics/userListPage.vue

@@ -112,12 +112,14 @@
     data() {
       return {
         exportConfig:{
-          api:'/exam/elStatistics/lab/detail-page-export',              //导出接口地址
-          userIds:'',                                        //勾选导出,勾选的IDS
-          fileName:'实验室匹配-人员明细',                         //导出文件的命名
-          customKey:null,                                //自定义参数KEY(非必填)
-          customValue:null,                               //自定义参数VALUE(非必填)
-          screenData:{}                                  //导出筛选数据(非必要-如有该参数组件会显示导出筛选数据按钮)
+          api:'/exam/elStatistics/lab/detail-page-export',
+          userIds:'',
+          fileName:'实验室匹配-人员明细',
+          customKey:null,
+          customValue:null,
+          allData:{},
+          screenData:{},
+          type:3,
         },
         adminType:0,
         optionListA:[],
@@ -208,9 +210,13 @@
         })
       },
       setExportConfig(){
+        //全部条件
+        this.exportConfig.allData = {
+          academicYear:this.queryParams.valueYear,
+          deptId:this.adminType == 1?this.queryParams.deptId:localStorage.getItem('deptId'),
+        };
+        //筛选条件
         this.exportConfig.screenData = {
-          page:this.queryParams.page,
-          pageSize:this.queryParams.pageSize,
           academicYear:this.queryParams.valueYear,
           personType:this.queryParams.personType,
           account:this.queryParams.account,
@@ -226,7 +232,6 @@
         }else{
           this.exportConfig.screenData.deptId = localStorage.getItem('deptId');
         }
-        console.log('')
       },
       //学院列表
       systemDeptCurrentDept(){
@@ -235,6 +240,7 @@
           this.formatTreeData(list);
           if(list[0]){
             this.$set(this,'optionListA',list[0].child);
+            this.optionListA.unshift({ deptName:'全部学院', deptId:'' })
           }else{
             this.$set(this,'optionListA',[]);
           }