Merge branch 'iteration-20240723' into jenkins-test

src/views/courseware-list/api.ts

@@ -87,3 +87,11 @@ export const api_classDetailCourseware = (params: any) => {
 export const api_coursewareCheckUpdate = (params: any) => {
   return request.get('/edu-app/classLessonCourseware/checkUpdate/' + params.id);
 };
+
+
+/** 查询版本 */
+export const api_bookVersionPage = (params: any) => {
+  return request.post('/edu-app/bookVersion/page', {
+    data: params
+  })
+}

src/views/courseware-list/index.tsx

@@ -32,7 +32,8 @@ import {
   api_classLessonCoursewarePage,
   api_classLessonCoursewareDetail,
   api_schoolDetail,
-  api_subjectList
+  api_subjectList,
+  api_bookVersionPage
 } from './api';
 import { NImage } from 'naive-ui';
 import { state } from '@/state';
@@ -129,18 +130,24 @@ export default defineComponent({
 
     const getTanentList = async () => {
       try {
-        const schoolInfos = state.user.data.schoolInfos;
-        const schoolId =
-          schoolInfos && schoolInfos.length > 0 ? schoolInfos[0].id : null;
-        if (!schoolId) return;
-        const { data } = await api_schoolDetail({
-          id: schoolId
+        // const schoolInfos = state.user.data.schoolInfos;
+        // const schoolId =
+        //   schoolInfos && schoolInfos.length > 0 ? schoolInfos[0].id : null;
+        // if (!schoolId) return;
+        // await api_schoolDetail({
+        //   id: schoolId
+        // });
+        const { data } = await api_bookVersionPage({ type: 'COURSEWARE' });
+        const result = data.rows || []
+        baseBookVerionList.value = result.map((item: any) => {
+          return {
+            bookVersionId: item.id,
+            bookVersionName: item.name
+          };
         });
-
-        baseBookVerionList.value = data.bookVersionList || [];
         bookVersionList.value = deepClone(baseBookVerionList.value);
         const index = baseBookVerionList.value.findIndex(
-          (item: any) => item.bookVersionId == coursewareStorage.bookVersoinId
+          (item: any) => item.bookVersionId == coursewareStorage.bookVersionId
         );
         // 判断列表中是存在，缓存的教材数据
         if (index < 0) {

vite.config.ts

@@ -16,7 +16,7 @@ function resolve(dir: string) {
 // const proxyUrl = 'https://test.lexiaoya.cn/';
 // const proxyUrl = 'https://kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.143:7093/';
-const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://test.kt.colexiu.com/';
 export default defineConfig({
   base: './',
   plugins: [