阅卷前端优化

src/modules/marking/views/CourseDetail.vue

@@ -25,7 +25,7 @@
               ></el-input>
             </el-form-item>
 
-            <el-form-item class="pull-right">
+            <el-form-item>
               <el-button
                 size="small"
                 type="primary"
@@ -48,6 +48,7 @@
 
           <!-- 页面列表 -->
           <el-table
+            stripe
             v-loading="loading"
             element-loading-text="拼命加载中"
             :data="tableData"
@@ -79,9 +80,11 @@
             <el-pagination
               background
               @current-change="handleSettingCurrentChange"
+              @size-change="handleSizeChange"
               :current-page="currentPage"
-              :page-size="10"
-              layout="total, prev, pager, next, jumper"
+              :page-size="pageSize"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>
           </div>
@@ -122,6 +125,10 @@ export default {
       this.currentPage = val;
       this.searchSetting();
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.searchSetting();
+    },
     pagingSetting() {
       var start = (this.currentPage - 1) * this.pageSize;
       var end =

src/modules/marking/views/MarkGradeMain.vue

@@ -2,12 +2,6 @@
   <div>
     <section class="content">
       <div class="box box-info">
-        <!--
-          <div class="box-header with-border">
-            <h3 class="box-title">成绩查询</h3>
-            <div class="box-tools pull-right"></div>
-          </div>
-        -->
         <div class="box-body">
           <el-form
             :inline="true"
@@ -106,7 +100,7 @@
               </el-col>
             </el-row>
 
-            <el-form-item class="pull-right">
+            <el-form-item>
               <span>
                 <el-button
                   size="small"
@@ -126,6 +120,7 @@
             </el-form-item>
           </el-form>
           <el-table
+            stripe
             v-loading="loading"
             element-loading-text="拼命加载中"
             :data="tableData"
@@ -173,9 +168,11 @@
             <el-pagination
               background
               @current-change="handleCurrentChange"
+              @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              layout="total, prev, pager, next, jumper"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>
           </div>
@@ -329,6 +326,10 @@ export default {
       this.currentPage = val;
       this.searchMarkGrade();
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.searchMarkGrade();
+    },
     back() {
       this.$router.push({
         path: "/marking/mark_setting_work/grade"

src/modules/marking/views/MarkPaperCheck.vue

@@ -7,10 +7,10 @@
           <el-form
             :inline="true"
             :model="formSearch"
-            label-position="right"
+            ref="formSearch"
             label-width="100px"
           >
-            <el-form-item label="学习中心" class="pull-left">
+            <el-form-item label="学习中心" class="pull-left" prop="orgCode">
               <el-select
                 :remote-method="getOrgs"
                 remote
@@ -20,6 +20,7 @@
                 v-model="formSearch.orgCode"
                 placeholder="请选择"
                 filterable
+                style="width:150px;"
               >
                 <el-option label="请选择" value></el-option>
                 <el-option
@@ -30,24 +31,27 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="姓名" class="pull-left">
+            <el-form-item label="姓名" class="pull-left" prop="studentName">
               <el-input
                 placeholder="请输入姓名"
                 v-model="formSearch.studentName"
+                style="width:150px;"
               ></el-input>
             </el-form-item>
-            <el-form-item label="学号" class="pull-left">
+            <el-form-item label="学号" class="pull-left" prop="studentCode">
               <el-input
                 placeholder="请输入学号"
                 v-model="formSearch.studentCode"
+                style="width:150px;"
               ></el-input>
             </el-form-item>
-            <el-form-item label="标记卷" class="pull-left">
+            <el-form-item label="标记卷" class="pull-left" prop="tag">
               <el-select
                 clearable
                 v-model="formSearch.tag"
                 placeholder="请选择"
                 filterable
+                style="width:150px;"
               >
                 <el-option label="请选择" value></el-option>
                 <el-option
@@ -58,7 +62,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="课程" class="pull-left">
+            <el-form-item label="课程" class="pull-left" prop="courseCode">
               <el-select
                 clearable
                 @change="getUserList"
@@ -66,6 +70,7 @@
                 class="input"
                 v-model="formSearch.courseCode"
                 placeholder="请选择"
+                style="width:150px;"
               >
                 <el-option label="请选择" value></el-option>
                 <el-option
@@ -76,13 +81,14 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="评委" class="pull-left">
+            <el-form-item label="评委" class="pull-left" prop="userId">
               <el-select
                 clearable
                 class="input"
                 filterable
                 v-model="formSearch.userId"
                 placeholder="请选择"
+                style="width:150px;"
               >
                 <el-option label="请选择" value></el-option>
                 <el-option
@@ -93,13 +99,14 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item label="评卷备注" class="pull-left">
+            <el-form-item label="评卷备注" class="pull-left" prop="markRemark">
               <el-input
                 placeholder="请输入备注"
                 v-model="formSearch.markRemark"
+                style="width:150px;"
               ></el-input>
             </el-form-item>
-            <el-form-item class="pull-right">
+            <el-form-item style="margin-left:30px;">
               <el-button
                 size="small"
                 type="primary"
@@ -114,10 +121,14 @@
                 @click="back"
                 >返回</el-button
               >
+              <el-button @click="resetForm('formSearch')" size="small"
+                >重置</el-button
+              >
             </el-form-item>
           </el-form>
           <!-- 页面列表 -->
           <el-table
+            stripe
             v-loading="loading"
             element-loading-text="拼命加载中"
             :data="tableData"
@@ -161,12 +172,14 @@
                   @click="viewPaper(scope.row)"
                   type="primary"
                   size="mini"
+                  plain
                   >原卷</el-button
                 >
                 <el-button
                   @click="backRefresh(scope.row)"
                   type="danger"
                   size="mini"
+                  plain
                   >打回</el-button
                 >
               </template>
@@ -176,9 +189,11 @@
             <el-pagination
               background
               @current-change="handleCurrentChange"
+              @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              layout="total, prev, pager, next, jumper"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>
           </div>
@@ -332,10 +347,17 @@ export default {
     },
     //导出
     exp() {},
+    resetForm(formName) {
+      this.$refs[formName].resetFields();
+    },
     handleCurrentChange(val) {
       this.currentPage = val;
       this.searchMarkPaperCheck();
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.searchMarkPaperCheck();
+    },
     //查看原卷
     viewPaper(row) {
       if (this.examType != "OFFLINE") {

src/modules/marking/views/MarkSettingFast.vue

@@ -36,7 +36,7 @@
                   @change="searchMarker"
                 ></el-input>
               </el-form-item>
-              <el-form-item class="pull-right">
+              <el-form-item>
                 <el-button
                   size="small"
                   type="primary"
@@ -61,6 +61,7 @@
               </el-form-item>
             </el-form>
             <el-table
+              stripe
               v-loading="loading"
               element-loading-text="拼命加载中"
               :data="markerData"
@@ -84,9 +85,11 @@
               <el-pagination
                 background
                 @current-change="handleMarkerCurrentChange"
+                @size-change="handleSizeChange"
                 :current-page="curMarker"
-                :page-size="10"
-                layout="total, prev, pager, next, jumper"
+                :page-size="pageSize"
+                :page-sizes="[10, 20, 50, 100]"
+                layout="total, sizes, prev, pager, next, jumper"
                 :total="totalMarker"
               ></el-pagination>
             </div>
@@ -192,6 +195,10 @@ export default {
       this.curMarker = val;
       this.searchMarker();
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.searchMarker();
+    },
     pagingMarker() {
       var start = (this.curMarker - 1) * this.pageSize;
       var end =

src/modules/marking/views/MarkSettingMain.vue

@@ -31,7 +31,7 @@
                 ></el-option>
               </el-select>
             </el-form-item>
-            <el-form-item class="pull-right">
+            <el-form-item>
               <el-button
                 size="small"
                 type="primary"
@@ -48,7 +48,7 @@
               >
               <el-dropdown style="margin-left:10px;" @command="handleCommand">
                 <el-button size="small" type="primary"
-                  >更多菜单 <i class="el-icon-arrow-down el-icon--right"></i>
+                  >更多 <i class="el-icon-arrow-down el-icon--right"></i>
                 </el-button>
                 <el-dropdown-menu slot="dropdown">
                   <el-dropdown-item command="in">导入</el-dropdown-item>
@@ -124,6 +124,7 @@
           </el-dialog>
           <!-- 页面列表 -->
           <el-table
+            stripe
             v-loading="loading"
             element-loading-text="拼命加载中"
             :data="tableData"
@@ -157,6 +158,7 @@
                     @click="fastSetting(scope.$index, scope.row)"
                     type="primary"
                     size="mini"
+                    plain
                     >快速设置</el-button
                   >
                 </div>
@@ -167,9 +169,11 @@
             <el-pagination
               background
               @current-change="handleSettingCurrentChange"
+              @size-change="handleSizeChange"
               :current-page="currentPage"
-              :page-size="10"
-              layout="total, prev, pager, next, jumper"
+              :page-size="pageSize"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>
           </div>
@@ -279,6 +283,10 @@ export default {
       this.currentPage = val;
       this.initSetting();
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.initSetting();
+    },
     pagingSetting() {
       var start = (this.currentPage - 1) * this.pageSize;
       var end =

src/modules/marking/views/MarkSettingWork.vue

@@ -23,6 +23,7 @@
             <!-- </el-form-item> -->
           </el-form>
           <el-table
+            stripe
             v-loading="loading"
             element-loading-text="拼命加载中"
             :data="tableData"
@@ -58,6 +59,7 @@
                         @click="markWorkOverview(scope.row)"
                         type="primary"
                         size="mini"
+                        plain
                         >评卷进度</el-button
                       >
                     </span>
@@ -66,6 +68,7 @@
                         @click="marker(scope.row)"
                         type="primary"
                         size="mini"
+                        plain
                         >评卷员一览</el-button
                       >
                     </span>
@@ -74,6 +77,7 @@
                         @click="settingMarkWork(scope.row)"
                         type="primary"
                         size="mini"
+                        plain
                         >评卷设置</el-button
                       >
                     </span>
@@ -82,6 +86,7 @@
                         @click="paperCheck(scope.row)"
                         type="primary"
                         size="mini"
+                        plain
                         >试卷检查</el-button
                       >
                     </span>
@@ -90,6 +95,7 @@
                         @click="viewGrade(scope.row)"
                         type="primary"
                         size="mini"
+                        plain
                         >成绩查询</el-button
                       >
                     </span>
@@ -99,6 +105,7 @@
                       @click="marking(scope.row)"
                       type="primary"
                       size="mini"
+                      plain
                       >评阅试卷</el-button
                     >
                   </span>
@@ -110,9 +117,11 @@
             <el-pagination
               background
               @current-change="handleCurrentChange"
+              @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              layout="total, prev, pager, next, jumper"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             >
             </el-pagination>
@@ -186,6 +195,12 @@ export default {
       this.paging();
       //this.searchMarkWork()
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.filterMarkWork();
+      this.paging();
+      //this.searchMarkWork()
+    },
     paging() {
       var start = (this.currentPage - 1) * this.pageSize;
       var end =

src/modules/marking/views/MarkWork.vue

@@ -16,7 +16,7 @@
                 @keyup.native="searchMarkWork"
               ></el-input>
             </el-form-item>
-            <el-form-item class="pull-right">
+            <el-form-item>
               <span v-if="isAdmin">
                 <el-button
                   size="small"
@@ -81,41 +81,51 @@
             <el-table-column label="操作">
               <template slot-scope="scope">
                 <div class="pull-left" v-if="isAdmin">
-                  <span class="button-right" v-if="scope.row.status == 2">
-                    <el-button
-                      @click="recreate(scope.row)"
-                      type="primary"
-                      size="mini"
-                      >重新创建</el-button
-                    >
-                  </span>
-                  <span>
-                    <el-button
-                      @click="editMarkWorkModal(scope.row)"
-                      type="primary"
-                      size="mini"
-                      icon="el-icon-edit"
-                      >编辑</el-button
-                    >
-                  </span>
-                  <span>
-                    <el-button
-                      @click="delMarkWork(scope.row)"
-                      type="danger"
-                      size="mini"
-                      icon="el-icon-delete"
-                      >删除</el-button
-                    >
-                  </span>
-                  <span>
-                    <el-button
-                      @click="pubGrade(scope.row)"
-                      type="danger"
-                      size="mini"
-                      icon="el-icon-bell"
-                      >成绩发布</el-button
-                    >
-                  </span>
+                  <el-button
+                    @click="editMarkWorkModal(scope.row)"
+                    type="primary"
+                    size="mini"
+                    icon="el-icon-edit"
+                    plain
+                    >编辑</el-button
+                  >
+                  <el-dropdown
+                    style="margin-left:10px;"
+                    placement="bottom-start"
+                  >
+                    <el-button size="mini" type="primary" plain>
+                      更多 <i class="el-icon-arrow-down el-icon--right"></i>
+                    </el-button>
+                    <el-dropdown-menu slot="dropdown">
+                      <el-dropdown-item v-if="scope.row.status == 2">
+                        <el-button
+                          @click="recreate(scope.row)"
+                          type="primary"
+                          size="mini"
+                          plain
+                          >重新创建</el-button
+                        >
+                      </el-dropdown-item>
+                      <el-dropdown-item>
+                        <el-button
+                          @click="delMarkWork(scope.row)"
+                          type="danger"
+                          size="mini"
+                          icon="el-icon-delete"
+                          plain
+                          >删除</el-button
+                        >
+                      </el-dropdown-item>
+                      <el-dropdown-item>
+                        <el-button
+                          @click="pubGrade(scope.row)"
+                          size="mini"
+                          icon="el-icon-bell"
+                          >成绩发布</el-button
+                        >
+                      </el-dropdown-item>
+                    </el-dropdown-menu>
+                  </el-dropdown>
                 </div>
               </template>
             </el-table-column>
@@ -125,9 +135,11 @@
             <el-pagination
               background
               @current-change="handleCurrentChange"
+              @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              layout="total, prev, pager, next, jumper"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>
           </div>
@@ -135,7 +147,6 @@
           <el-dialog
             @open="openModal"
             @close="closeModal"
-            :close-on-click-modal="closeClickModal"
             :title="examTitle"
             v-loading="loading"
             element-loading-text="拼命加载中"
@@ -147,19 +158,19 @@
               ref="formMarkWork"
               label-position="right"
               label-width="110px"
+              inline-message
             >
-              <el-row :gutter="10">
+              <el-row>
                 <el-col :xs="12" :sm="12" :md="12" :lg="12">
                   <el-form-item label="评卷工作名称" prop="name">
                     <el-input
-                      :autofocus="autofocus"
                       placeholder="评卷工作名称"
                       v-model="formMarkWork.name"
                     ></el-input>
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row :gutter="10">
+              <el-row>
                 <el-col :xs="12" :sm="12" :md="12" :lg="12">
                   <el-form-item label="考试批次" prop="examId">
                     <el-select
@@ -184,7 +195,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row :gutter="10">
+              <el-row>
                 <el-col :xs="20" :sm="20" :md="20" :lg="20">
                   <el-form-item label="备注" prop="remark">
                     <el-input
@@ -196,7 +207,7 @@
                   </el-form-item>
                 </el-col>
               </el-row>
-              <el-row :gutter="10">
+              <el-row style="margin-top:10px;">
                 <el-col>
                   <el-form-item>
                     <el-button type="primary" @click="saveMarkWork"
@@ -252,7 +263,6 @@ export default {
       examTitle: "",
       loading: true,
       closeClickModal: false,
-      autofocus: true,
       isAdmin: false,
       oldWorkName: ""
     };
@@ -342,8 +352,7 @@ export default {
       console.log("open");
     },
     closeModal() {
-      this.$refs.formMarkWork.resetFields();
-      this.formMarkWork = {};
+      console.log("close");
     },
     initModal() {
       this.formMarkWork = { name: "", examId: "", remark: "" };
@@ -514,8 +523,23 @@ export default {
       this.markWorkDialog = false;
     },
     resetForm() {
-      this.formMarkWork.name = "";
-      this.formMarkWork.remark = "";
+      if (this.markWorkId) {
+        //编辑
+        this.formMarkWork = Object.assign(this.formMarkWork, {
+          remark: "",
+          name: ""
+        });
+        this.$refs["formMarkWork"].clearValidate();
+      } else {
+        //新增
+        this.formMarkWork = Object.assign(this.formMarkWork, {
+          remark: "",
+          examId: "",
+          examName: "",
+          name: ""
+        });
+        this.$refs["formMarkWork"].clearValidate();
+      }
     },
     handleCurrentChange(val) {
       this.currentPage = val;
@@ -523,6 +547,11 @@ export default {
       this.paging();
       //this.searchMarkWork()
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.filterMarkWork();
+      this.paging();
+    },
     update(selected) {
       this.formMarkWork.examId = selected;
     },

src/modules/marking/views/MarkWorkOverview.vue

@@ -34,7 +34,7 @@
                     ></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item class="pull-right">
+                <el-form-item>
                   <el-button
                     size="small"
                     type="primary"
@@ -55,6 +55,7 @@
           </el-form>
           <!-- 页面列表 -->
           <el-table
+            stripe
             v-loading="loading"
             element-loading-text="拼命加载中"
             :data="tableData"
@@ -99,6 +100,7 @@
                   @click="courseDetail(scope.row)"
                   type="primary"
                   size="mini"
+                  plain
                   >详情</el-button
                 >
               </template>
@@ -108,9 +110,11 @@
             <el-pagination
               background
               @current-change="handleSettingCurrentChange"
+              @size-change="handleSizeChange"
               :current-page="currentPage"
-              :page-size="10"
-              layout="total, prev, pager, next, jumper"
+              :page-size="pageSize"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>
           </div>
@@ -262,6 +266,10 @@ export default {
       this.currentPage = val;
       this.searchSetting();
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.searchSetting();
+    },
     pagingSetting() {
       var start = (this.currentPage - 1) * this.pageSize;
       var end =

src/modules/marking/views/Marker.vue

@@ -23,7 +23,7 @@
               ></el-input>
             </el-form-item>
 
-            <el-form-item class="pull-right">
+            <el-form-item>
               <el-button
                 size="small"
                 type="primary"
@@ -43,6 +43,7 @@
 
           <!-- 页面列表 -->
           <el-table
+            stripe
             v-loading="loading"
             element-loading-text="拼命加载中"
             :data="tableData"
@@ -80,6 +81,7 @@
                   @click="markerDetail(scope.row)"
                   type="primary"
                   size="mini"
+                  plain
                   >详情</el-button
                 >
               </template>
@@ -89,9 +91,11 @@
             <el-pagination
               background
               @current-change="handleSettingCurrentChange"
+              @size-change="handleSizeChange"
               :current-page="currentPage"
-              :page-size="10"
-              layout="total, prev, pager, next, jumper"
+              :page-size="pageSize"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>
           </div>
@@ -131,6 +135,10 @@ export default {
       this.currentPage = val;
       this.searchSetting();
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.searchSetting();
+    },
     pagingSetting() {
       var start = (this.currentPage - 1) * this.pageSize;
       var end =

src/modules/marking/views/MarkerDetail.vue

@@ -25,7 +25,7 @@
               ></el-input>
             </el-form-item>
 
-            <el-form-item class="pull-right">
+            <el-form-item>
               <el-button
                 size="small"
                 type="primary"
@@ -48,6 +48,7 @@
 
           <!-- 页面列表 -->
           <el-table
+            stripe
             v-loading="loading"
             element-loading-text="拼命加载中"
             :data="tableData"
@@ -79,9 +80,11 @@
             <el-pagination
               background
               @current-change="handleSettingCurrentChange"
+              @size-change="handleSizeChange"
               :current-page="currentPage"
-              :page-size="10"
-              layout="total, prev, pager, next, jumper"
+              :page-size="pageSize"
+              :page-sizes="[10, 20, 50, 100]"
+              layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>
           </div>
@@ -122,6 +125,10 @@ export default {
       this.currentPage = val;
       this.searchSetting();
     },
+    handleSizeChange(val) {
+      this.pageSize = val;
+      this.searchSetting();
+    },
     pagingSetting() {
       var start = (this.currentPage - 1) * this.pageSize;
       var end =

src/modules/marking/views/Marking.vue

@@ -73,7 +73,7 @@
                   >
                 </el-form-item>
               </el-form>
-              <el-table :data="changeTasks" border style="width: 100%">
+              <el-table :data="changeTasks" border style="width: 100%" script>
                 <el-table-column
                   label="课程代码"
                   width="250"
@@ -109,7 +109,7 @@
                   background
                   @current-change="taskCurrentChange"
                   :current-page="taskCurrentPage"
-                  :page-size="pageSize"
+                  :page-size="taskPageSize"
                   layout="total, prev, pager, next, jumper"
                   :total="changeTaskTotal"
                 ></el-pagination>
@@ -123,7 +123,12 @@
             width="80%"
           >
             <div class="scroll">
-              <el-table :data="markedResults" border style="width: 100%;">
+              <el-table
+                :data="markedResults"
+                border
+                style="width: 100%;"
+                script
+              >
                 <el-table-column
                   label="答卷Id"
                   width="100"
@@ -133,9 +138,9 @@
                 <el-table-column label="评阅时间">
                   <template slot-scope="scope">
                     <div>
-                      <span style="margin-left: 10px">
-                        {{ dateFormatter(scope.row) }}
-                      </span>
+                      <span style="margin-left: 10px">{{
+                        dateFormatter(scope.row)
+                      }}</span>
                     </div>
                   </template>
                 </el-table-column>
@@ -145,18 +150,18 @@
                 <el-table-column label="问题卷">
                   <template slot-scope="scope">
                     <div>
-                      <span style="margin-left: 10px">
-                        {{ getTagName(scope.row.tag) }}
-                      </span>
+                      <span style="margin-left: 10px">{{
+                        getTagName(scope.row.tag)
+                      }}</span>
                     </div>
                   </template>
                 </el-table-column>
                 <el-table-column label="评卷备注">
                   <template slot-scope="scope">
                     <div>
-                      <span style="margin-left: 10px">
-                        {{ scope.row.markRemark }}
-                      </span>
+                      <span style="margin-left: 10px">{{
+                        scope.row.markRemark
+                      }}</span>
                     </div>
                   </template>
                 </el-table-column>
@@ -177,9 +182,11 @@
                 <el-pagination
                   background
                   @current-change="markedCurrentChange"
+                  @size-change="markedSizeChange"
                   :current-page="markedCurrentPage"
-                  :page-size="pageSize"
-                  layout="total, prev, pager, next, jumper"
+                  :page-size="markedPageSize"
+                  :page-sizes="[10, 20, 50, 100]"
+                  layout="total, sizes, prev, pager, next, jumper"
                   :total="markedTotal"
                 ></el-pagination>
               </div>
@@ -272,8 +279,10 @@ export default {
       markedResult: {},
       loading: true,
       taskCurrentPage: 1,
+      taskPageSize: 10,
       taskTotal: 0,
       markedCurrentPage: 1,
+      markedPageSize: 10,
       markedTotal: 0,
       pageSize: 10,
       mark_type: "正评",
@@ -366,6 +375,10 @@ export default {
       this.markedCurrentPage = val;
       this.getMarkedTask();
     },
+    markedSizeChange(val) {
+      this.markedPageSize = val;
+      this.getMarkedTask();
+    },
     async markTaskSelect(index, row) {
       this.backMark = true;
       this.paperMark = true;
@@ -505,7 +518,7 @@ export default {
             "/" +
             this.markedCurrentPage +
             "/" +
-            this.pageSize
+            this.markedPageSize
         )
         .then(response => {
           self.markedResults = response.data.data;

src/modules/marking/views/TpMain.vue

@@ -391,12 +391,12 @@ export default {
 .markmain::-webkit-scrollbar-thumb {
   /*滚动条里面小方块*/
   border-radius: 5px;
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
   background: rgba(0, 0, 0, 0.2);
 }
 .markmain::-webkit-scrollbar-track {
   /*滚动条里面轨道*/
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
   border-radius: 0;
   background: rgba(0, 0, 0, 0.1);
 }
@@ -454,5 +454,6 @@ img {
 }
 .paper >>> .max-number {
   font-size: 20px;
+  color: #444444;
 }
 </style>

src/modules/marking/views/TpScoreBoard.vue

@@ -168,9 +168,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>
               </div>
             </el-radio-group>
           </span>
@@ -531,7 +531,10 @@ export default {
       }
       this.processTagPaper();
       this.loading = true;
-      let remarkValue = document.getElementById("remark").value;
+      let remarkValue = "";
+      if (document.getElementById("remark")) {
+        remarkValue = document.getElementById("remark").value;
+      }
       console.log("remarkValue: " + remarkValue);
       if (!this.markedResult.id) {
         console.log("提交resultItems", this.resultItems);
@@ -775,28 +778,26 @@ export default {
   width: 25%;
   min-height: 600px;
 }
-.scroll {
-  overflow: auto;
-  height: 300px;
-}
 .itemScroll {
-  overflow: auto;
+  overflow: hidden;
   height: 140px;
   margin-top: 15px;
 }
+.itemScroll:hover {
+  overflow: auto;
+}
 .itemScroll::-webkit-scrollbar {
   /*滚动条整体样式*/
   width: 8px; /*高宽分别对应横竖滚动条的尺寸*/
 }
 .itemScroll::-webkit-scrollbar-thumb {
-  /*滚动条里面小方块*/
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
   border-radius: 5px;
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
   background: rgba(0, 0, 0, 0.2);
 }
 .itemScroll::-webkit-scrollbar-track {
   /*滚动条里面轨道*/
-  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
+  box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
   border-radius: 0;
   background: rgba(0, 0, 0, 0.1);
 }