bug修改

src/modules/grading-set/GradingRuleSet.vue

@@ -113,6 +113,20 @@
           ></Option>
         </Select>
       </FormItem>
+      <FormItem label="是否显示清除当前阅卷数据：">
+        <Select
+          v-model="modalForm.clearData"
+          :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"
@@ -155,7 +169,8 @@ export default {
         majority: 0,
         levelShowAllPaper: 0,
         propDenominator: 1,
-        showStandardPaperManage: 1
+        showStandardPaperManage: 1,
+        clearData: 0
       },
       modalFormCanEdit: false,
       modalForm: {},

src/modules/grading/GradingProgress.vue

@@ -7,7 +7,7 @@
           shape="circle"
           icon="area icon"
           @click="toCleanData"
-          v-if="IS_LEVEL || IS_SCORE"
+          v-if="showClearDataBtn"
           >清除当前阅卷数据</Button
         >
         <Button
@@ -60,7 +60,10 @@
       </Col>
       <Col span="12">
         <div class="part-box progress-table">
-          <table class="table table-noborder kzz-table" v-if="kzzInfo.length">
+          <table
+            class="table table-noborder kzz-table"
+            v-if="kzzInfo.length && IS_LEVEL"
+          >
             <tr v-for="kzz in kzzInfo" :key="kzz.loginName">
               <td>{{ kzz.loginName }}</td>
               <td style="text-align:left">仲裁：{{ kzz.arbitrated }}</td>
@@ -89,6 +92,10 @@
             </table>
 
             <table v-if="IS_SCORE" class="table table-noborder kzz-table">
+              <tr v-for="kzz in group.kzzProgress" :key="kzz.loginName">
+                <td>{{ kzz.loginName }}</td>
+                <td colspan="3"></td>
+              </tr>
               <tr v-for="(item, aindex) in group.markerProgress" :key="aindex">
                 <td>{{ item.loginName }}</td>
                 <td>
@@ -165,6 +172,9 @@ export default {
     };
   },
   computed: {
+    showClearDataBtn() {
+      return this.paramsSet.clearData && (this.IS_LEVEL || this.IS_SCORE);
+    },
     showGradingBtn() {
       // 采集时已知档位，则不显示正评任务按钮
       if (this.paramsSet.paperStage) return false;

src/modules/grading/leader/LeaderProgress.vue

@@ -34,7 +34,7 @@
       </table>
     </div>
 
-    <div v-if="kzzInfo.length" class="leader-progress-part">
+    <div v-if="kzzInfo.length && IS_LEVEL" class="leader-progress-part">
       <table class="table table-dark">
         <tr v-for="(user, uindex) in kzzInfo" :key="uindex">
           <td>科组长</td>
@@ -82,11 +82,10 @@
       </div>
 
       <div v-if="IS_SCORE">
-        <table
-          v-for="(group, index) in groupMarkers"
-          :key="index"
-          class="table table-dark"
-        >
+        <div v-for="(kzz, kindex) in group.kzzProgress" :key="kindex">
+          科组长：{{ kzz.loginName }}
+        </div>
+        <table class="table table-dark">
           <colgroup>
             <col width="120" />
             <col width="210" />