阅卷前端优化

src/modules/marking/views/MarkPaperCheck.vue

@@ -93,6 +93,12 @@
                 ></el-option>
               </el-select>
             </el-form-item>
+            <el-form-item label="评卷备注" class="pull-left">
+              <el-input
+                placeholder="请输入备注"
+                v-model="formSearch.markRemark"
+              ></el-input>
+            </el-form-item>
             <el-form-item class="pull-right">
               <el-button
                 size="small"
@@ -101,6 +107,13 @@
                 @click="searchMarkPaperCheck"
                 >查询</el-button
               >
+              <el-button
+                size="small"
+                type="success"
+                icon="caret-left"
+                @click="back"
+                >返回</el-button
+              >
             </el-form-item>
           </el-form>
           <!-- 页面列表 -->
@@ -201,7 +214,7 @@ export default {
         workId: "",
         specialtyCode: "",
         examType: "",
-        remark: ""
+        markRemark: ""
       },
       orgList: [],
       courseList: [],
@@ -373,6 +386,11 @@ export default {
           return str;
         }
       }
+    },
+    back() {
+      this.$router.push({
+        path: "/marking/mark_setting_work/checking"
+      });
     }
   },
   created() {

src/modules/marking/views/MarkSettingFast.vue

@@ -238,7 +238,7 @@ export default {
         .get(MARKING_API + "/markWorks/" + self.workId)
         .then(response => {
           self.loading = false;
-          if (response.progress > 0) {
+          if (response.markedStudentPaper > 0) {
             self.marked = true;
             self.progress = response.progress;
           }
@@ -291,10 +291,7 @@ export default {
       this.checkMarked();
       if (this.marked && this.isOldSelectedMarker(tag)) {
         this.$notify({
-          message:
-            "评卷工作已开始（进度为" +
-            this.progress +
-            "%），不能删除该评卷员！",
+          message: "评卷工作已开始，不能删除该评卷员！",
           type: "error"
         });
         return;

src/modules/marking/views/MarkWork.vue

@@ -9,14 +9,14 @@
             label-position="right"
             label-width="110px"
           >
-            <el-form-item label="评卷工作名称">
+            <el-form-item label="评卷工作名称" class="pull-left">
               <el-input
                 placeholder="评卷工作名称"
                 v-model="formSearch.name"
                 @keyup.native="searchMarkWork"
               ></el-input>
             </el-form-item>
-            <el-form-item>
+            <el-form-item class="pull-right">
               <span v-if="isAdmin">
                 <el-button
                   size="small"
@@ -94,6 +94,7 @@
                       @click="editMarkWorkModal(scope.row);"
                       type="primary"
                       size="mini"
+                      class="el-icon-edit"
                       >编辑</el-button
                     >
                   </span>

src/modules/marking/views/MarkWorkOverview.vue

@@ -16,8 +16,8 @@
             label-width="80px"
           >
             <el-row>
-              <el-col :span="20">
-                <el-form-item label="课程">
+              <el-col :span="24">
+                <el-form-item label="课程" class="pull-left">
                   <el-select
                     clearable
                     filterable
@@ -34,7 +34,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item>
+                <el-form-item class="pull-right">
                   <el-button
                     size="small"
                     type="primary"
@@ -42,6 +42,13 @@
                     @click="searchSetting"
                     >查询</el-button
                   >
+                  <el-button
+                    size="small"
+                    type="success"
+                    icon="caret-left"
+                    @click="back"
+                    >返回</el-button
+                  >
                 </el-form-item>
               </el-col>
             </el-row>
@@ -426,6 +433,11 @@ export default {
           ];
           this.loading = false;
         });
+    },
+    back() {
+      this.$router.push({
+        path: "/marking/mark_setting_work/overview"
+      });
     }
   },
   computed: {

src/modules/marking/views/Marker.vue

@@ -31,6 +31,13 @@
                 @click="searchSetting"
                 >查询</el-button
               >
+              <el-button
+                size="small"
+                type="success"
+                icon="caret-left"
+                @click="back"
+                >返回</el-button
+              >
             </el-form-item>
           </el-form>
 
@@ -191,6 +198,11 @@ export default {
       this.$router.push({
         path: url
       });
+    },
+    back() {
+      this.$router.push({
+        path: "/marking/mark_setting_work/marker"
+      });
     }
   },
   computed: {

src/modules/marking/views/TpScoreBoard.vue

@@ -10,7 +10,7 @@
           inactive-color="#13ce66"
         ></el-switch>
       </div>
-      <h3 class="totalScore">总分：{{ this.totalScore }}分</h3>
+      <h4 class="totalScore">总分：{{ this.totalScore }}分</h4>
       <!-- 鼠标模式 -->
       <div v-if="isMouseMode">
         <el-tabs :active-name="activeName">
@@ -77,25 +77,25 @@
               >
                 <div class="box-card">
                   <div>
-                    <el-button-group>
-                      <el-button size="small" type="primary">
-                        <span style="font-size:15px;font-weight:bold">
+                    <span>
+                      <small>
+                        <span>
                           {{ resultItem.markItem.mainNumber }}({{
                             resultItem.markItem.orders
                           }})
                         </span>
-                      </el-button>
-                      <el-button size="small" type="primary">
+                      </small>
+                      <small>
                         <span style="font-size:15px;font-weight:bold">
                           <span>{{ resultItem.markItem.maxScore }}分</span>
                         </span>
-                      </el-button>
-                      <el-button size="small" type="primary">
+                      </small>
+                      <small>
                         <span style="font-size:15px;font-weight:bold;"
                           >间隔:{{ resultItem.markItem.scoreInterval }}</span
                         >
-                      </el-button>
-                    </el-button-group>
+                      </small>
+                    </span>
                   </div>
                   <div
                     style="text-align:center;font-size:15px;font-weight:bold"
@@ -161,9 +161,9 @@
                   v-for="tag in tags"
                   :key="tag.code"
                 >
-                  <el-radio :label="tag.code" :key="tag.code">
-                    {{ tag.name }}
-                  </el-radio>
+                  <el-radio :label="tag.code" :key="tag.code">{{
+                    tag.name
+                  }}</el-radio>
                 </li>
               </el-radio-group>
             </span>
@@ -460,7 +460,7 @@ export default {
         return;
       }
       if (index === this.resultItems.length - 1) {
-        document.getElementById("#subMarkBtn").focus();
+        document.getElementById("subMarkBtn").focus();
       } else {
         var nextResultItem = this.resultItems[index + 1];
         var nextItemId = nextResultItem.markItem.id;