소스 검색

fix click search not redirect to page 1

Michael Wang 3 년 전
부모
커밋
f02589a296

+ 1 - 0
src/features/allAnalysis/AllAnalysis2.vue

@@ -82,6 +82,7 @@ let pageNo = $ref(1);
 let totalElements = $ref(0);
 let totalElements = $ref(0);
 
 
 async function search() {
 async function search() {
+  pageNo = 1;
   await fetchData();
   await fetchData();
 }
 }
 
 

+ 1 - 1
src/features/allAnalysis/ScoreRate.vue

@@ -110,7 +110,7 @@ import {
 import EventBus from "@/plugins/eventBus";
 import EventBus from "@/plugins/eventBus";
 import { message } from "ant-design-vue";
 import { message } from "ant-design-vue";
 import { RANGE_POINT_TYPE } from "@/constants/constants";
 import { RANGE_POINT_TYPE } from "@/constants/constants";
-import { EChartsOption } from "echarts/types/dist/shared";
+import { EChartsOption } from "echarts";
 
 
 let activeKey = $ref(["0"]);
 let activeKey = $ref(["0"]);
 
 

+ 6 - 1
src/features/courseManagement/CourseManagement.vue

@@ -24,7 +24,7 @@
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
       <StateSelect v-model:value="enable" />
       <StateSelect v-model:value="enable" />
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
-      <a-button @click="search" class="query-btn">查询</a-button>
+      <a-button @click="clickSearch" class="query-btn">查询</a-button>
     </div>
     </div>
 
 
     <div
     <div
@@ -173,6 +173,11 @@ async function search() {
   await fetchData();
   await fetchData();
 }
 }
 
 
+async function clickSearch() {
+  pageNo = 1;
+  await fetchData();
+}
+
 watch(() => [pageNo, pageSize], fetchData);
 watch(() => [pageNo, pageSize], fetchData);
 
 
 async function fetchData() {
 async function fetchData() {

+ 1 - 0
src/features/paperAnalysis/PaperAnalysis.vue

@@ -106,6 +106,7 @@ let paperQuestionGroups = $ref([]);
 let sasPaper = $ref({});
 let sasPaper = $ref({});
 
 
 async function search() {
 async function search() {
+  pageNo = 1;
   await fetchData();
   await fetchData();
 }
 }
 
 

+ 1 - 1
src/features/paperAnalysis/QuestionBianPai.vue

@@ -28,7 +28,7 @@
 <script setup lang="ts">
 <script setup lang="ts">
 import EventBus from "@/plugins/eventBus";
 import EventBus from "@/plugins/eventBus";
 import { Question } from "@/types";
 import { Question } from "@/types";
-import { EChartsOption } from "echarts/types/dist/shared";
+import { EChartsOption } from "echarts";
 
 
 const props = defineProps<{ questions: Question[] }>();
 const props = defineProps<{ questions: Question[] }>();
 
 

+ 1 - 1
src/features/paperAnalysis/QuestionDifficultyGroup.vue

@@ -103,7 +103,7 @@ import { RANGE_POINT_TYPE } from "@/constants/constants";
 import EventBus from "@/plugins/eventBus";
 import EventBus from "@/plugins/eventBus";
 import { Question } from "@/types";
 import { Question } from "@/types";
 import { message } from "ant-design-vue";
 import { message } from "ant-design-vue";
-import { EChartsOption } from "echarts/types/dist/shared";
+import { EChartsOption } from "echarts";
 
 
 const props = defineProps<{
 const props = defineProps<{
   questions: Question[];
   questions: Question[];

+ 6 - 1
src/features/projectManagement/ProjectManagement.vue

@@ -12,7 +12,7 @@
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
       <ProjectStatusSelect v-model:value="projectStatus" />
       <ProjectStatusSelect v-model:value="projectStatus" />
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
-      <a-button @click="search" class="query-btn">查询</a-button>
+      <a-button @click="clickSearch" class="query-btn">查询</a-button>
     </div>
     </div>
 
 
     <div
     <div
@@ -201,6 +201,11 @@ async function search() {
   await fetchData();
   await fetchData();
 }
 }
 
 
+async function clickSearch() {
+  pageNo = 1;
+  await fetchData();
+}
+
 watch(() => [pageNo, pageSize], fetchData);
 watch(() => [pageNo, pageSize], fetchData);
 
 
 async function fetchData() {
 async function fetchData() {

+ 7 - 1
src/features/projectParamsManagement/ProjectParamsManagement.vue

@@ -3,7 +3,7 @@
     <div class="tw-bg-white tw-p-5 tw-rounded-xl tw-mb-5">
     <div class="tw-bg-white tw-p-5 tw-rounded-xl tw-mb-5">
       <ProjectCourseSelect :project-id="projectId" v-model:value="courseId" />
       <ProjectCourseSelect :project-id="projectId" v-model:value="courseId" />
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
-      <a-button @click="search" class="query-btn">查询</a-button>
+      <a-button @click="clickSearch" class="query-btn">查询</a-button>
     </div>
     </div>
 
 
     <div class="tw-my-4 tw-flex tw-gap-2">
     <div class="tw-my-4 tw-flex tw-gap-2">
@@ -129,11 +129,17 @@ async function search() {
   await fetchData();
   await fetchData();
 }
 }
 
 
+async function clickSearch() {
+  pageNo = 1;
+  await fetchData();
+}
+
 watch(() => [pageNo, pageSize], fetchData);
 watch(() => [pageNo, pageSize], fetchData);
 
 
 async function fetchData() {
 async function fetchData() {
   const res = await getProjectCourseList({
   const res = await getProjectCourseList({
     projectId,
     projectId,
+    courseName: "",
     pageSize,
     pageSize,
     pageNo,
     pageNo,
   });
   });

+ 6 - 1
src/features/rootOrg/RootOrg.vue

@@ -18,7 +18,7 @@
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
       <StateSelect v-model:value="enable" />
       <StateSelect v-model:value="enable" />
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
-      <a-button @click="search" class="query-btn">查询</a-button>
+      <a-button @click="clickSearch" class="query-btn">查询</a-button>
 
 
       <a-button @click="handleRootOrgSync" style="float: right">同步</a-button>
       <a-button @click="handleRootOrgSync" style="float: right">同步</a-button>
     </div>
     </div>
@@ -108,6 +108,11 @@ async function search() {
   totalElements = res.data.totalElements;
   totalElements = res.data.totalElements;
 }
 }
 
 
+async function clickSearch() {
+  pageNo = 1;
+  await search();
+}
+
 const columns = [
 const columns = [
   {
   {
     title: "顶级机构代码",
     title: "顶级机构代码",

+ 6 - 1
src/features/userManagement/UserManagement.vue

@@ -24,7 +24,7 @@
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
       <StateSelect v-model:value="enable" />
       <StateSelect v-model:value="enable" />
       <span class="tw-mr-4"></span>
       <span class="tw-mr-4"></span>
-      <a-button @click="search" class="query-btn">查询</a-button>
+      <a-button @click="clickSearch" class="query-btn">查询</a-button>
     </div>
     </div>
 
 
     <div class="tw-flex tw-gap-2 tw-my-4">
     <div class="tw-flex tw-gap-2 tw-my-4">
@@ -200,6 +200,11 @@ async function search() {
   await fetchData();
   await fetchData();
 }
 }
 
 
+async function clickSearch() {
+  pageNo = 1;
+  await fetchData();
+}
+
 watch(() => [pageNo, pageSize], fetchData);
 watch(() => [pageNo, pageSize], fetchData);
 
 
 async function fetchData() {
 async function fetchData() {