bug修改

src/assets/styles/main.less

@@ -701,7 +701,7 @@
   height: 297mm;
   margin: 0 auto;
   position: relative;
-  padding: 60px 60px;
+  padding: 50px 30px;
   h1 {
     font-size: 24px;
     text-align: center;

src/components/EchartRender.vue

@@ -250,7 +250,7 @@ export default {
         grid: {
           top: "10%",
           bottom: "12%",
-          left: "3.5%",
+          left: 40,
           right: "3%"
         },
         tooltip: {

src/modules/grading/components/GradeAnalysisExport.vue

@@ -13,38 +13,40 @@
         <div class="print-chart-title">详细数值表：</div>
         <table class="export-table">
           <tr>
-            <th>科目</th>
             <th>档位</th>
-            <th>范围</th>
-            <th>数量</th>
-            <th>占比</th>
-            <th>预设占比</th>
+            <th>考区试卷数量</th>
+            <th>考区试卷占比</th>
+            <th>考区阈值</th>
             <th>差值</th>
             <th>累计数量</th>
             <th>累计占比</th>
             <th>调整</th>
+            <th>全部试卷数量</th>
+            <th>全部试卷占比</th>
+            <th>占比阈值</th>
           </tr>
-          <tr v-for="(item, index) in chartData.levelData" :key="index">
-            <td>{{ item.subjectName }}</td>
-            <td>{{ item.code }}</td>
-            <td>{{ item.minScore }} ~ {{ item.maxScore }}</td>
-            <td>{{ item.levelCount }}</td>
-            <td>{{ item.levelProp }}%</td>
-            <td>{{ item.examLevelProp }}%</td>
-            <td>{{ item.diffProp }}%</td>
-            <td>{{ item.cumulateCount }}</td>
-            <td>{{ item.cumulateProp }}%</td>
-            <td>{{ item.adjustmentCount }}</td>
+          <tr v-for="(level, index) in chartData.levelData" :key="index">
+            <td>{{ level.code }}</td>
+            <td>{{ level.levelCount }}</td>
+            <td>{{ level.levelProp }}%</td>
+            <td>{{ level.examLevelProp }}%</td>
+            <td>{{ level.diffProp }}%</td>
+            <td>{{ level.cumulateCount }}</td>
+            <td>{{ level.cumulateProp }}%</td>
+            <td>{{ level.adjustmentCount }}</td>
+            <td class="td-bl">{{ level.gcount }}</td>
+            <td>{{ level.gpercent }}%</td>
+            <td>{{ level.pt }}%</td>
           </tr>
         </table>
       </div>
       <div class="print-chart" v-if="chartData.lineChartData">
-        <div class="print-chart-title">档位分布曲线图：</div>
+        <div class="print-chart-title">考区试卷数量分布图</div>
         <div class="print-chart-body">
           <echart-render
             :chart-data="chartData.lineChartData"
             :animation-is-open="false"
-            chart-type="line"
+            chart-type="darkLines"
             ref="lineChart"
             v-if="!showImg"
           ></echart-render>

src/modules/grading/leader/LeaderStatistics.vue

@@ -17,7 +17,7 @@
           size="small"
           type="primary"
           @click="toExport"
-          :load="isDownload"
+          :loading="isDownload"
           >导出表格</Button
         >
       </div>
@@ -100,13 +100,7 @@ export default {
     };
   },
   computed: {
-    ...mapState("marker", [
-      "paramsSet",
-      "curSubject",
-      "curArea",
-      "steps",
-      "areas"
-    ])
+    ...mapState("marker", ["paramsSet", "curSubject", "curArea", "areas"])
   },
   methods: {
     visibleChange(visible) {
@@ -117,23 +111,12 @@ export default {
       }
     },
     async initData() {
-      let levelSteps = {};
-      this.steps.levelStep.forEach(element => {
-        levelSteps[element.name] = element;
-      });
       const subs = this.$route.params.subjectId.split("-");
       this.levelData = await gradingStatData({
         questionId: this.questionId,
         workId: subs[0],
         subject: subs[1]
       });
-      this.levelData = this.levelData.map(item => {
-        const levelStep = levelSteps[item.code];
-        item.gcount = levelStep.gcount;
-        item.gpercent = levelStep.gpercent.toFixed(2);
-        item.pt = levelStep.pt;
-        return item;
-      });
 
       const groups = [
         {
@@ -161,6 +144,7 @@ export default {
     },
     // export
     toExport() {
+      if (this.isDownload) return;
       this.isDownload = true;
       this.renderPageInfo = {
         subjectName: this.curSubject.name,