From 34aad61a28551efb6b35788760a798e7f04c340d Mon Sep 17 00:00:00 2001
From: 刘鸿 <liuhong@psunsky.com>
Date: Wed, 11 Dec 2024 15:08:23 +0800
Subject: [PATCH] fix:修复tag列表显示问题、分享班级问题

---
 src/views/basic/askTestQuestion/index.vue   | 13 +++++++++----
 src/views/basic/askTestQuestion/recycle.vue | 31 +++++++++++++++++++------------
 src/views/basic/askTestQuestion/update.vue  |  6 +++++-
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/views/basic/askTestQuestion/index.vue b/src/views/basic/askTestQuestion/index.vue
index c621fc8..2320b1d 100644
--- a/src/views/basic/askTestQuestion/index.vue
+++ b/src/views/basic/askTestQuestion/index.vue
@@ -386,6 +386,7 @@ export default {
             this.$store.getters.info.showRole ||
             this.$store.getters.info.permissions[0].role;
         this.query.dateStatus = "onWeek";
+        this.query.tagId = "";
         await this._loadQueryDatas();
     },
     methods: {
@@ -511,15 +512,18 @@ export default {
             this.subjectList = data?.subjectNames ?? [];
             this.query.subject = data?.subjectNames[0] ?? "";
         },
-        async _loadTypes() {
+        async _loadTypes(queryParams) {
             let fetchTypeNames =
                 this.role == "ROLE_PERSONAL"
                     ? this.$request.pPaperTagList
                     : this.$request.fetchTypeNames;
 
             const { data, status, info } = await fetchTypeNames({
-                classId: this.query.class,
+                ...queryParams,
+                status: 1,
                 type: 0,
+                page: this.listPage.page,
+                size: this.listPage.size
             });
             if (status != 0) {
                 this.$message.error(info);
@@ -536,7 +540,6 @@ export default {
                 value: "",
                 label: "请选择标签",
             });
-            this.query.tagId = "";
         },
         async _loadClassData() {
             const fetchClassList =
@@ -558,7 +561,6 @@ export default {
             this.$loading.open();
             await this._loadClassData();
             await this._loadSubjectData();
-            if (this.dataType == "2") await this._loadTypes();
             this.$loading.close();
             await this._serach();
         },
@@ -580,6 +582,8 @@ export default {
                 share: this.tabType, //分享类型
             };
 
+
+
             queryParams.classId = this.query.class;
             queryParams.subjectName = this.query.subject;
             queryParams.tagId = this.query.tagId;
@@ -588,6 +592,7 @@ export default {
                 queryParams.start = this.query.dateRange[0] ?? "";
                 queryParams.end = this.query.dateRange[1] ?? "";
             }
+            if (this.dataType == "2") await this._loadTypes(queryParams);
             const { data, status, info } = await fetchPaperList({
                 ...queryParams,
                 status: 1,
diff --git a/src/views/basic/askTestQuestion/recycle.vue b/src/views/basic/askTestQuestion/recycle.vue
index 7b55481..87e9112 100644
--- a/src/views/basic/askTestQuestion/recycle.vue
+++ b/src/views/basic/askTestQuestion/recycle.vue
@@ -11,13 +11,13 @@
         </el-header>
         <div class="default-filter">
             <el-input v-model="query.paper" :placeholder="dataType == '1' ? '搜索课件' : '搜索试卷'"
-                suffix-icon="el-icon-search" class="filter-input"   clearable />
+                suffix-icon="el-icon-search" class="filter-input" clearable />
             <el-select @change="_changeClass" v-model="query.class" class="filter-select" placeholder="选择班级">
-                <el-option v-for="item  in classList" :key="item.classId" :label="item.className"
+                <el-option v-for="item in classList" :key="item.classId" :label="item.className"
                     :value="item.classId" />
             </el-select>
             <el-select v-model="query.subject" placeholder="选择科目" class="filter-select">
-                <el-option v-for=" item  in  subjectList " :key="item" :label="item" :value="item" />
+                <el-option v-for=" item in subjectList " :key="item" :label="item" :value="item" />
             </el-select>
             <el-select v-if="dataType == '2'" v-model="query.tagId" placeholder="选择测验类型" class="filter-select">
                 <el-option v-for="item in typeList" :key="item.label" :label="item.label" :value="item.value" />
@@ -89,7 +89,8 @@
         </el-main>
         <el-footer class="el-footer-pagination">
             <div class="el-footer-pagination-box">
-                <el-pagination background layout="prev, pager, next" :total="listPage.total">
+                <el-pagination @current-change="pageSizeChange" background layout="prev, pager, next"
+                    :page-size="listPage.size" :current-page="listPage.page" :total="listPage.total">
                 </el-pagination>
             </div>
         </el-footer>
@@ -141,7 +142,7 @@ export default {
             this.$store.getters.info.permissions[0].role;
 
         var dateRange = setDateRules('onDay');
-        console.log(dateRange)
+        this.query.tagId = "";
         this.query.dateRange = [dateRange.startDay, dateRange.endDay];
         await this._loadQueryDatas();
         await this._serach();
@@ -154,6 +155,10 @@ export default {
         }
     },
     methods: {
+        async pageSizeChange(value) {
+            this.listPage.page = value;
+            await this._serach();
+        },
         async modify(obj) {
             //恢复答题卡
             let modifyPaper =
@@ -212,14 +217,15 @@ export default {
             this.subjectList = data?.subjectNames ?? [];
             this.query.subject = data?.subjectNames[0] ?? "";
         },
-        async _loadTypes() {
+        async _loadTypes(queryParams) {
             let fetchTypeNames =
                 this.role == "ROLE_PERSONAL"
                     ? this.$request.pPaperTagList
                     : this.$request.fetchTypeNames;
 
             const { data, status, info } = await fetchTypeNames({
-                classId: this.query.class,
+                ...queryParams,
+                status: queryParams.type,
                 type: 0,
             });
             if (status != 0) {
@@ -237,7 +243,6 @@ export default {
                 value: "",
                 label: "请选择标签",
             });
-            this.query.tagId = "";
         },
         async _loadClassData() {
             const fetchClassList =
@@ -259,7 +264,6 @@ export default {
             this.$loading.open();
             await this._loadClassData();
             await this._loadSubjectData();
-            if (this.dataType == "2") await this._loadTypes();
             this.$loading.close();
             await this._serach();
         },
@@ -284,9 +288,12 @@ export default {
             queryParams.subjectName = this.query.subject;
             queryParams.tagId = this.query.tagId;
             queryParams.title = this.query.paper;
-            // queryParams.start = this.query.dateRange[0];
-            // queryParams.end = this.query.dateRange[1];
-
+            if (this.query?.dateRange?.length >= 2) {
+                queryParams.start = this.query.dateRange[0] ?? "";
+                queryParams.end = this.query.dateRange[1] ?? "";
+            }
+            console.log(queryParams)
+            if (this.dataType == "2") await this._loadTypes(queryParams);
             const { data, status, info } = await fetchPaperList({
                 ...queryParams,
                 status: 2,
diff --git a/src/views/basic/askTestQuestion/update.vue b/src/views/basic/askTestQuestion/update.vue
index d944f9a..c562ea8 100644
--- a/src/views/basic/askTestQuestion/update.vue
+++ b/src/views/basic/askTestQuestion/update.vue
@@ -510,7 +510,11 @@ export default {
 
       this.classSharingType = true;
 
-      var classResponse = await this.$request.tClassFromGrade(this.classId, this.form.subjectName);
+      var grade = this.gradeClassList.find(item => item.gradeName == this.form.gradeName);
+      
+      var classResponse = await this.$request.tClassGrade(grade?.grade, this.form.subjectName);
+      
+      // var classResponse = await this.$request.tClassFromGrade(this.classId, this.form.subjectName);
 
       if (classResponse.status != 0) {
         this.$message.error(classResponse.info);
--
libgit2 0.21.4