From 27399e087a3ed2f07d5c7b2a7cac91b7bfd19804 Mon Sep 17 00:00:00 2001
From: hebo <hebo163@163.com>
Date: Mon, 15 Sep 2025 15:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=89=E8=AF=BE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/base/pbApi.ts                         | 57 +++++++++++++++++++
 src/api/base/xkPbApi.ts                       | 57 -------------------
 src/components/BasicNjBjSelect/demo.vue       |  1 +
 .../view/routine/kefuxuncha/kyXkList.vue      | 10 ++--
 .../view/routine/kefuxuncha/xcPbList.vue      |  4 +-
 .../view/routine/kefuxuncha/xcXkList.vue      |  2 +-
 6 files changed, 66 insertions(+), 65 deletions(-)
 create mode 100644 src/api/base/pbApi.ts
 delete mode 100644 src/api/base/xkPbApi.ts

diff --git a/src/api/base/pbApi.ts b/src/api/base/pbApi.ts
new file mode 100644
index 0000000..a966b47
--- /dev/null
+++ b/src/api/base/pbApi.ts
@@ -0,0 +1,57 @@
+import { get, post } from "@/utils/request";
+
+/**
+ * 获取选课排班分页数据
+ */
+export const getPbPageApi = async (params: any) => {
+  return await get("/api/pb/findPage", params);
+};
+
+/**
+ * 根据ID获取选课排班详情
+ */
+export const getPbByIdApi = async (id: string) => {
+  return await get(`/api/pb/${id}`);
+};
+
+/**
+ * 创建选课排班
+ */
+export const createPbApi = async (params: any) => {
+  return await post("/api/pb", params);
+};
+
+/**
+ * 更新选课排班
+ */
+export const updatePbApi = async (params: any) => {
+  return await post("/api/pb/update", params);
+};
+
+/**
+ * 删除选课排班
+ */
+export const deletePbApi = async (id: string) => {
+  return await post(`/api/pb/delete/${id}`);
+};
+
+/**
+ * 根据选课ID获取排班列表
+ */
+export const getPbListByXkIdApi = async (params: any) => {
+  return await get("/api/pb/findByXkId", params);
+};
+
+/**
+ * 课程巡查接口
+ */
+export const getXcCourseListApi = async (params: any) => {
+  return await get("/api/pb/getXcCourseList", params);
+};
+
+/**
+ * 课业辅导巡查接口
+ */
+export const getKyXcCourseListApi = async (params: any) => {
+  return await get("/api/pb/getKyXcCourseList", params);
+};
diff --git a/src/api/base/xkPbApi.ts b/src/api/base/xkPbApi.ts
deleted file mode 100644
index 6c8716e..0000000
--- a/src/api/base/xkPbApi.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-import { get, post } from "@/utils/request";
-
-/**
- * 获取选课排班分页数据
- */
-export const getXkPbPageApi = async (params: any) => {
-  return await get("/api/xkPb/findPage", params);
-};
-
-/**
- * 根据ID获取选课排班详情
- */
-export const getXkPbByIdApi = async (id: string) => {
-  return await get(`/api/xkPb/${id}`);
-};
-
-/**
- * 创建选课排班
- */
-export const createXkPbApi = async (params: any) => {
-  return await post("/api/xkPb", params);
-};
-
-/**
- * 更新选课排班
- */
-export const updateXkPbApi = async (params: any) => {
-  return await post("/api/xkPb/update", params);
-};
-
-/**
- * 删除选课排班
- */
-export const deleteXkPbApi = async (id: string) => {
-  return await post(`/api/xkPb/delete/${id}`);
-};
-
-/**
- * 根据选课ID获取排班列表
- */
-export const getXkPbListByXkIdApi = async (params: any) => {
-  return await get("/api/xkPb/findByXkId", params);
-};
-
-/**
- * 课程巡查接口
- */
-export const getXcCourseListApi = async (params: any) => {
-  return await get("/api/xkPb/getXcCourseList", params);
-};
-
-/**
- * 课业辅导巡查接口
- */
-export const getKyXcCourseListApi = async (params: any) => {
-  return await get("/api/xkPb/getKyXcCourseList", params);
-};
diff --git a/src/components/BasicNjBjSelect/demo.vue b/src/components/BasicNjBjSelect/demo.vue
index f18c646..4f83ca9 100644
--- a/src/components/BasicNjBjSelect/demo.vue
+++ b/src/components/BasicNjBjSelect/demo.vue
@@ -157,3 +157,4 @@ const setDefaultValue = () => {
 
 
 
+
diff --git a/src/pages/view/routine/kefuxuncha/kyXkList.vue b/src/pages/view/routine/kefuxuncha/kyXkList.vue
index 8232ca2..faf5300 100644
--- a/src/pages/view/routine/kefuxuncha/kyXkList.vue
+++ b/src/pages/view/routine/kefuxuncha/kyXkList.vue
@@ -91,7 +91,7 @@
 
 <script setup lang="ts">
 
-import { getKyXcCourseListApi } from "@/api/base/xkPbApi";
+import { getKyXcCourseListApi } from "@/api/base/pbApi";
 import { useDataStore } from "@/store/modules/data";
 import { useUserStore } from "@/store/modules/user";
 import { onBeforeUnmount, onMounted, ref } from "vue";
@@ -121,12 +121,12 @@ onMounted(async () => {
   // 优先从global获取排班数据，如果没有则从data获取
   let pbData = dataStore.getGlobal;
   
-  if (!pbData || !pbData.xcbt || !pbData.xcbt.includes('课业辅导巡计划')) {
+  if (!pbData || !pbData.xcbt ) {
     pbData = dataStore.getData;
   }
   
   // 检查数据是否有效
-  if (!pbData || !pbData.xcbt || pbData.xcbt.includes('课业辅导巡计划') === false) {
+  if (!pbData || !pbData.xcbt ) {
     uni.showToast({
       title: '数据异常，请重新选择排班',
       icon: 'none'
@@ -256,7 +256,7 @@ const goXc = (xkkc: any) => {
   const pbData = dataStore.getGlobal;
   
   // 检查排班数据是否有效
-  if (!pbData || !pbData.xcbt || !pbData.xcbt.includes('课业辅导巡计划')) {
+  if (!pbData || !pbData.xcbt ) {
     uni.showToast({
       title: '数据异常，请重新选择排班',
       icon: 'none'
@@ -310,7 +310,7 @@ const goRecord = (xkkc: any) => {
   const pbData = dataStore.getGlobal;
   
   // 检查排班数据是否有效
-  if (!pbData || !pbData.xcbt || !pbData.xcbt.includes('课业辅导巡计划')) {
+  if (!pbData || !pbData.xcbt ) {
     uni.showToast({
       title: '数据异常，请重新选择排班',
       icon: 'none'
diff --git a/src/pages/view/routine/kefuxuncha/xcPbList.vue b/src/pages/view/routine/kefuxuncha/xcPbList.vue
index 67f2835..e6488b9 100644
--- a/src/pages/view/routine/kefuxuncha/xcPbList.vue
+++ b/src/pages/view/routine/kefuxuncha/xcPbList.vue
@@ -69,7 +69,7 @@ import {
 } from "vue";
 import { useUserStore } from "@/store/modules/user";
 import { useDataStore } from "@/store/modules/data";
-import { getXkPbPageApi } from "@/api/base/xkPbApi";
+import { getPbPageApi } from "@/api/base/pbApi";
 import dayjs from "dayjs";
 
 const { getJs } = useUserStore();
@@ -114,7 +114,7 @@ const loadPbList = async (isRefresh = false) => {
       // xqId: '', // 学期ID
     };
 
-    const res: any = await getXkPbPageApi(params);
+    const res: any = await getPbPageApi(params);
     
     // 根据实际API响应结构判断成功条件
     if (res && (res.resultCode == 1 || res.rows || res.result)) {
diff --git a/src/pages/view/routine/kefuxuncha/xcXkList.vue b/src/pages/view/routine/kefuxuncha/xcXkList.vue
index 5b09ae1..f0c7b1b 100644
--- a/src/pages/view/routine/kefuxuncha/xcXkList.vue
+++ b/src/pages/view/routine/kefuxuncha/xcXkList.vue
@@ -103,7 +103,7 @@
 
 <script setup lang="ts">
 import { jsdXkListApi } from "@/api/base/server";
-import { getXcCourseListApi } from "@/api/base/xkPbApi";
+import { getXcCourseListApi } from "@/api/base/pbApi";
 import { useDataStore } from "@/store/modules/data";
 import { useUserStore } from "@/store/modules/user";
 import { onBeforeUnmount, onMounted, ref } from "vue";