....

src/modules/examwork/view/examInfo.vue

@@ -38,7 +38,7 @@
               size="small"
               type="primary"
               icon="el-icon-search"
-              @click="searchForm"
+              @click="resetPageAndSearchForm"
               >查询
             </el-button>
             <el-button
@@ -323,6 +323,10 @@ export default {
       this.pageSize = val;
       this.searchForm();
     },
+    resetPageAndSearchForm() {
+      this.currentPage = 1;
+      this.searchForm();
+    },
     //查询方法
     searchForm() {
       var param = new URLSearchParams(this.formSearch);

src/modules/examwork/view/examStudent.vue

@@ -114,7 +114,7 @@
               size="small"
               type="primary"
               icon="el-icon-search"
-              @click="searchForm"
+              @click="resetPageAndSearchForm"
               >查询
             </el-button>
             <el-button size="small" @click="resetSearchForm"> 重置 </el-button>
@@ -678,7 +678,7 @@
               </span>
             </span>
           </el-table-column>
-          <el-table-column width="230" label="操作">
+          <el-table-column width="200" label="操作">
             <template slot-scope="scope">
               <div v-if="scope.row.locked">锁定中，请稍后操作</div>
               <div v-else>
@@ -687,30 +687,11 @@
                   size="mini"
                   type="primary"
                   plain
+                  icon="el-icon-edit"
                   @click="openUpdateDialog(scope.row)"
                 >
                   编辑
                 </el-button>
-                <el-button
-                  v-if="
-                    null != scope.row.enable &&
-                      !scope.row.enable &&
-                      rolePrivileges.change_exam_student_availability
-                  "
-                  size="mini"
-                  type="primary"
-                  plain
-                  @click="enableExamStudent(scope.row)"
-                  >启用
-                </el-button>
-                <el-button
-                  v-else-if="rolePrivileges.change_exam_student_availability"
-                  size="mini"
-                  type="primary"
-                  plain
-                  @click="disableExamStudent(scope.row)"
-                  >禁用
-                </el-button>
 
                 <el-dropdown style="margin-left: 10px;">
                   <el-button type="primary" plain size="mini">
@@ -737,6 +718,30 @@
                         查看照片
                       </el-button>
                     </el-dropdown-item>
+                    <el-dropdown-item>
+                      <el-button
+                        v-if="
+                          null != scope.row.enable &&
+                            !scope.row.enable &&
+                            rolePrivileges.change_exam_student_availability
+                        "
+                        size="mini"
+                        type="primary"
+                        plain
+                        @click="enableExamStudent(scope.row)"
+                        >启用
+                      </el-button>
+                      <el-button
+                        v-else-if="
+                          rolePrivileges.change_exam_student_availability
+                        "
+                        size="mini"
+                        type="primary"
+                        plain
+                        @click="disableExamStudent(scope.row)"
+                        >禁用
+                      </el-button>
+                    </el-dropdown-item>
                   </el-dropdown-menu>
                 </el-dropdown>
               </div>
@@ -1161,6 +1166,10 @@ export default {
       this.formSearch.identityNumber = "";
       this.formSearch.examSite = "";
     },
+    resetPageAndSearchForm() {
+      this.currentPage = 1;
+      this.searchForm();
+    },
     //查询方法
     searchForm() {
       var param = new URLSearchParams(this.formSearch);

src/modules/examwork/view/offlineExamOrgSettings.vue

@@ -36,7 +36,7 @@
               size="small"
               type="primary"
               icon="el-icon-search"
-              @click="search"
+              @click="resetPageAndSearch"
               >查询</el-button
             >
             <el-button
@@ -82,11 +82,12 @@
               <div>
                 <el-button
                   size="mini"
-                  type="warning"
+                  type="primary"
                   plain
+                  icon="el-icon-edit"
                   @click="showUpdateOrgSetting(scope.row)"
                 >
-                  修改
+                  编辑
                 </el-button>
               </div>
             </template>
@@ -442,6 +443,11 @@ export default {
       this.orgSettingDatetimeRange = [];
       this.addOrgSettingDialog = true;
     },
+
+    resetPageAndSearch() {
+      this.currentPage = 1;
+      this.search();
+    },
     search() {
       let param = new URLSearchParams(this.formSearch);
       let url =

src/modules/examwork/view/student.vue

@@ -58,7 +58,7 @@
               size="small"
               type="primary"
               icon="el-icon-search"
-              @click="searchForm"
+              @click="resetPageAndSearchForm"
               >查询
             </el-button>
             <el-button size="small" @click="resetSearchForm"> 重置 </el-button>
@@ -647,6 +647,10 @@ export default {
       this.formSearch.enable = "";
       this.formSearch.hasPhoto = "ALL";
     },
+    resetPageAndSearchForm() {
+      this.currentPage = 1;
+      this.searchForm();
+    },
     //查询方法
     searchForm() {
       var param = new URLSearchParams(this.formSearch);