Merge remote-tracking branch 'origin/master'

src/modules/basic/view/campus.vue

@@ -330,7 +330,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/basic/view/course.vue

@@ -500,7 +500,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="10"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/basic/view/exam_site.vue

@@ -199,7 +199,7 @@
               @current-change="handleCurrentChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               @size-change="handleSizeChange"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"

src/modules/basic/view/resource_list.vue

@@ -133,7 +133,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/basic/view/school.vue

@@ -323,7 +323,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/basic/view/specially.vue

@@ -325,7 +325,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/basic/view/sys_prop_list.vue

@@ -209,7 +209,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/basic/view/user.vue

@@ -457,7 +457,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="10"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/examwork/view/examInfo.vue

@@ -218,7 +218,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/examwork/view/examStudent.vue

@@ -822,7 +822,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/examwork/view/examStudentImport.vue

@@ -160,7 +160,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/examwork/view/notice.vue

@@ -158,7 +158,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
@@ -363,7 +363,6 @@
                   @size-change="handleExamSizeChange"
                   :current-page="examCurrentPage"
                   :page-size="examPageSize"
-                  :page-sizes="[10]"
                   layout="total, sizes, prev, pager, next, jumper"
                   :total="examTotal"
                 ></el-pagination>
@@ -459,7 +458,6 @@
                   @size-change="handleMarkSizeChange"
                   :current-page="markCurrentPage"
                   :page-size="markPageSize"
-                  :page-sizes="[10]"
                   layout="total, sizes, prev, pager, next, jumper"
                   :total="markTotal"
                 ></el-pagination>

src/modules/examwork/view/offlineExamOrgSettings.vue

@@ -98,7 +98,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/examwork/view/onlineExamOrgSettings.vue

@@ -201,7 +201,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/examwork/view/student.vue

@@ -314,7 +314,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"
@@ -422,7 +422,7 @@
               @current-change="stuExamCurChange"
               :current-page="stuExamCurPage"
               :page-size="stuExamPageSize"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               @size-change="handleStuExamSizeChange"
               layout="total, sizes, prev, pager, next, jumper"
               :total="stuExamTotal"

src/modules/marking/views/CourseDetail.vue

@@ -101,7 +101,7 @@
               @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>

src/modules/marking/views/MarkPaperCheck.vue

@@ -243,7 +243,7 @@
               @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>

src/modules/marking/views/MarkSettingFast.vue

@@ -84,7 +84,7 @@
                   @size-change="handleSizeChange"
                   :current-page="curMarker"
                   :page-size="pageSize"
-                  :page-sizes="[10, 20, 50, 100]"
+                  :page-sizes="[10, 20, 50, 100, 200, 300]"
                   layout="total, sizes, prev, pager, next, jumper"
                   :total="totalMarker"
                 ></el-pagination>

src/modules/marking/views/MarkSettingMain.vue

@@ -190,7 +190,7 @@
               @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>

src/modules/marking/views/MarkSettingWork.vue

@@ -66,7 +66,7 @@
               @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             >

src/modules/marking/views/MarkWork.vue

@@ -176,7 +176,7 @@
               @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>

src/modules/marking/views/MarkWorkOverview.vue

@@ -138,7 +138,7 @@
               @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>

src/modules/marking/views/Marker.vue

@@ -132,7 +132,7 @@
               @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>

src/modules/marking/views/MarkerDetail.vue

@@ -89,7 +89,7 @@
               @size-change="handleSizeChange"
               :current-page="currentPage"
               :page-size="pageSize"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"
             ></el-pagination>

src/modules/marking/views/Marking.vue

@@ -182,7 +182,7 @@
                   @size-change="markedSizeChange"
                   :current-page="markedCurrentPage"
                   :page-size="markedPageSize"
-                  :page-sizes="[10, 20, 50, 100]"
+                  :page-sizes="[10, 20, 50, 100, 200, 300]"
                   layout="total, sizes, prev, pager, next, jumper"
                   :total="markedTotal"
                 ></el-pagination>

src/modules/oe/views/absent.vue

@@ -58,7 +58,7 @@
           @size-change="handleSizeChange"
           @current-change="handleCurrentChange"
           :current-page.sync="form.pageNo"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           :page-size="form.pageSize"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/oe/views/alreadyAudited.vue

@@ -217,7 +217,7 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page.sync="form.pageNo"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               :page-size="form.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"

src/modules/oe/views/awaitingAudit.vue

@@ -277,7 +277,7 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page.sync="form.pageNo"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               :page-size="form.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"

src/modules/oe/views/examDetail.vue

@@ -301,7 +301,7 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page.sync="form.pageNo"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               :page-size="form.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"

src/modules/oe/views/examScheduling.vue

@@ -242,7 +242,7 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page.sync="form.pageNo"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               :page-size="form.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"

src/modules/oe/views/illegalityNameList.vue

@@ -145,7 +145,7 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page.sync="form.pageNo"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               :page-size="form.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"

src/modules/oe/views/reexamine.vue

@@ -54,7 +54,7 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page.sync="form.pageNo"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               :page-size="form.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"

src/modules/oe/views/scoreStatistics.vue

@@ -144,6 +144,18 @@
               prop="isAbsent"
               width="120"
             ></el-table-column>
+            <el-table-column
+              sortable
+              label="客观分"
+              prop="objectiveScore"
+              width="120"
+            ></el-table-column>
+            <el-table-column
+              sortable
+              label="主观分"
+              prop="subjectiveScore"
+              width="120"
+            ></el-table-column>
             <el-table-column
               sortable
               label="最终成绩"
@@ -162,7 +174,7 @@
               @size-change="handleSizeChange"
               @current-change="handleCurrentChange"
               :current-page.sync="form.pageNo"
-              :page-sizes="[10, 20, 50, 100]"
+              :page-sizes="[10, 20, 50, 100, 200, 300]"
               :page-size="form.pageSize"
               layout="total, sizes, prev, pager, next, jumper"
               :total="total"

src/modules/print/view/CourseStatistic.vue

@@ -247,7 +247,7 @@
             :current-page="formSearch.pageNo"
             @size-change="handlePagerSize"
             :page-size="formSearch.pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             :total="totalElements"
             layout="total, sizes, prev, pager, next, jumper"
           ></el-pagination>

src/modules/print/view/ExamStructure.vue

@@ -112,7 +112,7 @@
             :current-page="formSearch.pageNo"
             @size-change="handlePagerSize"
             :page-size="formSearch.pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             :total="totalElements"
             layout="total, sizes, prev, pager, next, jumper"
           ></el-pagination>

src/modules/print/view/Project.vue

@@ -165,7 +165,7 @@
             :current-page="formSearch.pageNo"
             @size-change="handlePagerSize"
             :page-size="formSearch.pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             :total="totalElements"
             layout="total, sizes, prev, pager, next, jumper"
           ></el-pagination>

src/modules/questions/views/BluePaperStructure.vue

@@ -137,7 +137,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/questions/views/CourseProperty.vue

@@ -160,7 +160,7 @@
           @current-change="handleCurrentChange"
           :current-page.sync="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/questions/views/ExportStructure.vue

@@ -141,7 +141,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/questions/views/ExtractPaperRule.vue

@@ -155,7 +155,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/questions/views/GenPaper.vue

@@ -232,7 +232,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/questions/views/ImportPaper.vue

@@ -235,7 +235,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/questions/views/PaperStructure.vue

@@ -157,7 +157,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/questions/views/Question.vue

@@ -229,7 +229,7 @@
           @current-change="handleCurrentChange"
           :current-page="currentPage"
           :page-size="pageSize"
-          :page-sizes="[10, 20, 50, 100]"
+          :page-sizes="[10, 20, 50, 100, 200, 300]"
           @size-change="handleSizeChange"
           layout="total, sizes, prev, pager, next, jumper"
           :total="total"

src/modules/reports/views/ComputeJobList.vue

@@ -70,7 +70,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/reports/views/Overview.vue

@@ -109,7 +109,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"

src/modules/reports/views/Project.vue

@@ -170,7 +170,7 @@
             @current-change="handleCurrentChange"
             :current-page="currentPage"
             :page-size="pageSize"
-            :page-sizes="[10, 20, 50, 100]"
+            :page-sizes="[10, 20, 50, 100, 200, 300]"
             @size-change="handleSizeChange"
             layout="total, sizes, prev, pager, next, jumper"
             :total="total"