解决冲突

liuyg

2021-08-14 ff066fb8d926d9a75efdcfdfc1b37f890cd98d82

 src/views/exam/performance.vue

@@ -158,6 +158,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
          },
          {
            label: "保安姓名",
@@ -279,7 +280,7 @@
              label: "总成绩",
              prop: "allGrade",
              slot: true,
              hide:true,
              // hide:true,
              // 表单新增时是否禁止
              addDisabled: false,
              viewDisplay:false,
@@ -411,6 +412,7 @@
  methods: {
    questionBankOnLoad(page, params = {}) {
      this.questionBankLoading = false;
      params["examType"] = 1;
      getList(
        page.currentPage,
        page.pageSize,