Przeglądaj źródła

修复考试明细排序Bug

lideyin 6 lat temu
rodzic
commit
67b7eadcb0
1 zmienionych plików z 78 dodań i 73 usunięć
  1. 78 73
      src/modules/oe/views/examDetail.vue

+ 78 - 73
src/modules/oe/views/examDetail.vue

@@ -10,8 +10,7 @@
                 size="small"
                 v-model="form.infoCollector"
                 placeholder="采集人"
-              >
-              </el-input>
+              ></el-input>
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -27,8 +26,7 @@
                 :clearable="false"
                 size="small"
                 @change="changeStartExamDatetimeRange"
-              >
-              </el-date-picker>
+              ></el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
@@ -39,33 +37,30 @@
           size="small"
           type="primary"
           icon="el-icon-search"
-          >查询
-        </el-button>
+          >查询</el-button
+        >
         <el-button
           size="small"
           type="primary"
           icon="el-icon-more"
           v-if="!showAllCondition"
           @click="showMoreCondition"
+          >高级查询</el-button
         >
-          高级查询
-        </el-button>
         <el-button
           size="small"
           type="primary"
           v-if="showAllCondition"
           @click="showSimpleCondition"
+          >简单查询</el-button
         >
-          简单查询
-        </el-button>
         <el-button
           size="small"
           icon="el-icon-refresh"
           @click="resetForm"
           class="margin-bottom-10"
+          >重置</el-button
         >
-          重置
-        </el-button>
       </el-col>
       <el-row>
         <el-col v-show="currentPagePrivileges.EXAM_DETAIL_EXPORT">
@@ -78,8 +73,8 @@
           ></commonExportVue>
         </el-col>
       </el-row>
-      <el-row class="margin-top-10"
-        ><el-col :span="24">
+      <el-row class="margin-top-10">
+        <el-col :span="24">
           <el-table
             v-loading="tableLoading"
             element-loading-text="数据加载中"
@@ -97,16 +92,15 @@
                   "
                   @click="gotoCaptureDetail(scope.row.dataId)"
                   type="text"
-                  >{{ scope.row.dataId }}
-                </el-button>
+                  >{{ scope.row.dataId }}</el-button
+                >
                 <span
                   v-show="
                     scope.row.examType != 'ONLINE' ||
                       !currentPagePrivileges.SNAPSHOT_DETAILS
                   "
+                  >{{ scope.row.dataId }}</span
                 >
-                  {{ scope.row.dataId }}
-                </span>
               </template>
             </el-table-column>
             <el-table-column
@@ -114,117 +108,111 @@
               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 sortable label="学生电话" prop="phone" 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="phone"
+              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="examOrder"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="开考时间"
               prop="paperStartTime"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="交卷时间"
               prop="paperSubmitTime"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
+              :sort-method="sortByExamTime"
               label="持续时间"
               prop="examTime"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="校验成功率(%)"
               prop="faceSuccessPercent"
               width="150"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="续考次数"
               prop="continuedCount"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
+              :sort-method="sortByPaperTotalScore"
               label="卷面总分"
               prop="paperTotalScore"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="是否违纪"
               prop="isIllegality"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column
               sortable
               label="是否提交"
               prop="isSubmit"
               width="120"
-            >
-            </el-table-column>
+            ></el-table-column>
             <el-table-column fixed="right" label="详情" width="100">
               <template slot-scope="scope">
                 <el-row
@@ -243,8 +231,8 @@
                       @click="
                         examPaperDetail(scope.row.courseId, scope.row.dataId)
                       "
-                      >调&nbsp;卷
-                    </el-button>
+                      >调&nbsp;卷</el-button
+                    >
                   </el-col>
                 </el-row>
                 <el-row
@@ -261,9 +249,8 @@
                         icon="el-icon-arrow-down"
                         type="primary"
                         plain
+                        >重审</el-button
                       >
-                        重审
-                      </el-button>
                       <el-dropdown-menu slot="dropdown">
                         <el-dropdown-item>
                           <el-button
@@ -271,9 +258,8 @@
                             type="success"
                             @click="redoAudit(scope.row.dataId, 'pass')"
                             icon="el-icon-success"
+                            >通&nbsp;&nbsp;过</el-button
                           >
-                            通&nbsp;&nbsp;过
-                          </el-button>
                         </el-dropdown-item>
                         <el-dropdown-item>
                           <el-button
@@ -281,9 +267,8 @@
                             type="danger"
                             @click="redoAudit(scope.row.dataId, 'nopass')"
                             icon="el-icon-error"
+                            >不通过</el-button
                           >
-                            不通过
-                          </el-button>
                         </el-dropdown-item>
                       </el-dropdown-menu>
                     </el-dropdown>
@@ -304,8 +289,8 @@
                       icon="el-icon-view"
                       plain
                       @click="downloadOfflineFile(scope.row.offlineFileUrl)"
-                      >调卷
-                    </el-button>
+                      >调卷</el-button
+                    >
                   </el-col>
                 </el-row>
               </template>
@@ -320,9 +305,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="dialogAuditFormVisible"
@@ -342,8 +328,7 @@
                 :key="item.name"
                 :label="item.desc"
                 :value="item.name"
-              >
-              </el-option>
+              ></el-option>
             </el-select>
           </el-form-item>
           <el-form-item label="详情描述" style="margin-top:15px;">
@@ -352,13 +337,12 @@
               type="textarea"
               :autosize="{ minRows: 6, maxRows: 10 }"
               placeholder="请输入内容"
-            >
-            </el-input>
+            ></el-input>
           </el-form-item>
           <div class="dialog-footer margin-top-10 text-center">
             <el-button type="primary" @click="doRedoAuditNoPass"
-              >确 定
-            </el-button>
+              >确 定</el-button
+            >
             <el-button @click="dialogAuditFormVisible = false">取 消</el-button>
           </div>
         </el-form>
@@ -640,6 +624,27 @@ export default {
         }
         this.search();
       }
+    },
+    sortByPaperTotalScore(obj1, obj2) {
+      let p1 = Number(obj1.paperTotalScore);
+      let p2 = Number(obj2.paperTotalScore);
+      return p1 - p2;
+    },
+    sortByExamTime(obj1, obj2) {
+      debugger;
+      let startTime1 = new Date(obj1.paperStartTime);
+      let endTime1 = new Date(obj1.paperSubmitTime);
+      let startTime2 = new Date(obj2.paperStartTime);
+      let endTime2 = new Date(obj2.paperSubmitTime);
+      let p1 = Number(endTime1 - startTime1);
+      let p2 = Number(endTime2 - startTime2);
+      if (isNaN(p1)) {
+        p1 = 0;
+      }
+      if (isNaN(p2)) {
+        p2 = 0;
+      }
+      return p1 - p2;
     }
   },
   created() {