zc

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>
         <!-- 导出按钮 -->
@@ -681,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; }
   }
 
   /* 分组筛选按钮 */
@@ -700,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,
@@ -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>
@@ -421,7 +422,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/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>
         <!-- 导出按钮 -->
@@ -482,7 +483,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);
       });
     },
@@ -542,7 +550,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; }
   }
 
   /* 分组筛选按钮 */
@@ -561,7 +569,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,
@@ -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>
@@ -354,7 +355,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;