md

dev-proxy.copy.js

@@ -1,9 +0,0 @@
-module.exports = {
-  "/api/": {
-    target: "http://192.168.10.239:9888",
-    changeOrigin: true
-    // pathRewrite: {
-    //   "^/api": "/"
-    // }
-  }
-};

src/App.vue

@@ -12,8 +12,8 @@ export default {
   mixins: [timeMixin],
   data() {
     return {
-      // unactiveTime: 0,
-      unactiveTime: 10 * 60 * 1000,
+      unactiveTime: 0,
+      // unactiveTime: 10 * 60 * 1000,
       timeIsOut: false
     };
   },

src/api.js

@@ -140,6 +140,7 @@ export const updateSubject = datas => {
 export const enableSubject = subjectId => {
   return $post(`/api/marksubjects/${subjectId}/updateEnable`, {});
 };
+
 // param-set
 export const getParamsSet = workId => {
   return $get("/api/param/getParam", { workId });
@@ -156,6 +157,9 @@ export const updateCollectParams = datas => {
 export const updateLevelParams = datas => {
   return $post("/api/param/level", datas);
 };
+export const enableSubjectUsers = subjectId => {
+  return $post(`/api/marksubjects/${subjectId}/updateUserEnable`, {});
+};
 // update-paper
 // grading-rule-set
 

src/assets/styles/base.less

@@ -309,17 +309,20 @@ tr.tr-tips-error td {
   margin-bottom: 20px;
   text-align: center;
 
-  th {
-    padding: 10px;
-    line-height: 20px;
-    letter-spacing: 1px;
-    border: 1px solid @border-color-base-light;
-  }
-  td {
-    padding: 10px;
-    line-height: 20px;
-    border: 1px solid @border-color-base-light;
+  tr{
+    th {
+      padding: 10px;
+      line-height: 20px;
+      letter-spacing: 1px;
+      border: 1px solid @border-color-base-light;
+    }
+    td {
+      padding: 10px;
+      line-height: 20px;
+      border: 1px solid @border-color-base-light;
+    }
   }
+
 }
 
 /* list */

src/modules/grading-set/GradingRuleSet.vue

@@ -1,168 +1,219 @@
 <template>
-  <div class="grading-rule-set part-box">
-    <Form
-      ref="modalFormComp"
-      :model="modalForm"
-      :rules="rules"
-      :label-width="230"
-      style="width: 400px;"
-    >
-      <FormItem prop="deviation" label="仲裁档位差：">
-        <InputNumber
-          v-model="modalForm.deviation"
-          :min="1"
-          :max="100"
-          :disabled="!modalFormCanEdit"
-          style="width: 160px;"
-        ></InputNumber>
-      </FormItem>
-      <FormItem label="系统自动打回：">
-        <Select
-          v-model="modalForm.autoCallback"
-          :disabled="!modalFormCanEdit"
-          placeholder="请选择"
-        >
-          <Option
-            v-for="(val, key) in BOOLEAN_TYPE"
-            :key="key"
-            :value="key * 1"
-            :label="val"
-          ></Option>
-        </Select>
-      </FormItem>
-      <FormItem
-        v-if="modalForm.autoCallback"
-        prop="cumulativeError"
-        label="打回累计误差："
-      >
-        <InputNumber
-          v-model="modalForm.cumulativeError"
-          :min="1"
-          :max="100"
-          :disabled="!modalFormCanEdit"
-          style="width: 160px;"
-        ></InputNumber>
-      </FormItem>
-      <FormItem v-if="modalForm.autoCallback" label="打回是否显示偏差方向：">
-        <Select
-          v-model="modalForm.autoCallbackShowDeviation"
-          :disabled="!modalFormCanEdit"
-          placeholder="请选择"
-        >
-          <Option
-            v-for="(val, key) in BOOLEAN_TYPE"
-            :key="key"
-            :value="key * 1"
-            :label="val"
-          ></Option>
-        </Select>
-      </FormItem>
-      <FormItem label="是否过半定档：">
-        <Select
-          v-model="modalForm.majority"
-          :disabled="!modalFormCanEdit"
-          placeholder="请选择"
-        >
-          <Option
-            v-for="(val, key) in BOOLEAN_TYPE"
-            :key="key"
-            :value="key * 1"
-            :label="val"
-          ></Option>
-        </Select>
-      </FormItem>
-      <FormItem label="是否开启取优原则：">
-        <Select
-          v-model="modalForm.takeBest"
-          :disabled="!modalFormCanEdit"
-          placeholder="请选择"
-        >
-          <Option
-            v-for="(val, key) in BOOLEAN_TYPE"
-            :key="key"
-            :value="key * 1"
-            :label="val"
-          ></Option>
-        </Select>
-      </FormItem>
-      <FormItem label="阅卷员是否显示所有试卷：">
-        <Select
-          v-model="modalForm.levelShowAllPaper"
-          :disabled="!modalFormCanEdit"
-          placeholder="请选择"
-        >
-          <Option
-            v-for="(val, key) in BOOLEAN_TYPE"
-            :key="key"
-            :value="key * 1"
-            :label="val"
-          ></Option>
-        </Select>
-      </FormItem>
-      <FormItem label="是否显示试卷数量：">
-        <Select
-          v-model="modalForm.showPaperCount"
-          :disabled="!modalFormCanEdit"
-          placeholder="请选择"
-        >
-          <Option
-            v-for="(val, key) in BOOLEAN_TYPE"
-            :key="key"
-            :value="key * 1"
-            :label="val"
-          ></Option>
-        </Select>
-      </FormItem>
-      <FormItem label="档位百分比分母：">
-        <Select
-          v-model="modalForm.propDenominator"
-          :disabled="!modalFormCanEdit"
-          placeholder="请选择"
-        >
-          <Option
-            v-for="(val, key) in PROP_DENOMINATOR_TYPE"
-            :key="key"
-            :value="key * 1"
-            :label="val"
-          ></Option>
-        </Select>
-      </FormItem>
-      <FormItem label="是否显示标准卷：">
-        <Select
-          v-model="modalForm.showSample"
-          :disabled="!modalFormCanEdit"
-          placeholder="请选择"
-        >
-          <Option
-            v-for="(val, key) in BOOLEAN_TYPE"
-            :key="key"
-            :value="key * 1"
-            :label="val"
-          ></Option>
-        </Select>
-      </FormItem>
-      <FormItem>
-        <Button
-          shape="circle"
-          style="width: 80px;"
-          @click="modalFormCanEdit = true"
-          >编辑</Button
-        >
-        <Button
-          type="primary"
-          shape="circle"
-          style="width: 80px;"
-          :disabled="isSubmit"
-          @click="submit"
-          >保存</Button
-        >
-      </FormItem>
-    </Form>
+  <div class="grading-rule-set">
+    <Row :gutter="20" type="flex">
+      <Col span="12">
+        <div class="part-box mb-0">
+          <Form
+            ref="modalFormComp"
+            :model="modalForm"
+            :rules="rules"
+            :label-width="230"
+            style="width: 400px;"
+          >
+            <FormItem prop="deviation" label="仲裁档位差：">
+              <InputNumber
+                v-model="modalForm.deviation"
+                :min="1"
+                :max="100"
+                :disabled="!modalFormCanEdit"
+                style="width: 160px;"
+              ></InputNumber>
+            </FormItem>
+            <FormItem label="系统自动打回：">
+              <Select
+                v-model="modalForm.autoCallback"
+                :disabled="!modalFormCanEdit"
+                placeholder="请选择"
+              >
+                <Option
+                  v-for="(val, key) in BOOLEAN_TYPE"
+                  :key="key"
+                  :value="key * 1"
+                  :label="val"
+                ></Option>
+              </Select>
+            </FormItem>
+            <FormItem
+              v-if="modalForm.autoCallback"
+              prop="cumulativeError"
+              label="打回累计误差："
+            >
+              <InputNumber
+                v-model="modalForm.cumulativeError"
+                :min="1"
+                :max="100"
+                :disabled="!modalFormCanEdit"
+                style="width: 160px;"
+              ></InputNumber>
+            </FormItem>
+            <FormItem
+              v-if="modalForm.autoCallback"
+              label="打回是否显示偏差方向："
+            >
+              <Select
+                v-model="modalForm.autoCallbackShowDeviation"
+                :disabled="!modalFormCanEdit"
+                placeholder="请选择"
+              >
+                <Option
+                  v-for="(val, key) in BOOLEAN_TYPE"
+                  :key="key"
+                  :value="key * 1"
+                  :label="val"
+                ></Option>
+              </Select>
+            </FormItem>
+            <FormItem label="是否过半定档：">
+              <Select
+                v-model="modalForm.majority"
+                :disabled="!modalFormCanEdit"
+                placeholder="请选择"
+              >
+                <Option
+                  v-for="(val, key) in BOOLEAN_TYPE"
+                  :key="key"
+                  :value="key * 1"
+                  :label="val"
+                ></Option>
+              </Select>
+            </FormItem>
+            <FormItem label="是否开启取优原则：">
+              <Select
+                v-model="modalForm.takeBest"
+                :disabled="!modalFormCanEdit"
+                placeholder="请选择"
+              >
+                <Option
+                  v-for="(val, key) in BOOLEAN_TYPE"
+                  :key="key"
+                  :value="key * 1"
+                  :label="val"
+                ></Option>
+              </Select>
+            </FormItem>
+            <FormItem label="阅卷员是否显示所有试卷：">
+              <Select
+                v-model="modalForm.levelShowAllPaper"
+                :disabled="!modalFormCanEdit"
+                placeholder="请选择"
+              >
+                <Option
+                  v-for="(val, key) in BOOLEAN_TYPE"
+                  :key="key"
+                  :value="key * 1"
+                  :label="val"
+                ></Option>
+              </Select>
+            </FormItem>
+            <FormItem label="是否显示试卷数量：">
+              <Select
+                v-model="modalForm.showPaperCount"
+                :disabled="!modalFormCanEdit"
+                placeholder="请选择"
+              >
+                <Option
+                  v-for="(val, key) in BOOLEAN_TYPE"
+                  :key="key"
+                  :value="key * 1"
+                  :label="val"
+                ></Option>
+              </Select>
+            </FormItem>
+            <FormItem label="档位百分比分母：">
+              <Select
+                v-model="modalForm.propDenominator"
+                :disabled="!modalFormCanEdit"
+                placeholder="请选择"
+              >
+                <Option
+                  v-for="(val, key) in PROP_DENOMINATOR_TYPE"
+                  :key="key"
+                  :value="key * 1"
+                  :label="val"
+                ></Option>
+              </Select>
+            </FormItem>
+            <FormItem label="是否显示标准卷：">
+              <Select
+                v-model="modalForm.showSample"
+                :disabled="!modalFormCanEdit"
+                placeholder="请选择"
+              >
+                <Option
+                  v-for="(val, key) in BOOLEAN_TYPE"
+                  :key="key"
+                  :value="key * 1"
+                  :label="val"
+                ></Option>
+              </Select>
+            </FormItem>
+            <FormItem label="是否允许任务数累加：">
+              <Select
+                v-model="modalForm.taskCumsum"
+                :disabled="!modalFormCanEdit"
+                placeholder="请选择"
+              >
+                <Option
+                  v-for="(val, key) in BOOLEAN_TYPE"
+                  :key="key"
+                  :value="key * 1"
+                  :label="val"
+                ></Option>
+              </Select>
+            </FormItem>
+            <FormItem>
+              <Button
+                shape="circle"
+                style="width: 80px;"
+                @click="modalFormCanEdit = true"
+                >编辑</Button
+              >
+              <Button
+                type="primary"
+                shape="circle"
+                style="width: 80px;"
+                :disabled="isSubmit"
+                @click="submit"
+                >保存</Button
+              >
+            </FormItem>
+          </Form>
+        </div>
+      </Col>
+      <Col span="12">
+        <div class="part-box mb-0">
+          <h2 class="part-title">账号启用/禁用</h2>
+          <table class="table" style="width: 200px">
+            <tr v-for="(subject, index) in subjects" :key="index">
+              <td>
+                {{ subject.name }}
+              </td>
+              <td class="table-action">
+                <i
+                  type="text"
+                  :class="[
+                    'icon ivu-icon',
+                    subject.enable ? 'ivu-icon-enable' : 'ivu-icon-disable'
+                  ]"
+                  @click="toAble(subject)"
+                >
+                </i>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </Col>
+    </Row>
   </div>
 </template>
 
 <script>
-import { getParamsSet, updateLevelParams } from "@/api";
+import {
+  getParamsSet,
+  updateLevelParams,
+  subjectList,
+  enableSubjectUsers
+} from "@/api";
 import { BOOLEAN_TYPE, PROP_DENOMINATOR_TYPE } from "@/constants/enumerate";
 import { numberValidator } from "@/plugins/formRules";
 
@@ -185,19 +236,22 @@ export default {
         levelShowAllPaper: 0,
         showPaperCount: 1,
         propDenominator: 1,
-        showSample: 1
+        showSample: 1,
+        taskCumsum: 0
       },
       modalFormCanEdit: false,
       modalForm: {},
       rules: {
         deviation: numberValidator("请输入仲裁档位差"),
         cumulativeError: numberValidator("请输入打回累计误差")
-      }
+      },
+      subjects: []
     };
   },
   mounted() {
     this.modalForm = { ...this.initModalForm };
     this.getParamsSetInfo();
+    this.getSubjectList();
   },
   methods: {
     async getParamsSetInfo() {
@@ -219,6 +273,25 @@ export default {
       if (!result) return;
       this.modalFormCanEdit = false;
       this.$Message.success("保存成功！");
+    },
+    async getSubjectList() {
+      const data = await subjectList(this.workId);
+      this.subjects = data.map(item => {
+        return {
+          ...item,
+          enable: true
+        };
+      });
+    },
+    toAble(row) {
+      const actionName = row.enable ? "禁用" : "启用";
+      this.$Modal.confirm({
+        content: `确定要${actionName}${row.name}科目下所有账号吗？`,
+        onOk: async () => {
+          await enableSubjectUsers(row.id);
+          row.enable = !row.enable;
+        }
+      });
     }
   }
 };

vue.config.js

@@ -1,19 +1,20 @@
-var webpack = require("webpack");
+// var webpack = require("webpack");
 var TerserPlugin = require("terser-webpack-plugin");
 var CompressionPlugin = require("compression-webpack-plugin");
-var devProxy = {};
-try {
-  devProxy = require("./dev-proxy");
-} catch (error) {}
-
-var proxy = process.env.NODE_ENV === "production" ? {} : devProxy;
+var devProxy = {
+  "/api/": {
+    target: process.env.VUE_APP_DEV_PROXY,
+    changeOrigin: true
+  }
+};
 
 // 配置手册： https://cli.vuejs.org/zh/config/#vue-config-js
 var config = {
   // publicPath: './',
   productionSourceMap: false,
   devServer: {
-    port: 8076
+    port: 8076,
+    proxy: devProxy
   },
   transpileDependencies: ["vue-echarts", "resize-detector"],
   chainWebpack: config => {
@@ -50,10 +51,6 @@ if (process.env.NODE_ENV === "production") {
   };
 }
 
-if (proxy && Object.keys(proxy).length) {
-  config.devServer.proxy = proxy;
-}
-
 // 解决iview自定义主题导入less报错
 config.css = {
   loaderOptions: {