成绩统计排序Bug修复

src/modules/oe/views/scoreStatistics.vue

@@ -24,11 +24,11 @@
             size="small"
             type="primary"
             icon="el-icon-search"
-            >查询
-          </el-button>
-          <el-button size="small" icon="el-icon-refresh" @click="resetForm">
-            重置
-          </el-button>
+            >查询</el-button
+          >
+          <el-button size="small" icon="el-icon-refresh" @click="resetForm"
+            >重置</el-button
+          >
         </el-col>
       </el-row>
 
@@ -42,16 +42,15 @@
             icon="el-icon-download"
             @click="openExportDialog"
             v-show="!exportLoading"
+            >导出</el-button
           >
-            导出
-          </el-button>
           <el-button
             size="small"
             icon="el-icon-download"
             :loading="true"
             v-show="exportLoading"
-            >导出数据中...
-          </el-button>
+            >导出数据中...</el-button
+          >
         </el-col>
       </el-row>
 
@@ -70,101 +69,93 @@
               label="学习中心"
               prop="orgName"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="姓名"
               prop="studentName"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="身份证号"
               prop="identityNumber"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="学号"
               prop="studentCode"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="课程"
               prop="courseNameAndCode"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="课程层次"
               prop="courseLevel"
               width="120"
-            >
-            </el-table-column>
-            <el-table-column sortable label="年级" prop="grade" width="120">
-            </el-table-column>
+            ></el-table-column>
+            <el-table-column
+              sortable
+              label="年级"
+              prop="grade"
+              width="120"
+            ></el-table-column>
             <el-table-column
               sortable
               label="采集人"
               prop="infoCollector"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="专业"
               prop="specialtyName"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
+              :sort-method="sortByDisciplineCount"
               label="违纪次数"
               prop="disciplineCount"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
+              :sort-method="sortBySubmitCount"
               label="正常交卷次数"
               prop="submitCount"
               width="150"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="剩余考试次数"
               prop="leftExamTimes"
               width="150"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="是否缺考"
               prop="isAbsent"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="最终成绩"
               prop="finalExamScore"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="成绩统计时间"
               prop="startTime"
               width="155"
-            >
-            </el-table-column>
+            ></el-table-column>
           </el-table>
           <div class="block pull-right">
             <el-pagination
@@ -175,9 +166,10 @@
               :page-size="form.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
-            >
-            </el-pagination></div></el-col
-      ></el-row>
+            ></el-pagination>
+          </div>
+        </el-col>
+      </el-row>
       <el-dialog title="导出方式选择" :visible.sync="dialogExportTypeVisible">
         <el-row>
           <el-col :span="24">
@@ -206,9 +198,9 @@
         <el-row class="margin-top-20">
           <el-col :span="24">
             <el-button type="primary" plain @click="exportData">确定</el-button>
-            <el-button plain @click="dialogExportTypeVisible = false">
-              取消
-            </el-button>
+            <el-button plain @click="dialogExportTypeVisible = false"
+              >取消</el-button
+            >
           </el-col>
         </el-row>
       </el-dialog>
@@ -400,6 +392,28 @@ export default {
           }
           this.exportLoading = false;
         });
+    },
+    sortByDisciplineCount(obj1, obj2) {
+      let p1 = Number(obj1.disciplineCount);
+      let p2 = Number(obj2.disciplineCount);
+      if (isNaN(p1)) {
+        p1 = 0;
+      }
+      if (isNaN(p2)) {
+        p2 = 0;
+      }
+      return p1 - p2;
+    },
+    sortBySubmitCount(obj1, obj2) {
+      let p1 = Number(obj1.submitCount);
+      let p2 = Number(obj2.submitCount);
+      if (isNaN(p1)) {
+        p1 = 0;
+      }
+      if (isNaN(p2)) {
+        p2 = 0;
+      }
+      return p1 - p2;
     }
   },
   created() {}