coarse to rough

src/api.js

@@ -125,7 +125,7 @@ export const getParamsSet = async workId => {
   const keys = [
     "collectConfig",
     "levelConfig",
-    "coarseLevelConfig",
+    "roughLevelConfig",
     "scoreConfig"
   ];
   keys.forEach(key => {
@@ -145,8 +145,8 @@ export const updateCollectParams = datas => {
 export const updateLevelParams = datas => {
   return $post("/api/param/level", datas, "json");
 };
-export const updateCoarseLevelParams = datas => {
-  return $post("/api/param/coarse_level", datas, "json");
+export const updateRoughLevelParams = datas => {
+  return $post("/api/param/rough_level", datas, "json");
 };
 // update-paper
 // grading-rule-set

src/constants/enumerate.js

@@ -32,7 +32,7 @@ export const PROP_DENOMINATOR_TYPE = {
   2: "去掉缺考考生数"
 };
 
-export const COARSE_LEVEL_TYPE = {
+export const ROUGH_LEVEL_TYPE = {
   1: "一",
   2: "二",
   3: "三",

src/modules/grading-set/GradingLevelSet.vue

@@ -17,7 +17,7 @@
         <th>典型值</th>
         <th>类型</th>
         <th>给分项</th>
-        <template v-if="coarseLevel">
+        <template v-if="roughLevel">
           <th>粗档位</th>
           <th>粗档位典型值</th>
         </template>
@@ -42,7 +42,7 @@
               :min="0"
               :max="1000"
               @on-blur="checkLevelValidate(level)"
-              @on-change="checkCoarseCodeValidate()"
+              @on-change="checkRoughCodeValidate()"
               v-if="level.canEdit && workDetail.modifyOtherVal"
             ></InputNumber>
             <p v-else>{{ level.minScore }}</p>
@@ -53,7 +53,7 @@
               :min="1"
               :max="1000"
               @on-blur="checkLevelValidate(level)"
-              @on-change="checkCoarseCodeValidate()"
+              @on-change="checkRoughCodeValidate()"
               v-if="level.canEdit && workDetail.modifyOtherVal"
             ></InputNumber>
             <p v-else>{{ level.maxScore }}</p>
@@ -112,34 +112,34 @@
             ></Input>
             <p v-else>{{ level.scoreList }}</p>
           </td>
-          <template v-if="coarseLevel">
-            <!-- coarse_code -->
+          <template v-if="roughLevel">
+            <!-- rough_code -->
             <td>
               <Select
-                v-model="level.coarseCode"
-                @on-change="coarseCodeChange(level)"
+                v-model="level.roughCode"
+                @on-change="roughCodeChange(level)"
                 style="min-width: 80px"
                 v-if="level.canEdit && workDetail.modifyOtherVal"
               >
                 <Option
-                  v-for="(val, key) in COARSE_LEVEL_TYPE"
+                  v-for="(val, key) in ROUGH_LEVEL_TYPE"
                   :key="key"
                   :value="key * 1"
                   >{{ val }}</Option
                 >
               </Select>
-              <p v-else>{{ COARSE_LEVEL_TYPE[level.coarseCode] }}</p>
+              <p v-else>{{ ROUGH_LEVEL_TYPE[level.roughCode] }}</p>
             </td>
-            <!-- coarse_weight -->
+            <!-- rough_weight -->
             <td>
               <InputNumber
-                v-model="level.coarseWeight"
+                v-model="level.roughWeight"
                 :min="1"
                 :max="100"
-                @on-change="coarseWeightChange(level)"
+                @on-change="roughWeightChange(level)"
                 v-if="level.canEdit && workDetail.modifyOtherVal"
               ></InputNumber>
-              <p v-else>{{ level.coarseWeight }}</p>
+              <p v-else>{{ level.roughWeight }}</p>
             </td>
           </template>
           <td>
@@ -195,12 +195,12 @@
           <td>
             {{ level.errors.scoreList }}
           </td>
-          <template v-if="coarseLevel">
+          <template v-if="roughLevel">
             <td>
-              {{ level.errors.coarseCode }}
+              {{ level.errors.roughCode }}
             </td>
             <td>
-              {{ level.errors.coarseWeight }}
+              {{ level.errors.roughWeight }}
             </td>
           </template>
           <td>
@@ -223,14 +223,14 @@
         :disabled="isSubmit"
         >确定</Button
       >
-      <Checkbox v-model="coarseLevel">coarseLevel</Checkbox>
+      <Checkbox v-model="roughLevel">roughLevel</Checkbox>
     </div>
   </div>
 </template>
 
 <script>
 import { workDetail, updateWork } from "@/api";
-import { LEVEL_TYPE, COARSE_LEVEL_TYPE } from "@/constants/enumerate";
+import { LEVEL_TYPE, ROUGH_LEVEL_TYPE } from "@/constants/enumerate";
 import schema from "async-validator";
 schema.warning = function() {};
 
@@ -243,8 +243,8 @@ const initLevel = {
   minScore: null,
   intervalScore: null,
   weight: null,
-  coarseCode: null,
-  coarseWeight: null,
+  roughCode: null,
+  roughWeight: null,
   levelType: "ADMITED",
   scoreList: null,
   pt: null,
@@ -256,13 +256,13 @@ export default {
   data() {
     return {
       LEVEL_TYPE,
-      COARSE_LEVEL_TYPE,
+      ROUGH_LEVEL_TYPE,
       workId: this.$route.params.workId,
       letterRelateNumber: {},
       levels: [],
       workDetail: {},
       isSubmit: false,
-      coarseLevel: false
+      roughLevel: false
     };
   },
   mounted() {
@@ -283,8 +283,8 @@ export default {
       this.levels = data.levels.map(item => {
         let nitem = { ...item };
         nitem.canEdit = false;
-        nitem.coarseCode = null;
-        nitem.coarseWeight = null;
+        nitem.roughCode = null;
+        nitem.roughWeight = null;
         return nitem;
       });
     },
@@ -356,29 +356,29 @@ export default {
     toDelete(index) {
       this.levels.splice(index, 1);
     },
-    coarseCodeChange(level) {
+    roughCodeChange(level) {
       let codeWeight = {};
       this.levels.forEach(item => {
-        if (item.coarseCode && item.coarseWeight) {
-          codeWeight[item.coarseCode] = item.coarseWeight;
+        if (item.roughCode && item.roughWeight) {
+          codeWeight[item.roughCode] = item.roughWeight;
         }
       });
-      level.coarseWeight = codeWeight[level.coarseCode] || null;
+      level.roughWeight = codeWeight[level.roughCode] || null;
 
-      this.checkCoarseCodeValidate();
+      this.checkRoughCodeValidate();
     },
-    coarseWeightChange(level) {
+    roughWeightChange(level) {
       this.levels
         .filter(
           item =>
-            item.coarseCode &&
-            item.coarseCode === level.coarseCode &&
+            item.roughCode &&
+            item.roughCode === level.roughCode &&
             item.code !== level.code
         )
         .forEach(item => {
-          item.coarseWeight = level.coarseWeight;
+          item.roughWeight = level.roughWeight;
         });
-      this.checkCoarseCodeValidate();
+      this.checkRoughCodeValidate();
     },
     resetError(errors, fields, fieldVals) {
       if (!errors) return null;
@@ -501,23 +501,23 @@ export default {
           return errors;
         });
     },
-    async checkCoarseCodeValidate(checkCodeRequired) {
-      if (!this.coarseLevel) return;
+    async checkRoughCodeValidate(checkCodeRequired) {
+      if (!this.roughLevel) return;
       let weightRanges = {};
       this.levels.forEach(level => {
-        if (!level.coarseCode) return;
-        let range = weightRanges[level.coarseCode] || {
+        if (!level.roughCode) return;
+        let range = weightRanges[level.roughCode] || {
           sn: 100,
           en: 0
         };
         range.sn = Math.min(range.sn, level.minScore);
         range.en = Math.max(range.en, level.maxScore);
-        weightRanges[level.coarseCode] = range;
+        weightRanges[level.roughCode] = range;
       });
 
-      const coarseCodeValidate = level => {
+      const roughCodeValidate = level => {
         const descriptor = {
-          coarseCode: {
+          roughCode: {
             validator: (rule, value, callback) => {
               if (!checkCodeRequired && !value) return callback();
 
@@ -532,16 +532,16 @@ export default {
 
               if (pos > 0) {
                 const prevLevel = this.levels[pos - 1];
-                if (prevLevel && prevLevel.coarseCode) {
-                  const codeDis = value - prevLevel.coarseCode;
+                if (prevLevel && prevLevel.roughCode) {
+                  const codeDis = value - prevLevel.roughCode;
                   if (codeDis < 0 || codeDis > 1) {
                     return callback(new Error(`请保持粗档位连续`));
                   }
                 }
 
                 // const nextLevel = this.levels[pos + 1];
-                // if (nextLevel && nextLevel.coarseCode) {
-                //   const codeDis = nextLevel.coarseCode - value;
+                // if (nextLevel && nextLevel.roughCode) {
+                //   const codeDis = nextLevel.roughCode - value;
                 //   if (codeDis < 0 || codeDis > 1) {
                 //     return callback(new Error(`请保持粗档位连续`));
                 //   }
@@ -551,17 +551,17 @@ export default {
               callback();
             }
           },
-          coarseWeight: {
+          roughWeight: {
             validator: (rule, value, callback) => {
               if (!checkCodeRequired) {
-                if (level.coarseCode && !value)
+                if (level.roughCode && !value)
                   return callback(new Error(`请输入粗档位典型值`));
-                if (!level.coarseCode) return callback();
+                if (!level.roughCode) return callback();
               }
               if (checkCodeRequired && !value)
                 return callback(new Error(`请输入粗档位典型值`));
 
-              const range = weightRanges[level.coarseCode];
+              const range = weightRanges[level.roughCode];
               if (value < range.sn || value > range.en)
                 return callback(
                   new Error(`粗档位典型值只能介于${range.sn}和${range.en}之间`)
@@ -593,7 +593,7 @@ export default {
           });
       };
 
-      const validatorAll = this.levels.map(level => coarseCodeValidate(level));
+      const validatorAll = this.levels.map(level => roughCodeValidate(level));
       const result = await Promise.all(validatorAll);
       const hasUnvalidate = result.some(item => !!item);
 
@@ -607,7 +607,7 @@ export default {
       let hasUnvalidate = result.some(item => !!item);
       if (hasUnvalidate) return;
 
-      hasUnvalidate = await this.checkCoarseCodeValidate(true);
+      hasUnvalidate = await this.checkRoughCodeValidate(true);
       if (hasUnvalidate) return;
 
       if (!this.checkLevelCodeIsContinuous()) {

src/modules/grading-set/GradingRuleSet.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="grading-rule-set part-box">
     <div class="rule-part">
-      <h3 v-show="modalForm.coarseLevel" class="rule-part-title">细分档设置</h3>
+      <h3 v-show="modalForm.roughLevel" class="rule-part-title">细分档设置</h3>
       <Form
         ref="modalFormComp"
         :model="modalForm"
@@ -159,10 +159,10 @@
         </FormItem>
         <FormItem label="是否增加粗档位环节：">
           <Select
-            v-model="modalForm.coarseLevel"
+            v-model="modalForm.roughLevel"
             :disabled="!modalFormCanEdit"
             placeholder="请选择"
-            @on-change="coarseLevelChange"
+            @on-change="roughLevelChange"
           >
             <Option
               v-for="(val, key) in BOOLEAN_TYPE"
@@ -190,28 +190,28 @@
         >
       </div>
     </div>
-    <div v-if="modalForm.coarseLevel" class="rule-part">
+    <div v-if="modalForm.roughLevel" class="rule-part">
       <h3 class="rule-part-title">粗分档设置</h3>
       <Form
-        ref="modalFormCoarseComp"
-        :model="modalFormCoarse"
+        ref="modalFormRoughComp"
+        :model="modalFormRough"
         :rules="rules"
         :label-width="230"
         style="width: 400px;"
       >
         <FormItem prop="deviation" label="仲裁档位差：">
           <InputNumber
-            v-model="modalFormCoarse.deviation"
+            v-model="modalFormRough.deviation"
             :min="1"
             :max="100"
-            :disabled="!modalFormCoarseCanEdit"
+            :disabled="!modalFormRoughCanEdit"
             style="width: 160px;"
           ></InputNumber>
         </FormItem>
         <FormItem label="系统自动打回：">
           <Select
-            v-model="modalFormCoarse.autoCallback"
-            :disabled="!modalFormCoarseCanEdit"
+            v-model="modalFormRough.autoCallback"
+            :disabled="!modalFormRoughCanEdit"
             placeholder="请选择"
           >
             <Option
@@ -223,25 +223,25 @@
           </Select>
         </FormItem>
         <FormItem
-          v-if="modalFormCoarse.autoCallback"
+          v-if="modalFormRough.autoCallback"
           prop="cumulativeError"
           label="打回累计误差："
         >
           <InputNumber
-            v-model="modalFormCoarse.cumulativeError"
+            v-model="modalFormRough.cumulativeError"
             :min="1"
             :max="100"
-            :disabled="!modalFormCoarseCanEdit"
+            :disabled="!modalFormRoughCanEdit"
             style="width: 160px;"
           ></InputNumber>
         </FormItem>
         <FormItem
-          v-if="modalFormCoarse.autoCallback"
+          v-if="modalFormRough.autoCallback"
           label="打回是否显示偏差方向："
         >
           <Select
-            v-model="modalFormCoarse.autoCallbackShowDeviation"
-            :disabled="!modalFormCoarseCanEdit"
+            v-model="modalFormRough.autoCallbackShowDeviation"
+            :disabled="!modalFormRoughCanEdit"
             placeholder="请选择"
           >
             <Option
@@ -254,8 +254,8 @@
         </FormItem>
         <FormItem label="是否过半定档：">
           <Select
-            v-model="modalFormCoarse.majority"
-            :disabled="!modalFormCoarseCanEdit"
+            v-model="modalFormRough.majority"
+            :disabled="!modalFormRoughCanEdit"
             placeholder="请选择"
           >
             <Option
@@ -268,8 +268,8 @@
         </FormItem>
         <FormItem label="是否启用取优原则：">
           <Select
-            v-model="modalFormCoarse.takeBest"
-            :disabled="!modalFormCoarseCanEdit"
+            v-model="modalFormRough.takeBest"
+            :disabled="!modalFormRoughCanEdit"
             placeholder="请选择"
           >
             <Option
@@ -282,8 +282,8 @@
         </FormItem>
         <FormItem label="阅卷员是否显示所有试卷：">
           <Select
-            v-model="modalFormCoarse.levelShowAllPaper"
-            :disabled="!modalFormCoarseCanEdit"
+            v-model="modalFormRough.levelShowAllPaper"
+            :disabled="!modalFormRoughCanEdit"
             placeholder="请选择"
           >
             <Option
@@ -296,8 +296,8 @@
         </FormItem>
         <FormItem label="档位百分比分母：">
           <Select
-            v-model="modalFormCoarse.propDenominator"
-            :disabled="!modalFormCoarseCanEdit"
+            v-model="modalFormRough.propDenominator"
+            :disabled="!modalFormRoughCanEdit"
             placeholder="请选择"
           >
             <Option
@@ -310,8 +310,8 @@
         </FormItem>
         <FormItem label="是否显示标准卷管理：">
           <Select
-            v-model="modalFormCoarse.showStandardPaperManage"
-            :disabled="!modalFormCoarseCanEdit"
+            v-model="modalFormRough.showStandardPaperManage"
+            :disabled="!modalFormRoughCanEdit"
             placeholder="请选择"
           >
             <Option
@@ -324,8 +324,8 @@
         </FormItem>
         <FormItem label="是否显示清除当前阅卷数据：">
           <Select
-            v-model="modalFormCoarse.clearData"
-            :disabled="!modalFormCoarseCanEdit"
+            v-model="modalFormRough.clearData"
+            :disabled="!modalFormRoughCanEdit"
             placeholder="请选择"
           >
             <Option
@@ -338,8 +338,8 @@
         </FormItem>
         <FormItem label="是否开启去高去低再加权评卷：">
           <Select
-            v-model="modalFormCoarse.removeHighAndLow"
-            :disabled="!modalFormCoarseCanEdit"
+            v-model="modalFormRough.removeHighAndLow"
+            :disabled="!modalFormRoughCanEdit"
             placeholder="请选择"
           >
             <Option
@@ -355,7 +355,7 @@
         <Button
           shape="circle"
           style="width: 80px;"
-          @click="modalFormCoarseCanEdit = true"
+          @click="modalFormRoughCanEdit = true"
           >编辑</Button
         >
         <Button
@@ -363,7 +363,7 @@
           shape="circle"
           style="width: 80px;"
           :disabled="isSubmit"
-          @click="submitCoarse"
+          @click="submitRough"
           >保存</Button
         >
       </div>
@@ -372,11 +372,7 @@
 </template>
 
 <script>
-import {
-  getParamsSet,
-  updateLevelParams,
-  updateCoarseLevelParams
-} from "@/api";
+import { getParamsSet, updateLevelParams, updateRoughLevelParams } from "@/api";
 import { BOOLEAN_TYPE, PROP_DENOMINATOR_TYPE } from "@/constants/enumerate";
 import { numberValidator } from "@/plugins/formRules";
 
@@ -405,8 +401,8 @@ export default {
       PROP_DENOMINATOR_TYPE,
       modalFormCanEdit: false,
       modalForm: {},
-      modalFormCoarseCanEdit: false,
-      modalFormCoarse: {},
+      modalFormRoughCanEdit: false,
+      modalFormRough: {},
       rules: {
         deviation: numberValidator("请输入仲裁档位差"),
         cumulativeError: numberValidator("请输入打回累计误差")
@@ -414,22 +410,22 @@ export default {
     };
   },
   mounted() {
-    this.modalForm = { ...initModalForm, coarseLevel: 0 };
+    this.modalForm = { ...initModalForm, roughLevel: 0 };
     this.getParamsSetInfo();
   },
   methods: {
     async getParamsSetInfo() {
       const data = await getParamsSet(this.workId);
       this.modalForm = this.$objAssign(this.modalForm, data.levelConfig);
-      this.modalFormCoarse = this.$objAssign(
+      this.modalFormRough = this.$objAssign(
         initModalForm,
-        data.coarseLevelConfig
+        data.roughLevelConfig
       );
     },
-    coarseLevelChange(val) {
+    roughLevelChange(val) {
       if (val) {
-        this.modalFormCoarse = { ...initModalForm };
-        this.modalFormCoarseCanEdit = true;
+        this.modalFormRough = { ...initModalForm };
+        this.modalFormRoughCanEdit = true;
       }
     },
     async submit() {
@@ -448,20 +444,20 @@ export default {
       this.modalFormCanEdit = false;
       this.$Message.success("保存成功！");
     },
-    async submitCoarse() {
-      const valid = await this.$refs.modalFormCoarseComp.validate();
+    async submitRough() {
+      const valid = await this.$refs.modalFormRoughComp.validate();
       if (!valid) return;
 
       if (this.isSubmit) return;
       this.isSubmit = true;
       let result = true;
-      await updateCoarseLevelParams(this.modalFormCoarse).catch(() => {
+      await updateRoughLevelParams(this.modalFormRough).catch(() => {
         result = false;
       });
       this.isSubmit = false;
 
       if (!result) return;
-      this.modalFormCoarseCanEdit = false;
+      this.modalFormRoughCanEdit = false;
       this.$Message.success("保存成功！");
     }
   }

src/modules/grading/components/GradeAction.vue

@@ -259,7 +259,7 @@ export default {
       default: false
     },
     // 是否处于粗分档
-    isCoarseLevel: {
+    isRoughLevel: {
       type: Boolean,
       default: false
     }