阅卷格式优化

src/modules/marking/views/MarkPaperCheck.vue

@@ -299,9 +299,11 @@ export default {
   },
   methods: {
     getMarkWorks() {
-      this.$http.get(DATA_PROCESS_API + "/markWorks?status=1").then(response => {
-        this.markWorkList = response.data;
-      });
+      this.$http
+        .get(DATA_PROCESS_API + "/markWorks?status=1")
+        .then(response => {
+          this.markWorkList = response.data;
+        });
     },
     //查询学习中心
     getOrgs(name) {

src/modules/marking/views/MarkSettingMain.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <LinkTitlesCustom :currentPaths="['评卷工作','评卷设置', '设置列表']" />
+    <LinkTitlesCustom :currentPaths="['评卷工作', '评卷设置', '设置列表']" />
     <section class="content">
       <div
         class="box box-info"

src/modules/marking/views/MarkSettingWork.vue

@@ -36,12 +36,12 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="进度" width="100">
-              <template slot-scope="scope">
-                <div>
-                  <span>{{ Number.parseFloat(scope.row.progress) }}%</span>
-                </div>
-              </template>
+            <el-table-column
+              label="进度(%)"
+              width="100"
+              prop="progress"
+              sortable
+            >
             </el-table-column>
             <el-table-column label="备注" width="100" prop="remark">
             </el-table-column>

src/modules/marking/views/MarkWork.vue

@@ -58,12 +58,12 @@
                 </div>
               </template>
             </el-table-column>
-            <el-table-column label="进度" width="100">
-              <template slot-scope="scope">
-                <div>
-                  <span>{{ Number.parseFloat(scope.row.progress) }}%</span>
-                </div>
-              </template>
+            <el-table-column
+              label="进度(%)"
+              width="100"
+              prop="progress"
+              sortable
+            >
             </el-table-column>
             <el-table-column label="备注" width="100">
               <template slot-scope="scope">
@@ -267,6 +267,13 @@ export default {
   },
   methods: {
     settingMarkWork(row) {
+      if (Number.parseInt(row.status) != 1) {
+        this.$notify({
+          message: "该评卷工作未完成，不能进行设置.",
+          type: "warning"
+        });
+        return;
+      }
       var url =
         "/marking/mark_setting_main/" +
         row.id +

src/modules/marking/views/MarkWorkOverview.vue

@@ -361,9 +361,11 @@ export default {
       this.total = 0;
     },
     getMarkWorks() {
-      this.$http.get(DATA_PROCESS_API + "/markWorks?status=1").then(response => {
-        this.markWorkList = response.data;
-      });
+      this.$http
+        .get(DATA_PROCESS_API + "/markWorks?status=1")
+        .then(response => {
+          this.markWorkList = response.data;
+        });
     },
     getCourses() {
       this.$http

src/modules/marking/views/Marker.vue

@@ -242,9 +242,11 @@ export default {
     },
     //获取创建成功的markWork列表
     getMarkWorks() {
-      this.$http.get(DATA_PROCESS_API + "/markWorks?status=1").then(response => {
-        this.markWorkList = response.data;
-      });
+      this.$http
+        .get(DATA_PROCESS_API + "/markWorks?status=1")
+        .then(response => {
+          this.markWorkList = response.data;
+        });
     },
     backFill() {
       var formData = this.$route.query;