Просмотр исходного кода

筛选项描述与排序修改为 本科/硕士研究生/博士研究生/教职工

dedsudiyu дней назад: 5
Родитель
Сommit
a73fd05281

+ 4 - 4
src/views/safetyEducationExaminationNew/dataStatistics/components/dataReport/ExamSituation.vue

@@ -15,10 +15,10 @@
         <!-- 分组按钮 -->
         <div class="table-top-button-box">
           <div>
-            <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(3)" :class="checkIndex == 3?'check-table-button':''">本科</p>
+            <p @click="checkButton(2)" :class="checkIndex == 2?'check-table-button':''">硕士研究生</p>
+            <p @click="checkButton(4)" :class="checkIndex == 4?'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>
         <!-- 导出按钮 -->
@@ -187,7 +187,7 @@ export default {
       optionListA:[],
       optionListB:[],
       valueYear:'',
-      checkIndex:2,
+      checkIndex:3,
       queryParams:{
         page:1,
         pageSize:20,

+ 18 - 18
src/views/safetyEducationExaminationNew/dataStatistics/components/dataReport/StudyHourStats.vue

@@ -15,10 +15,10 @@
     <!-- 筛选 -->
     <div class="filter-row">
       <el-select v-model="queryParams.personType" placeholder="用户类型" style="width:220px">
-        <el-option label="研究生" value="2" />
-        <el-option label="本科生" value="3" />
+        <el-option label="硕士研究生" value="2" />
+        <el-option label="本科" value="3" />
+        <el-option label="博士研究生" value="4" />
         <el-option label="教职工" value="1" />
-        <el-option label="博士" value="4" />
       </el-select>
       <!--<el-cascader-->
         <!--v-if="adminType == 1"-->
@@ -187,7 +187,7 @@ export default {
 
       chart.setOption({
         legend: {
-          data: ['研究生', '本科生', '教职工', '博士'],
+          data: ['本科', '硕士研究生', '博士研究生', '教职工'],
           top: 10,
           right: 'center',
           itemWidth: 14,
@@ -239,12 +239,10 @@ export default {
         ],
         series: [
           {
-            name: '研究生',
+            name: '本科',
             type: 'bar',
-            barGap: '10%',
-            barCategoryGap: '40%',
-            data: data.map(d => d.graduateCreditHours),
-            itemStyle: { color: '#5b9cf6' },
+            data: data.map(d => d.undergraduateCreditHours),
+            itemStyle: { color: '#4fbe7e' },
             label: {
               show: true,
               position: 'top',
@@ -254,10 +252,12 @@ export default {
             },
           },
           {
-            name: '本科生',
+            name: '硕士研究生',
             type: 'bar',
-            data: data.map(d => d.undergraduateCreditHours),
-            itemStyle: { color: '#4fbe7e' },
+            barGap: '10%',
+            barCategoryGap: '40%',
+            data: data.map(d => d.graduateCreditHours),
+            itemStyle: { color: '#5b9cf6' },
             label: {
               show: true,
               position: 'top',
@@ -267,10 +267,10 @@ export default {
             },
           },
           {
-            name: '教职工',
+            name: '博士研究生',
             type: 'bar',
-            data: data.map(d => d.staffCreditHours),
-            itemStyle: { color: '#f59e42' },
+            data: data.map(d => d.doctoralCreditsHours),
+            itemStyle: { color: '#00CED1' },
             label: {
               show: true,
               position: 'top',
@@ -280,10 +280,10 @@ export default {
             },
           },
           {
-            name: '博士',
+            name: '教职工',
             type: 'bar',
-            data: data.map(d => d.doctoralCreditsHours),
-            itemStyle: { color: '#00CED1' },
+            data: data.map(d => d.staffCreditHours),
+            itemStyle: { color: '#f59e42' },
             label: {
               show: true,
               position: 'top',

+ 4 - 4
src/views/safetyEducationExaminationNew/dataStatistics/components/dataReport/userListPage.vue

@@ -25,10 +25,10 @@
         <el-form-item label="" prop="personType">
           <div class="table-top-button-box-1">
             <div>
-              <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 = 3" :class="queryParams.personType == 3?'check-table-button':''">本科</p>
+              <p @click="queryParams.personType = 2" :class="queryParams.personType == 2?'check-table-button':''">硕士研究生</p>
+              <p @click="queryParams.personType = 4" :class="queryParams.personType == 4?'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>
@@ -187,7 +187,7 @@
           pageSize:20,
           academicYear:'',
           category:'EXAMED',
-          personType:'2',
+          personType:'3',
           deptId:'',
           examTypeId:'',
           levelIdClassifyTypeId:[],

+ 4 - 4
src/views/safetyEducationExaminationNew/dataStatistics/components/regularExam/ExamSituation.vue

@@ -15,10 +15,10 @@
         <!-- 分组按钮 -->
         <div class="table-top-button-box">
           <div>
-            <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(3)" :class="checkIndex == 3?'check-table-button':''">本科</p>
+            <p @click="checkButton(2)" :class="checkIndex == 2?'check-table-button':''">硕士研究生</p>
+            <p @click="checkButton(4)" :class="checkIndex == 4?'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>
         <!-- 导出按钮 -->
@@ -169,7 +169,7 @@ export default {
       optionListA:[],
       optionListB:[],
       valueYear:'',
-      checkIndex:2,
+      checkIndex:3,
       queryParams:{
         page:1,
         pageSize:20,

+ 18 - 18
src/views/safetyEducationExaminationNew/dataStatistics/components/regularExam/StudyHourStats.vue

@@ -15,10 +15,10 @@
     <!-- 筛选 -->
     <div class="filter-row">
       <el-select v-model="queryParams.personType" placeholder="用户类型" style="width:220px">
-        <el-option label="研究生" value="2" />
-        <el-option label="本科生" value="3" />
+        <el-option label="本科" value="3" />
+        <el-option label="硕士研究生" value="2" />
+        <el-option label="博士研究生" value="4" />
         <el-option label="教职工" value="1" />
-        <el-option label="博士" value="4" />
       </el-select>
       <!--<el-cascader-->
         <!--v-if="adminType == 1"-->
@@ -187,7 +187,7 @@ export default {
 
       chart.setOption({
         legend: {
-          data: ['研究生', '本科生', '教职工', '博士'],
+          data: ['本科', '硕士研究生', '博士研究生', '教职工'],
           top: 10,
           right: 'center',
           itemWidth: 14,
@@ -239,12 +239,10 @@ export default {
         ],
         series: [
           {
-            name: '研究生',
+            name: '本科',
             type: 'bar',
-            barGap: '10%',
-            barCategoryGap: '40%',
-            data: data.map(d => d.graduateCreditHours),
-            itemStyle: { color: '#5b9cf6' },
+            data: data.map(d => d.undergraduateCreditHours),
+            itemStyle: { color: '#4fbe7e' },
             label: {
               show: true,
               position: 'top',
@@ -254,10 +252,12 @@ export default {
             },
           },
           {
-            name: '本科生',
+            name: '硕士研究生',
             type: 'bar',
-            data: data.map(d => d.undergraduateCreditHours),
-            itemStyle: { color: '#4fbe7e' },
+            barGap: '10%',
+            barCategoryGap: '40%',
+            data: data.map(d => d.graduateCreditHours),
+            itemStyle: { color: '#5b9cf6' },
             label: {
               show: true,
               position: 'top',
@@ -267,10 +267,10 @@ export default {
             },
           },
           {
-            name: '教职工',
+            name: '博士研究生',
             type: 'bar',
-            data: data.map(d => d.staffCreditHours),
-            itemStyle: { color: '#f59e42' },
+            data: data.map(d => d.doctoralCreditsHours),
+            itemStyle: { color: '#00CED1' },
             label: {
               show: true,
               position: 'top',
@@ -280,10 +280,10 @@ export default {
             },
           },
           {
-            name: '博士',
+            name: '教职工',
             type: 'bar',
-            data: data.map(d => d.doctoralCreditsHours),
-            itemStyle: { color: '#00CED1' },
+            data: data.map(d => d.staffCreditHours),
+            itemStyle: { color: '#f59e42' },
             label: {
               show: true,
               position: 'top',

+ 4 - 4
src/views/safetyEducationExaminationNew/dataStatistics/components/regularExam/userListPage.vue

@@ -36,10 +36,10 @@
         <el-form-item label="" prop="personType">
           <div class="table-top-button-box-1">
             <div>
-              <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 = 3" :class="queryParams.personType == 3?'check-table-button':''">本科</p>
+              <p @click="queryParams.personType = 2" :class="queryParams.personType == 2?'check-table-button':''">硕士研究生</p>
+              <p @click="queryParams.personType = 4" :class="queryParams.personType == 4?'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>
@@ -171,7 +171,7 @@
           academicYear:'',
           examId:'',
           category:'EXAMED',
-          personType:'2',
+          personType:'3',
           deptId:'',
           account:'',
           examResult:'',

+ 2 - 2
src/views/safetyEducationExaminationNew/publicConfiguration/basicConfiguration/gradingConfiguration.vue

@@ -15,7 +15,7 @@
           <p>后续学年学时要求</p>
         </div>
         <div class="input-box">
-          <p class="input-title-p">本科生</p>
+          <p class="input-title-p">本科</p>
           <div class="input-min-box">
             <el-form-item label="" prop="underInitMinHour">
               <el-input-number
@@ -69,7 +69,7 @@
           </div>
         </div>
         <div class="input-box">
-          <p class="input-title-p">博士生</p>
+          <p class="input-title-p">博士研究生</p>
           <div class="input-min-box">
             <el-form-item label="" prop="phdInitMinHour">
               <el-input-number