更新bug

src/components/layout/index.tsx

@@ -700,6 +700,8 @@ export default defineComponent({
                 ]}
                 onClick={() => {
                   if (!helpNoteStatus.value) return;
+                  // 默认滚动到页面顶部，在显示指引
+                  document.querySelector('#WrapcoreViewWrap')?.scrollTo(0, 0);
                   startShowModal('iconNote');
                 }}>
                 <img src={iconNote} alt="" />

src/views/classList/components/testRecode.tsx

@@ -59,6 +59,7 @@ export default defineComponent({
     const router = useRouter();
     const search = () => {
       state.pagination.page = 1;
+      getInfo();
       getList();
     };
     const timer = ref<[number, number]>([
@@ -69,7 +70,7 @@ export default defineComponent({
       timer.value = [
         getNowDateAndMonday(new Date().getTime()),
         getNowDateAndSunday(new Date().getTime())
-      ]
+      ];
       state.searchForm = {
         keyword: '',
         trainingStatus: null as any,
@@ -105,7 +106,7 @@ export default defineComponent({
         });
         state.testInfo.practiceDurationAvg = res.data.practiceDurationAvg;
         state.testInfo.practiceUserCount = res.data.practiceUserCount;
-        state.testInfo.vipUserCount = res.data.vipUserCount
+        state.testInfo.vipUserCount = res.data.vipUserCount;
       } catch (e) {
         console.log(e);
       }
@@ -324,8 +325,8 @@ export default defineComponent({
         </div>
         <div class={styles.tableWrap}>
           <NDataTable
-             v-slots={{
-              empty:()=><TheEmpty></TheEmpty>
+            v-slots={{
+              empty: () => <TheEmpty></TheEmpty>
             }}
             class={styles.classTable}
             loading={state.loading}

src/views/home/components/practiceData.tsx

@@ -178,8 +178,9 @@ export default defineComponent({
           {
             // smooth: true,
             data: payForm.timeList,
-            type: 'bar',
-            barWidth: '48px',
+            type: 'line',
+            smooth: true,
+            // barWidth: '48px',
             // label: {
             //   // 柱图头部显示值
             //   show: true,

src/views/prepare-lessons/components/lesson-main/courseware/index.tsx

@@ -45,7 +45,6 @@ export default defineComponent({
     const localStorageSubjectId = localStorage.getItem(
       'prepareLessonSubjectId'
     );
-
     const forms = reactive({
       tipsStatus: localStorage.getItem('prepare-lesson-courseware-tip')
         ? true
@@ -299,25 +298,62 @@ export default defineComponent({
       // 并且没有声部时才会更新
       if (subjectList.length > 0) {
         // 并且声部在列表中
-        const localStorageSubjectId = localStorage.getItem(
-          'prepareLessonSubjectId'
-        );
-        // 先取 上次上课声部，在取班级声部 最后取缓存
-        const subjectId =
-          forms.courseScheduleSubjectId ||
-          forms.subjectId ||
-          localStorageSubjectId
-            ? Number(
-                forms.courseScheduleSubjectId ||
-                  forms.subjectId ||
-                  localStorageSubjectId
-              )
-            : null;
-        // 判断浏览器上面是否有
-        const index = subjectList.findIndex(
-          (subject: any) => subject.id == subjectId
-        );
-
+        // const localStorageSubjectId = localStorage.getItem(
+        //   'prepareLessonSubjectId'
+        // );
+        // // 先取 上次上课声部，在取班级声部 最后取缓存
+        // const subjectId =
+        //   forms.courseScheduleSubjectId ||
+        //   forms.subjectId ||
+        //   localStorageSubjectId
+        //     ? Number(
+        //         forms.courseScheduleSubjectId ||
+        //           forms.subjectId ||
+        //           localStorageSubjectId
+        //       )
+        //     : null;
+        // // 判断浏览器上面是否有
+        // const index = subjectList.findIndex(
+        //   (subject: any) => subject.id == subjectId
+        // );
+
+        // if (subjectId && index >= 0) {
+        //   prepareStore.setSubjectId(subjectId);
+        // } else {
+        //   // 判断是否有缓存
+        //   prepareStore.setSubjectId(subjectList[0].id);
+        // }
+        let subjectId = null;
+        let index = -1;
+        if (forms.courseScheduleSubjectId) {
+          // 判断浏览器上面是否有
+          index = subjectList.findIndex(
+            (subject: any) => subject.id == forms.courseScheduleSubjectId
+          );
+          if (index >= 0) {
+            subjectId = Number(forms.courseScheduleSubjectId);
+          }
+        }
+        // 判断班级上面声部 & 还没有声部
+        if (forms.subjectId && !subjectId) {
+          // 判断浏览器上面是否有
+          index = subjectList.findIndex(
+            (subject: any) => subject.id == forms.subjectId
+          );
+          if (index >= 0) {
+            subjectId = Number(forms.subjectId);
+          }
+        }
+        // 缓存声部 & 还没有声部
+        if (localStorageSubjectId && !subjectId) {
+          // 判断浏览器上面是否有
+          index = subjectList.findIndex(
+            (subject: any) => subject.id == localStorageSubjectId
+          );
+          if (index >= 0) {
+            subjectId = Number(localStorageSubjectId);
+          }
+        }
         if (subjectId && index >= 0) {
           prepareStore.setSubjectId(subjectId);
         } else {
@@ -406,7 +442,7 @@ export default defineComponent({
                       forms.attendClassType = 'change';
                     }}>
                     <NSelect
-                      placeholder="选择声部"
+                      placeholder="选择班级"
                       labelField="name"
                       valueField="id"
                       class={styles.btnClassList}