Merge branch 'iteration-work' into jenkins

index.html

@@ -190,6 +190,7 @@
           });
           // 尝试监听install
         }
+        console.log('index.html')
         window.location.reload();
       }
       // let refreshing = false

public/version.json

@@ -1 +1 @@
-{"version":1708220053196}
+{"version":1708226990780}

src/components/RouterError/index.tsx

@@ -19,6 +19,7 @@ const reloadPage = async () => {
     });
     // 尝试监听install
   }
+  console.log('route index');
   window.location.reload();
 };
 

src/views/classList/components/afterWork.tsx

@@ -208,11 +208,11 @@ export default defineComponent({
       ];
     };
     const gotoWorkDetail = (row: any) => {
-      console.log(row);
       router.push({
         path: '/afterWorkDetail',
         query: {
           ...route.query,
+          classGroupId: row.classGroupId,
           teacherName: row.teacherName,
           trainingId: row.id
         }

src/views/classList/components/afterWorkDetail.tsx

@@ -80,7 +80,9 @@ export default defineComponent({
     const getList = async () => {
       state.loading = true;
       try {
+        console.log(route.query, 'route.query');
         const res = await getTrainingStudentList({
+          classGroupId: route.query.classGroupId || '',
           trainingId: route.query.trainingId,
           ...state.searchForm,
           ...state.pagination

src/views/classList/modals/TrainingDetails.tsx

@@ -226,7 +226,7 @@ export default defineComponent({
             }}
             onClose={() => (showModalMask.value = false)}
             onConfrim={() => {
-              getTrainingDetail(props.activeRow.id);
+              getTrainingDetail(props.activeRow.studentLessonTrainingId);
               showModalMask.value = false;
             }}
           />

src/views/prepare-lessons/components/resource-main/components/select-music/index.tsx

@@ -132,6 +132,7 @@ export default defineComponent({
             isCollect: !!row.favoriteFlag,
             isSelected: row.sourceFrom === 'PLATFORM' ? true : false,
             content: row.content,
+            xmlFileUrl: row.xmlFileUrl,
             exist: index !== -1 ? true : false // 是否存在
           });
         });

vite.config.ts

@@ -23,9 +23,9 @@ function resolve(dir: string) {
 }
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
-// const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://dev.kt.colexiu.com/';
 // const proxyUrl = 'https://test.lexiaoya.cn';
-const proxyUrl = 'http://192.168.3.14:7989';
+// const proxyUrl = 'http://192.168.3.14:7989';
 const now = new Date().getTime();
 export default defineConfig(() => {
   return {