Merge remote-tracking branch 'origin/dev' into dev

src/views/system/testScoreBatch/index.vue

@@ -413,21 +413,29 @@
         >
         </el-table-column>
       </el-table>
-      <el-button
-        type="success"
-        plain
-        size="mini"
-        @click="itemclick"
-        style="margin-top: 30px; margin-left: 20px"
-        >选择完成</el-button
-      >
+
       <pagination
         v-show="total4 > 0"
         :total="total4"
         :page.sync="queryParams4.pageNum"
         :limit.sync="queryParams4.pageSize"
         @pagination="getList"
+          style="margin-top: 40px"
       />
+
+       <el-button
+        type="primary"
+          size="mini"
+        @click="itemclick"
+       style="
+            margin-top: 30px;
+            margin-left: 85%;
+            width: 100px;
+            height: 50px;
+            font-size: 15px;
+          "
+        >选择完成</el-button
+      >
     </el-dialog>
 
     <el-dialog
@@ -774,4 +782,4 @@ export default {
   text-align: center;
   border-radius: 4px;
 }
-</style>
+</style>