Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_enterprises

shuishen

2021-09-13 b8dfc98b089e47fdb3e269941bbd2de3f7fb7de1

 src/views/trainExam/performance.vue

@@ -38,7 +38,7 @@
              {{ row.allGrade == -1 ? "" : row.allGrade }}
            </template>
            <template slot-scope="{ row }" slot="qualified">
              {{ row.qualified == -1 ? "" : row.qualified==0?"合格":row.qualified==1?"不合格":'' }}
              {{ row.qualified == -1 ? "" : row.qualified==0?"合格":row.qualified==1?"不合格":row.qualified==3?"缺考,成绩无效":'' }}
            </template>

            <!-- 自定义按钮 -->
@@ -64,6 +64,16 @@
                @click="handleImport"
                >实操成绩导入
              </el-button>
            </template>

            <template slot-scope="{ type, size, row }" slot="menu">
                <el-button
                  icon="el-icon-s-flag"
                  @click="absent(row)"
                  :size="size"
                  :type="type"
                  >缺考标记</el-button
                >
            </template>
          </avue-crud>

@@ -92,7 +102,7 @@
</template>

<script>
import { getList, update } from "@/api/examapi/performance";
import { getList, update,updateAbsent } from "@/api/examapi/performance";
import { mapGetters } from "vuex";
import { getRoleDetail } from "@/api/system/role";
export default {
@@ -394,6 +404,10 @@
                label: "暂未录实操成绩",
                value: 2,
              },
              {
                label: "缺考,成绩无效",
                value: 3,
              },
            ],
            // 表单新增时是否禁止
            addDisabled: false,
@@ -506,11 +520,16 @@
            var roleAlias = res.data.data.roleAlias;
            if (
              roleAlias == "保安公司管理员" ||
              roleAlias == "保安" ||
              roleAlias == "未持证保安"
              roleAlias == "保安"
            ) {
              //如果是保安公司管理员
              params["deptId"] = that.userInfo.dept_id;
            }
            if (
              roleAlias == "培训公司管理员"
            ) {
              //如果是培训公司管理员
              params["trainUnitId"] = that.userInfo.dept_id;
            }
            that.questionBankLoading = false;
            params["examType"] = 2;
@@ -529,6 +548,30 @@
      });
      
    },
    //缺考标记
    absent(row, done, loading) {
      this.$confirm("确定缺考标记?", {
        confirmButtonText: "确定",
        cancelButtonText: "取消",
        type: "warning",
      }).then(() => {
        row.qualified = 3;
        updateAbsent(row).then(
          () => {
            this.onLoad(this.page);
            this.$message({
              type: "success",
              message: "操作成功!",
            });
            done();
          },
          (error) => {
            window.console.log(error);
            loading();
          }
        );
      });
    },
    questionBankSelectionClear() {
      this.questionBankSelectionList = [];
      this.$refs.questionBankCrud.toggleSelection();