Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises

liuyg

2021-08-21 3d3d1d6b4909b3c454a0a877e73fb51103e82b99

 src/views/exam/subject.vue

@@ -18,6 +18,7 @@
              :table-loading="questionBankLoading"
              :data="questionBankData"
              ref="questionBankCrud"
              :permission="permissionList"
              :page.sync="questionBankPage"
              @on-load="questionBankOnLoad"
              @selection-change="questionBankSelectionChange"
@@ -32,6 +33,7 @@
                  type="primary"
                  size="small"
                  icon="el-icon-plus"
                  v-if="permission.subject_add"
                  @click="questionBankHandleAdd"
                  >新 增
                </el-button>
@@ -40,6 +42,7 @@
                  size="small"
                  plain
                  icon="el-icon-upload2"
                  v-if="permission.subject_import"
                  @click="handleImport"
                  >题库导入
                </el-button>
@@ -47,6 +50,7 @@
                  type="danger"
                  size="small"
                  icon="el-icon-delete"
                   v-if="permission.subject_delete"
                  @click="questionBankHandleDelete"
                  >删 除
                </el-button>
@@ -57,6 +61,7 @@
                  type="text"
                  size="mini"
                  icon="el-icon-edit"
                   v-if="permission.subject_edit"
                  @click="questionBankHandleAdd(row)"
                  >编辑
                </el-button>
@@ -64,6 +69,7 @@
                  type="text"
                  size="mini"
                  icon="el-icon-delete"
                   v-if="permission.subject_delete"
                  @click="questionBankHandleDel(row)"
                  >删除
                </el-button>
@@ -100,7 +106,7 @@
import { getList, remove } from "@/api/examapi/subject";

import addsubject from "./addsubject.vue";

import { mapGetters } from "vuex";
export default {
  components: {
    addsubject,
@@ -243,9 +249,18 @@
      questionBankSelectionList: [],
    };
  },
  created() {},
  mounted() {},
  computed: {
    ...mapGetters(["userInfo", "permission"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.subject_add, false),
        viewBtn: this.vaildData(this.permission.subject_view, false),
        delBtn: this.vaildData(this.permission.subject_delete, false),
        editBtn: this.vaildData(this.permission.subject_edit, false),
        excelBtn: this.vaildData(this.permission.subject_report, false),
      };
    },
    ids() {
      let ids = [];
      this.questionBankSelectionList.forEach((ele) => {