解决冲突

liuyg

2021-08-14 ff066fb8d926d9a75efdcfdfc1b37f890cd98d82

 src/views/exam/performance.vue

@@ -158,6 +158,7 @@
                trigger: "blur",
              },
            ],
            overHidden:true,
          },
          {
            label: "保安姓名",
@@ -275,30 +276,30 @@
              { validator: validatePass, required: true, trigger: "blur" },
            ],
          },
          // {
          //     label: "总成绩",
          //     prop: "allGrade",
          //     slot: true,
          //     hide:true,
          //     // 表单新增时是否禁止
          //     addDisabled: false,
          //     viewDisplay:false,
          //     // 表单新增时是否可见
          //     addDisplay: false,
          //     // 表单新增时是否为查看模式
          //     addDetail: false,
          //     // 表单编辑时是否禁止
          //     editDisabled: false,
          //     // 表单编辑时是否可见
          //     editDisplay: false,
          //     // 表单编辑时是否为查看模式
          //     editDetail: false,
          //     rules: [{
          //         required: true,
          //         message: "请输入考试名称",
          //         trigger: "blur"
          //     }]
          // },
          {
              label: "总成绩",
              prop: "allGrade",
              slot: true,
              // hide:true,
              // 表单新增时是否禁止
              addDisabled: false,
              viewDisplay:false,
              // 表单新增时是否可见
              addDisplay: false,
              // 表单新增时是否为查看模式
              addDetail: false,
              // 表单编辑时是否禁止
              editDisabled: false,
              // 表单编辑时是否可见
              editDisplay: false,
              // 表单编辑时是否为查看模式
              editDetail: false,
              rules: [{
                  required: true,
                  message: "请输入考试名称",
                  trigger: "blur"
              }]
          },
          {
            label: "是否合格",
            prop: "qualified",
@@ -411,6 +412,7 @@
  methods: {
    questionBankOnLoad(page, params = {}) {
      this.questionBankLoading = false;
      params["examType"] = 1;
      getList(
        page.currentPage,
        page.pageSize,