评卷名称列表接口改造

src/modules/marking/views/MarkPaperCheck.vue

@@ -14,6 +14,8 @@
                 v-model="formSearch.workId"
                 clearable
                 filterable
+                :remote-method="getMarkWorks"
+                remote
                 class="input"
                 placeholder="请选择"
                 style="width: 150px"
@@ -466,11 +468,11 @@ export default {
         identityNumber: "",
       });
     },
-    getMarkWorks() {
+    getMarkWorks(name = "") {
       this.$http
-        .get(MARKING_LOGIC_API + "/markWorks?status=1")
+        .get(MARKING_LOGIC_API + "/markWorks?status=1" + `&name=${name}`)
         .then((response) => {
-          this.markWorkList = response.data;
+          this.markWorkList = response.data?.content || [];
           if (this.$route.query && this.$route.query.workId) {
             this.formSearch.workId = parseInt(this.$route.query.workId);
           }

src/modules/marking/views/MarkSettingWork.vue

@@ -17,6 +17,11 @@
                 @keyup.native="searchMarkWork"
               ></el-input>
             </el-form-item>
+            <el-form-item>
+              <el-button size="small" type="primary" @click="search"
+                >查询</el-button
+              >
+            </el-form-item>
           </el-form>
           <el-table
             v-loading="loading"
@@ -111,16 +116,33 @@ export default {
     this.initMarkWork();
   },
   methods: {
+    search() {
+      this.currentPage = 1;
+      this.initMarkWork();
+    },
     initMarkWork() {
       this.loading = true;
       this.$http
-        .get(MARKING_LOGIC_API + "/markWorks?userId=" + this.user.userId)
+        .get(
+          MARKING_LOGIC_API +
+            "/markWorks?userId=" +
+            this.user.userId +
+            `&pageNumber=${this.currentPage - 1}&pageSize=${
+              this.pageSize
+            }&name=${this.formSearch.name}`
+        )
         .then((response) => {
-          this.totalTableData = response.data;
-          this.total = response.data.length;
-          this.filterMarkWork();
-          this.paging();
+          this.tableData = response.data?.content || [];
+          // this.total = response.data.length;
+          this.total = response.data?.totalElements;
+          // this.filterMarkWork();
+          // this.paging();
           this.loading = false;
+          // this.totalTableData = response.data;
+          // this.total = response.data.length;
+          // this.filterMarkWork();
+          // this.paging();
+          // this.loading = false;
         });
     },
     searchMarkWork() {
@@ -140,29 +162,31 @@ export default {
     },
     handleCurrentChange(val) {
       this.currentPage = val;
-      this.filterMarkWork();
-      this.paging();
+      this.initMarkWork();
+      // this.filterMarkWork();
+      // this.paging();
       //this.searchMarkWork()
     },
     handleSizeChange(val) {
       this.pageSize = val;
-      this.filterMarkWork();
-      this.paging();
+      this.initMarkWork();
+      // this.filterMarkWork();
+      // this.paging();
       //this.searchMarkWork()
     },
     paging() {
-      var start = (this.currentPage - 1) * this.pageSize;
-      var end =
-        this.currentPage * this.pageSize < this.total
-          ? this.currentPage * this.pageSize
-          : this.total;
-      var tempData = [];
-      console.log(`当前页: ${this.currentPage},开始:${start},结束:${end}`);
-      for (let i = start; i < end; i++) {
-        tempData.push(this.tableData[i]);
-      }
-      console.log(tempData);
-      this.tableData = tempData;
+      // var start = (this.currentPage - 1) * this.pageSize;
+      // var end =
+      //   this.currentPage * this.pageSize < this.total
+      //     ? this.currentPage * this.pageSize
+      //     : this.total;
+      // var tempData = [];
+      // console.log(`当前页: ${this.currentPage},开始:${start},结束:${end}`);
+      // for (let i = start; i < end; i++) {
+      //   tempData.push(this.tableData[i]);
+      // }
+      // console.log(tempData);
+      // this.tableData = tempData;
     },
     marking(row) {
       var userId = this.user.userId;

src/modules/marking/views/MarkWork.vue

@@ -14,19 +14,19 @@
               <el-input
                 v-model="formSearch.name"
                 placeholder="评卷工作名称"
-                @keyup.native="searchMarkWork"
               ></el-input>
             </el-form-item>
             <el-form-item>
-              <span>
-                <el-button
-                  size="small"
-                  type="primary"
-                  icon="el-icon-plus"
-                  @click="addMarkWorkModal"
-                  >新增</el-button
-                >
-              </span>
+              <el-button size="small" type="primary" @click="search"
+                >查询</el-button
+              >
+              <el-button
+                size="small"
+                type="primary"
+                icon="el-icon-plus"
+                @click="addMarkWorkModal"
+                >新增</el-button
+              >
             </el-form-item>
           </el-form>
           <div class="block-seperator"></div>
@@ -442,19 +442,32 @@ export default {
           //this.loading = false;
         });
     },
+    search() {
+      this.currentPage = 1;
+      this.initMarkWorkData();
+    },
     initMarkWorkData() {
       var orgId = this.user.rootOrgId;
       this.loading = true;
       this.$http
-        .get(MARKING_LOGIC_API + "/markWorks?orgId=" + orgId)
+        .get(
+          MARKING_LOGIC_API +
+            "/markWorks?orgId=" +
+            orgId +
+            `&pageNumber=${this.currentPage - 1}&pageSize=${
+              this.pageSize
+            }&name=${this.formSearch.name}`
+        )
         .then((response) => {
           console.log(response);
-          this.totalTableData = response.data;
-          this.total = response.data.length;
-          this.filterMarkWork();
-          this.paging();
+          // this.totalTableData = response.data;
+          this.tableData = response.data?.content || [];
+          // this.total = response.data.length;
+          this.total = response.data?.totalElements;
+          // this.filterMarkWork();
+          // this.paging();
           this.loading = false;
-          this.getWorkStatus();
+          // this.getWorkStatus();
         });
     },
     getWorkStatus() {
@@ -505,17 +518,17 @@ export default {
       this.total = tempData.length;
     },
     paging() {
-      var start = (this.currentPage - 1) * this.pageSize;
-      var end =
-        this.currentPage * this.pageSize < this.total
-          ? this.currentPage * this.pageSize
-          : this.total;
-      var tempData = [];
-      console.log(`当前页: ${this.currentPage},开始:${start},结束:${end}`);
-      for (let i = start; i < end; i++) {
-        tempData.push(this.tableData[i]);
-      }
-      this.tableData = tempData;
+      // var start = (this.currentPage - 1) * this.pageSize;
+      // var end =
+      //   this.currentPage * this.pageSize < this.total
+      //     ? this.currentPage * this.pageSize
+      //     : this.total;
+      // var tempData = [];
+      // console.log(`当前页: ${this.currentPage},开始:${start},结束:${end}`);
+      // for (let i = start; i < end; i++) {
+      //   tempData.push(this.tableData[i]);
+      // }
+      // this.tableData = tempData;
     },
     openModal() {
       console.log("open");
@@ -773,14 +786,16 @@ export default {
     },
     handleCurrentChange(val) {
       this.currentPage = val;
-      this.filterMarkWork();
-      this.paging();
+      this.initMarkWorkData();
+      // this.filterMarkWork();
+      // this.paging();
       //this.searchMarkWork()
     },
     handleSizeChange(val) {
       this.pageSize = val;
-      this.filterMarkWork();
-      this.paging();
+      this.initMarkWorkData();
+      // this.filterMarkWork();
+      // this.paging();
     },
   },
 };

src/modules/marking/views/MarkWorkOverview.vue

@@ -14,6 +14,8 @@
                 v-model="markWorkSearchForm.markId"
                 clearable
                 filterable
+                :remote-method="getMarkWorks"
+                remote
                 class="input"
                 placeholder="请选择"
                 @change="searchMarkWork"
@@ -431,16 +433,19 @@ export default {
       this.tableData = [];
       this.total = 0;
     },
-    getMarkWorks() {
+    getMarkWorks(name = "") {
       this.$http
-        .get(MARKING_LOGIC_API + "/markWorks?status=1")
+        .get(MARKING_LOGIC_API + "/markWorks?status=1" + `&name=${name}`)
         .then((response) => {
-          this.markWorkList = response.data;
+          this.markWorkList = response.data?.content || [];
           if (this.$route.query && this.$route.query.markId) {
             this.markWorkSearchForm.markId = parseInt(this.$route.query.markId);
           }
         });
     },
+    getMarkWorksByName(name) {
+      this.getMarkWorks(name);
+    },
     getCourses() {
       this.$http
         .get(

src/modules/marking/views/Marker.vue

@@ -14,6 +14,8 @@
                 v-model="formSearch.workId"
                 clearable
                 filterable
+                :remote-method="getMarkWorks"
+                remote
                 class="input"
                 placeholder="请选择"
                 @clear="clearData"
@@ -284,11 +286,11 @@ export default {
       });
     },
     //获取创建成功的markWork列表
-    getMarkWorks() {
+    getMarkWorks(name = "") {
       this.$http
-        .get(MARKING_LOGIC_API + "/markWorks?status=1")
+        .get(MARKING_LOGIC_API + "/markWorks?status=1" + `&name=${name}`)
         .then((response) => {
-          this.markWorkList = response.data;
+          this.markWorkList = response.data?.content || [];
           if (this.$route.query && this.$route.query.workId) {
             this.formSearch.workId = parseInt(this.$route.query.workId);
           }

src/modules/marking/views/export_task_list.vue

@@ -10,6 +10,8 @@
           v-model="formSearch.workId"
           clearable
           filterable
+          :remote-method="getMarkWorks"
+          remote
           class="input"
           placeholder="请选择"
           size="small"
@@ -186,11 +188,11 @@ export default {
     this.getMarkWorks();
   },
   methods: {
-    getMarkWorks() {
+    getMarkWorks(name = "") {
       this.$http
-        .get(MARKING_LOGIC_API + "/markWorks?status=1")
+        .get(MARKING_LOGIC_API + "/markWorks?status=1" + `&name=${name}`)
         .then((response) => {
-          this.markWorkList = response.data;
+          this.markWorkList = response.data?.content || [];
           if (this.$route.query && this.$route.query.workId) {
             this.formSearch.workId = parseInt(this.$route.query.workId);
           }
@@ -258,7 +260,8 @@ export default {
       this.formSearch.status = null;
     },
     resetSearchForm() {
-      this.formSearch.examId = "";
+      // this.formSearch.examId = "";
+      this.formSearch.workId = "";
       this.formSearch.type = null;
       this.formSearch.status = null;
       this.doSearch(1);