md

src/modules/stmms/components/markParam/MarkPaperStructure.vue

@@ -266,24 +266,24 @@ export default {
         .forEach(item => (item.qType = row.qType));
     },
     checkData() {
-      if (
-        this.tableData.some(item => item.qType === "objective") &&
-        this.tableData[0].qType !== "objective"
-      ) {
-        this.$message.error("请保持客观题在前，主观题在后！");
-        return;
-      }
+      // if (
+      //   this.tableData.some(item => item.qType === "objective") &&
+      //   this.tableData[0].qType !== "objective"
+      // ) {
+      //   this.$message.error("请保持客观题在前，主观题在后！");
+      //   return;
+      // }
 
-      const objectiveNos = this.tableData
-        .filter(item => item.isMainFirstSub && item.qType === "objective")
-        .map(item => item.mainNumber);
-      const unValid = objectiveNos.some(
-        (no, index) => objectiveNos[0] + index !== no
-      );
-      if (unValid) {
-        this.$message.error("请保持主客观题题号连续");
-        return;
-      }
+      // const objectiveNos = this.tableData
+      //   .filter(item => item.isMainFirstSub && item.qType === "objective")
+      //   .map(item => item.mainNumber);
+      // const unValid = objectiveNos.some(
+      //   (no, index) => objectiveNos[0] + index !== no
+      // );
+      // if (unValid) {
+      //   this.$message.error("请保持主客观题题号连续");
+      //   return;
+      // }
 
       let errorMessages = [];
       this.tableData.forEach(item => {

src/modules/stmms/views/ScoreSync.vue

@@ -58,15 +58,26 @@
             scope.row.statusStr | defaultFieldFilter
           }}</span>
         </el-table-column>
-        <el-table-column prop="totalCourses" label="总课程数" width="100">
+        <el-table-column prop="totalCourses" label="课程数" width="100">
           <span slot-scope="scope">{{
             scope.row.totalCourses | defaultFieldFilter
           }}</span>
         </el-table-column>
-        <el-table-column prop="totalStudents" label="总考生数" width="100">
-          <span slot-scope="scope">{{
-            scope.row.totalStudents | defaultFieldFilter
-          }}</span>
+        <el-table-column prop="totalStudents" label="考生数" width="100">
+          <div slot-scope="scope">
+            <span v-if="scope.row.totalStudents">
+              <span>{{ scope.row.totalStudents }}</span>
+              <span class="color-gray-2 mlr-1">/</span>
+              <span class="color-success" title="成功数">{{
+                scope.row.successStudents
+              }}</span>
+              <span class="color-gray-2 mlr-1">/</span>
+              <span class="color-danger" title="失败数">{{
+                scope.row.failStudents
+              }}</span>
+            </span>
+            <span v-else>--</span>
+          </div>
         </el-table-column>
         <el-table-column prop="resultStr" label="结果" width="100">
           <span slot-scope="scope">{{
@@ -88,11 +99,7 @@
               >同步</el-button
             >
             <el-button
-              v-if="
-                checkPrivilege('link', 'sync') &&
-                  scope.row.status === 'FINISH' &&
-                  scope.row.result === 'ERROR'
-              "
+              v-if="checkPrivilege('link', 'sync') && scope.row.errorFileUrl"
               class="btn-primary"
               type="text"
               @click="toExporLog(scope.row)"