From 3d3d1d6b4909b3c454a0a877e73fb51103e82b99 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Sat, 21 Aug 2021 09:53:32 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

---
 src/views/trainExam/performance.vue |   27 +++++++++++++++++++++++++--
 1 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index aad8484..8f93899 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -17,6 +17,7 @@
             :search.sync="questionBankSearch"
             :table-loading="questionBankLoading"
             :data="questionBankData"
+            :permission="permissionList"
             ref="questionBankCrud"
             :page.sync="questionBankPage"
             @on-load="questionBankOnLoad"
@@ -27,8 +28,17 @@
             @size-change="questionBankSizeChange"
             @row-update="questionBankRowUpdate"
           >
-            <template slot-scope="{ row }" slot="learnGrade">
+            <template slot-scope="{ row }" slot="theoryGrade">
+              {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
+            </template>
+             <template slot-scope="{ row }" slot="learnGrade">
               {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+            </template>
+            <template slot-scope="{ row }" slot="allGrade">
+              {{ row.allGrade == -1 ? "" : row.allGrade }}
+            </template>
+            <template slot-scope="{ row }" slot="qualified">
+              {{ row.qualified == -1 ? "" : row.qualified==0?"合格":row.qualified==1?"不合格":'' }}
             </template>
 
             <!-- 自定义按钮 -->
@@ -50,6 +60,7 @@
                 size="small"
                 plain
                 icon="el-icon-upload2"
+                v-if="permission.trainExam_performance_import"
                 @click="handleImport"
                 >实操成绩导入
               </el-button>
@@ -82,7 +93,7 @@
 
 <script>
 import { getList, update } from "@/api/examapi/performance";
-
+import { mapGetters } from "vuex";
 export default {
   data() {
     var validatePass = (rule, value, callback) => {
@@ -467,6 +478,18 @@
   },
   created() {},
   mounted() {},
+  computed:{
+    ...mapGetters(["userInfo", "permission"]),
+    permissionList() {
+      return {
+        addBtn: this.vaildData(null, false),
+        viewBtn: this.vaildData(this.permission.trainExam_performance_view, false),
+        delBtn: this.vaildData(null, false),
+        editBtn: this.vaildData(this.permission.trainExam_performance_edit, false),
+        excelBtn: this.vaildData(this.permission.trainExam_performance_export, false),
+      };
+    },
+  },
   methods: {
     questionBankOnLoad(page, params = {}) {
       this.questionBankLoading = false;

--
Gitblit v1.9.3