Merge branch 'master' into SCHOOL-XiBeiNongLin

src/api/safetyEducationExaminationNew/index.js

@@ -1,5 +1,12 @@
 import request from '@/utils/request'
-
+// 分页查询考试专业
+export function examElExamResultScorePageType(data) {
+  return request({
+    url: '/exam/elExamResult/score-page_type',
+    method: 'post',
+    data: data
+  })
+}
 // 分页查询证书模板
 export function examElCertificateTemplatePage(data) {
   return request({

src/views/safetyEducationExaminationNew/examManagement/examinationResult/academicPerformance.vue

@@ -4,12 +4,12 @@
     <div class="page-form-title-box">
       <el-form :model="queryParams" class="form-box" ref="queryForm"
                :inline="true" style="width:100%;">
-        <el-form-item label="" prop="passStatus">
-          <el-select v-model="queryParams.passStatus" placeholder="是否完成" style="width: 120px">
-            <el-option label="已完成" value="1"/>
-            <el-option label="未完成" value="0"/>
-          </el-select>
-        </el-form-item>
+        <!--<el-form-item label="" prop="passStatus">-->
+          <!--<el-select v-model="queryParams.passStatus" placeholder="是否完成" style="width: 120px">-->
+            <!--<el-option label="已完成" value="1"/>-->
+            <!--<el-option label="未完成" value="0"/>-->
+          <!--</el-select>-->
+        <!--</el-form-item>-->
         <el-form-item label="" prop="deptId">
           <el-cascader
             style="width: 180px"
@@ -27,10 +27,10 @@
             placeholder="学院单位"
           ></el-cascader>
         </el-form-item>
-        <el-form-item label="" prop="searchValue">
+        <el-form-item label="" prop="keyword">
           <el-input
             maxLength="30"
-            v-model="queryParams.searchValue"
+            v-model="queryParams.keyword"
             placeholder="姓名/学工号"
             style="width: 240px"
           />
@@ -52,11 +52,11 @@
         </el-table-column>
         <el-table-column label="学时" prop="rewardCreditHours" width="200" show-overflow-tooltip/>
         <el-table-column label="积分" prop="rewardPoints" width="200" show-overflow-tooltip/>
-        <el-table-column label="是否完成" prop="passStatus" width="200" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span>{{ scope.row.passStatus == 1?'已完成':'未完成' }}</span>
-          </template>
-        </el-table-column>
+        <!--<el-table-column label="是否完成" prop="passStatus" width="200" show-overflow-tooltip>-->
+          <!--<template slot-scope="scope">-->
+            <!--<span>{{ scope.row.passStatus == 1?'已完成':'未完成' }}</span>-->
+          <!--</template>-->
+        <!--</el-table-column>-->
       </el-table>
       <pagination :page-sizes="[20, 30, 40, 50]"
                   v-show="total>0"
@@ -91,7 +91,7 @@
           disciplineId :null,
           userType :null,
           passStatus :null,
-          searchValue :'',
+          keyword :'',
         },
         //列表数据
         dataList:[],
@@ -135,7 +135,7 @@
           disciplineId :null,
           userType :null,
           passStatus :null,
-          searchValue :'',
+          keyword :'',
         });
         this.getList();
       },

src/views/safetyEducationExaminationNew/examManagement/examinationResult/viewGrades.vue

@@ -35,9 +35,9 @@
           <el-select v-model="queryParams.disciplineId" placeholder="专业" style="width: 140px">
             <el-option
               v-for="dict in optionListC"
-              :key="dict.id"
+              :key="dict.disciplineId"
               :label="dict.disciplineName"
-              :value="dict.id"
+              :value="dict.disciplineId"
             />
           </el-select>
         </el-form-item>
@@ -129,7 +129,7 @@
 <script>
   import {
     systemUserGetCategories,systemUserGetAcademicYear,
-    examElExamResultScorePage,examElDisciplineTypeList,systemDeptCurrentDept,
+    examElExamResultScorePage,examElExamResultScorePageType,systemDeptCurrentDept,
   } from "@/api/safetyEducationExaminationNew/index";
   import examDetails from '@/views/safetyEducationExaminationNew/components/examDetails.vue'
   export default {
@@ -175,7 +175,7 @@
     },
     mounted() {
       this.getList();
-      this.examElDisciplineTypeList();
+      this.examElExamResultScorePageType();
       this.systemDeptCurrentDept();
       this.systemUserGetCategories();
       this.systemUserGetAcademicYear();
@@ -233,8 +233,8 @@
         });
       },
       //查询全部专业类别
-      examElDisciplineTypeList(){
-        examElDisciplineTypeList({}).then(response => {
+      examElExamResultScorePageType(){
+        examElExamResultScorePageType({examId:this.drawerPropsData.examId}).then(response => {
           this.$set(this,'optionListC',response.data);
         });
       },

src/views/safetyEducationExaminationNew/workbench/UserInfoCard.vue

@@ -291,7 +291,10 @@ export default {
     examElLabEduRelationBindStatus(){
       examElLabEduRelationBindStatus({}).then(response => {
         this.$set(this, 'userInfo', response.data)
-        if(!response.data.bound&&response.data.educationType == 1){
+        // if(!response.data.bound&&response.data.educationType == 1){
+        //   this.shadeButton(5);
+        // }
+        if(response.data.isPopup){
           this.shadeButton(5);
         }
       })