bug修改

src/api.js

@@ -208,6 +208,9 @@ export const updateGradingUser = datas => {
 export const deleteGradingUser = userId => {
   return $del(`/api/admin/users/${userId}`);
 };
+export const enableGradingUser = ({ userId, enable }) => {
+  return $post(`/api/admin/users/enable`, { userId, enable });
+};
 // grading-group-manage
 export const gradingGroupList = subjectId => {
   return $get(`/api/marksubjects/${subjectId}/markergroups`, {});

src/modules/grading/GradingUserManage.vue

@@ -41,7 +41,8 @@ import {
   gradingUserList,
   deleteGradingUser,
   resetPwd,
-  subjectDetail
+  subjectDetail,
+  enableGradingUser
 } from "@/api";
 import ModifyGradingUser from "./components/ModifyGradingUser";
 import { ROLE_TYPE, MARKER_RIGHT_TYPE } from "@/constants/enumerate";
@@ -88,6 +89,25 @@ export default {
           title: "权重",
           key: "weight"
         },
+        {
+          title: "启用/禁用",
+          key: "action",
+          width: 120,
+          align: "center",
+          className: "table-action",
+          render: (h, param) => {
+            return h("i", {
+              class:
+                "icon ivu-icon " +
+                (param.row.enabled ? "ivu-icon-enable" : "ivu-icon-disable"),
+              on: {
+                click: () => {
+                  this.toEnable(param.row);
+                }
+              }
+            });
+          }
+        },
         {
           title: "操作",
           key: "action",
@@ -166,6 +186,13 @@ export default {
       });
       return roleNames.join(",");
     },
+    async toEnable(row) {
+      await enableGradingUser({
+        userId: row.id,
+        enable: !row.enabled
+      });
+      row.enabled = !row.enabled;
+    },
     async toResetPwd(row) {
       await resetPwd({ userId: row.id, password: "123456" });
       this.$Message.success("重置密码成功！");

src/modules/main/StudentManage.vue

@@ -346,13 +346,13 @@ export default {
         page: this.current - 1,
         size: this.size
       };
-      if (
-        ((datas.upload || datas.upload === 0) && !datas.subject) ||
-        (!datas.upload && datas.upload !== 0 && datas.subject)
-      ) {
-        this.$Message.error("上传状态和科目必须同时选择！");
-        return;
-      }
+      // if (
+      //   ((datas.upload || datas.upload === 0) && !datas.subject) ||
+      //   (!datas.upload && datas.upload !== 0 && datas.subject)
+      // ) {
+      //   this.$Message.error("上传状态和科目必须同时选择！");
+      //   return;
+      // }
       if (datas.subject === "ALL") datas.subject = null;
       const data = await studentPageList(datas);
       this.students = data.data.map(student => {

src/modules/main/WorkOverview.vue

@@ -125,8 +125,8 @@ export default {
         subject: ""
       },
       uploadUrl: "/api/import/students/missingStudent",
-      downloadManualTemplateUrl: "/templates/考生缺考表-模板.xlsx",
-      downloadManualTemplateFilename: "考生缺考表-模板.xlsx"
+      downloadManualTemplateUrl: "/templates/导入缺考名单-模板.xlsx",
+      downloadManualTemplateFilename: "导入缺考名单-模板.xlsx"
     };
   },
   mounted() {