zc

src/api/safetyEducationExaminationNew/index.js

@@ -923,6 +923,14 @@ export function examElStatisticsLabListDetail(data) {
     data: data
   })
 }
+//常规考试人员明细
+export function examElStatisticsExamListDetail(data) {
+  return request({
+    url: '/exam/elStatistics/exam/list-detail',
+    method: 'post',
+    data: data
+  })
+}
 //工作台查询考试列表
 export function examUserExamStudyTaskList(data) {
   return request({

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

@@ -110,19 +110,23 @@
           </template>
         </el-table-column>
         <el-table-column label="学习情况" prop="learningStatus" width="160" show-overflow-tooltip/>
-        <el-table-column label="考试成绩" prop="examScore" width="160" show-overflow-tooltip/>
+        <el-table-column label="考试成绩" prop="examScore" width="160" show-overflow-tooltip>
+          <template slot-scope="scope">{{scope.row.examScore?scope.row.examScore:'-'}}</template>
+        </el-table-column>
         <el-table-column label="考试结果" prop="examResult" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span :class="scope.row.examResult == 0 ?'colorC':(scope.row.examResult == 1 ?'colorA':(scope.row.examResult == 2 ?'colorB':''))">
-              {{scope.row.examResult == 0 ?'未考':(scope.row.examResult == 1 ?'通过':(scope.row.examResult == 2 ?'未通过':''))}}
+            <span :class="scope.row.examResult == 0 ?'':(scope.row.examResult == 1 ?'colorA':(scope.row.examResult == 2 ?'colorB':''))">
+              {{scope.row.examResult == 0 ?'-':(scope.row.examResult == 1 ?'通过':(scope.row.examResult == 2 ?'未通过':''))}}
             </span>
           </template>
         </el-table-column>
-        <el-table-column label="补考成绩" prop="makeupScore" width="160" show-overflow-tooltip/>
+        <el-table-column label="补考成绩" prop="makeupScore" width="160" show-overflow-tooltip>
+          <template slot-scope="scope">{{scope.row.makeupScore?scope.row.makeupScore:'-'}}</template>
+        </el-table-column>
         <el-table-column label="补考结果" prop="makeupResult" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span :class="scope.row.makeupResult == 0 ?'colorC':(scope.row.makeupResult == 1 ?'colorA':(scope.row.makeupResult == 2 ?'colorB':''))">
-              {{scope.row.makeupResult == 0 ?'未考':(scope.row.makeupResult == 1 ?'通过':(scope.row.makeupResult == 2 ?'未通过':''))}}
+            <span :class="scope.row.makeupResult == 0 ?'':(scope.row.makeupResult == 1 ?'colorA':(scope.row.makeupResult == 2 ?'colorB':''))">
+              {{scope.row.makeupResult == 0 ?'-':(scope.row.makeupResult == 1 ?'通过':(scope.row.makeupResult == 2 ?'未通过':''))}}
             </span>
           </template>
         </el-table-column>

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

@@ -194,10 +194,11 @@ export default {
     //操作按钮
     tableButton(type,row){
       if(type == 1){
-        this.$set(this, 'drawerTitle', '分级考试人员明细')
+        this.$set(this, 'drawerTitle', '常规考试明细')
         let obj = {
           adminType:this.adminType,
           valueYear:this.valueYear,
+          examId:this.queryParams.examId,
           personType:this.checkIndex,
           deptId:row.deptId,
         }

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

@@ -5,7 +5,7 @@
       <el-form :model="queryParams" class="form-box" ref="queryForm"
                :inline="true" style="width:100%;">
         <el-form-item label="" prop="academicYear">
-          <el-select v-model="queryParams.academicYear" style="width:160px">
+          <el-select v-model="queryParams.academicYear" @change="topChange()" style="width:160px">
             <el-option
               v-for="dict in optionList"
               :key="dict.value"
@@ -14,6 +14,17 @@
             />
           </el-select>
         </el-form-item>
+        <el-form-item label="" prop="examId">
+          <el-select filterable
+                     v-model="queryParams.examId" clearable placeholder="请输入或选择考试名称" style="width: 360px">
+            <el-option
+              v-for="dict in optionListB"
+              :key="dict.examId"
+              :label="dict.examName"
+              :value="dict.examId"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item label="" prop="category">
           <div class="table-top-button-box">
             <div>
@@ -83,19 +94,23 @@
         <!--<el-table-column label="用户类别" prop="deptName" width="160" show-overflow-tooltip/>-->
         <el-table-column label="考试类型" prop="examTypeName" width="160" show-overflow-tooltip/>
         <el-table-column label="学习情况" prop="learningStatus" width="160" show-overflow-tooltip/>
-        <el-table-column label="考试成绩" prop="examScore" width="160" show-overflow-tooltip/>
+        <el-table-column label="考试成绩" prop="examScore" width="160" show-overflow-tooltip>
+          <template slot-scope="scope">{{scope.row.examScore?scope.row.examScore:'-'}}</template>
+        </el-table-column>
         <el-table-column label="考试结果" prop="examResult" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span :class="scope.row.examResult == 0 ?'colorC':(scope.row.examResult == 1 ?'colorA':(scope.row.examResult == 2 ?'colorB':''))">
-              {{scope.row.examResult == 0 ?'未考':(scope.row.examResult == 1 ?'通过':(scope.row.examResult == 2 ?'未通过':''))}}
+            <span :class="scope.row.examResult == 0 ?'':(scope.row.examResult == 1 ?'colorA':(scope.row.examResult == 2 ?'colorB':''))">
+              {{scope.row.examResult == 0 ?'-':(scope.row.examResult == 1 ?'通过':(scope.row.examResult == 2 ?'未通过':''))}}
             </span>
           </template>
         </el-table-column>
-        <el-table-column label="补考成绩" prop="makeupScore" width="160" show-overflow-tooltip/>
+        <el-table-column label="补考成绩" prop="makeupScore" width="160" show-overflow-tooltip>
+          <template slot-scope="scope">{{scope.row.makeupScore?scope.row.makeupScore:'-'}}</template>
+        </el-table-column>
         <el-table-column label="补考结果" prop="makeupResult" width="160" show-overflow-tooltip>
           <template slot-scope="scope">
-            <span :class="scope.row.makeupResult == 0 ?'colorC':(scope.row.makeupResult == 1 ?'colorA':(scope.row.makeupResult == 2 ?'colorB':''))">
-              {{scope.row.makeupResult == 0 ?'未考':(scope.row.makeupResult == 1 ?'通过':(scope.row.makeupResult == 2 ?'未通过':''))}}
+            <span :class="scope.row.makeupResult == 0 ?'':(scope.row.makeupResult == 1 ?'colorA':(scope.row.makeupResult == 2 ?'colorB':''))">
+              {{scope.row.makeupResult == 0 ?'-':(scope.row.makeupResult == 1 ?'通过':(scope.row.makeupResult == 2 ?'未通过':''))}}
             </span>
           </template>
         </el-table-column>
@@ -116,7 +131,8 @@
     laboratoryClassTypeGetList,laboratoryLevelConfigGetLevelTitleList,
   } from "@/api/commonality/permission";
   import {
-    examElExamTypeList,systemDeptCurrentDept,examElStatisticsGetAcademicYear,examElStatisticsExamGroupedChartDetail,
+    examElExamTypeList,systemDeptCurrentDept,examElStatisticsGetAcademicYear,
+    examElStatisticsExamTitleList,examElStatisticsExamListDetail,
   } from "@/api/safetyEducationExaminationNew/index";
   export default {
     name: 'addPage',
@@ -128,11 +144,13 @@
         adminType:0,
         optionList:[],
         optionListA:[],
+        optionListB:[],
         //查询条件
         queryParams:{
           page:1,
           pageSize:20,
           academicYear:'',
+          examId:'',
           category:'EXAMED',
           personType:'2',
           deptId:'',
@@ -157,12 +175,17 @@
       initialize() {
         this.$set(this,'adminType',this.drawerPropsData.adminType);
         this.$set(this.queryParams,'academicYear',this.drawerPropsData.valueYear);
+        this.$set(this.queryParams,'examId',this.drawerPropsData.examId);
         this.$set(this.queryParams,'personType',this.drawerPropsData.personType);
         this.$set(this.queryParams,'deptId',this.drawerPropsData.deptId);
         this.systemDeptCurrentDept();
         this.examElStatisticsGetAcademicYear();
         this.getList();
       },
+      topChange(){
+        this.examElStatisticsExamTitleList();
+        this.$set(this.queryParams,'examId','');
+      },
       //查询按钮
       handleQuery(){
         this.$set(this.queryParams,'page',1);
@@ -174,6 +197,7 @@
           page:1,
           pageSize:20,
           academicYear:this.drawerPropsData.valueYear,
+          examId:this.drawerPropsData.examId,
           category:'EXAMED',
           personType:this.drawerPropsData.personType,
           deptId:this.drawerPropsData.deptId,
@@ -187,7 +211,8 @@
         let obj = {
           page:this.queryParams.page,
           pageSize:this.queryParams.pageSize,
-          academicYear:this.queryParams.valueYear,
+          academicYear:this.queryParams.academicYear,
+          examId:this.queryParams.examId,
           category:this.queryParams.category,
           personType:this.queryParams.personType,
           account:this.queryParams.account,
@@ -199,7 +224,7 @@
         }else{
           obj.deptId = localStorage.getItem('deptId');
         }
-        examElStatisticsExamGroupedChartDetail(obj).then(response => {
+        examElStatisticsExamListDetail(obj).then(response => {
           this.$set(this,'dataList',response.data.records);
           this.$set(this,'total',response.data.total);
         })
@@ -220,6 +245,21 @@
       examElStatisticsGetAcademicYear(){
         examElStatisticsGetAcademicYear({}).then(response => {
           this.$set(this,'optionList',response.data);
+          if(this.queryParams.academicYear){
+            this.examElStatisticsExamTitleList();
+          }
+        });
+      },
+      //查询全部考试类型
+      examElStatisticsExamTitleList(){
+        let obj = {
+          year:this.queryParams.academicYear
+        }
+        if(this.adminType == 2){
+          obj.deptId = localStorage.getItem('deptId');
+        }
+        examElStatisticsExamTitleList(obj).then(response => {
+          this.$set(this,'optionListB',response.data);
         });
       },
     }