修改样式

src/views/attend-class/component/audio-pay.tsx

@@ -420,8 +420,6 @@ export default defineComponent({
       });
       window.addEventListener('online', onChangeOnlineStatus);
       window.addEventListener('offline', onChangeOnlineStatus);
-
-      console.log(props.item, 'item');
     });
 
     onUnmounted(() => {

src/views/content-information/content-instrument/detail.tsx

@@ -11,7 +11,6 @@ import {
   computed,
   defineComponent,
   onMounted,
-  onUnmounted,
   reactive,
   watch
 } from 'vue';
@@ -31,7 +30,6 @@ import TheNoticeBar from '/src/components/TheNoticeBar';
 import TheEmpty from '/src/components/TheEmpty';
 import PlayItem from '../../xiaoku-music/component/play-item';
 import { api_knowledgeWiki_detail } from '../api';
-import { state } from '/src/state';
 import { useSpeak } from '../useSpeak';
 
 export default defineComponent({
@@ -385,6 +383,9 @@ export default defineComponent({
             playState={data.playState}
             item={activeItem.value}
             onChange={value => handleChangeAudio(value)}
+            onShow={(status: boolean) => {
+              data.showPlayer = status
+           }}
           />
         )}
       </div>

src/views/content-information/content-music/detail.tsx

@@ -390,6 +390,9 @@ export default defineComponent({
             playState={data.playState}
             item={activeItem.value}
             onChange={value => handleChangeAudio(value)}
+            onShow={(status: boolean) => {
+              data.showPlayer = status
+            }}
           />
         )}
       </div>

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

@@ -383,7 +383,8 @@ export default defineComponent({
             type: 'class',
             classGroupId: classGroupId,
             courseId: item.id,
-            instrumentId: instrumentId || route.query.instrumentId,
+            instrumentId: prepareStore.getInstrumentId, // 产品说预览和上课都取当前选中的乐器
+            // instrumentId: instrumentId || route.query.instrumentId,
             detailId: prepareStore.getSelectKey,
             classId: res.data,
             lessonCourseId: prepareStore.getBaseCourseware.id,
@@ -396,8 +397,8 @@ export default defineComponent({
               type: 'class',
               classGroupId: classGroupId,
               courseId: item.id,
-              // instrumentId: prepareStore.getInstrumentId,
-              instrumentId: instrumentId || route.query.instrumentId,
+              instrumentId: prepareStore.getInstrumentId,
+              // instrumentId: instrumentId || route.query.instrumentId,
               detailId: prepareStore.getSelectKey,
               classId: res.data,
               lessonCourseId: prepareStore.getBaseCourseware.id,

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

@@ -449,7 +449,6 @@ export default defineComponent({
         });
         forms.coursewareList[item.index || 0].list = array;
 
-        console.log(forms.coursewareList, 'courseware add drag');
         timer = setTimeout(() => {
           // 内容有更新 - 相关资源会刷新
           eventGlobal.emit('onCoursewareUpdate');
@@ -879,6 +878,7 @@ export default defineComponent({
                             isCollect: dropItem.isCollect,
                             isSelected: dropItem.isSelected,
                             content: dropItem.content,
+                            audioPlayTypeArray: dropItem.audioPlayTypeArray,
                             removeFlag: false,
                             index
                           },

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

@@ -135,6 +135,9 @@ export default defineComponent({
           }
           temp.push({
             typeList: tList || [],
+            audioPlayTypeArray:row.audioPlayTypes
+            ? row.audioPlayTypes.split(',')
+            : [],
             ...row
           });
         });

src/views/prepare-lessons/model/attend-class/index.tsx

@@ -50,7 +50,7 @@ export default defineComponent({
             emit('confirm', {
               lastUseCoursewareId: item.lessonCoursewareId,
               unit: item.lessonCoursewareKnowledgeDetailId,
-              instrumentId: item.instrumentId,
+              instrumentId: prepareStore.getInstrumentId, // item.instrumentId,
               courseScheduleSubjectId: item.courseScheduleSubjectId,
               name: item.name, // 班级名称
               classGroupId: item.id, // 班级编号

src/views/prepare-lessons/model/source-instrument/detail.tsx

@@ -407,6 +407,9 @@ export default defineComponent({
             playState={data.playState}
             item={activeItem.value}
             onChange={value => handleChangeAudio(value)}
+            onShow={(status: boolean) => {
+              data.showPlayer = status
+            }}
           />
         )}
       </div>

src/views/prepare-lessons/model/source-music/detail.tsx

@@ -436,6 +436,9 @@ export default defineComponent({
             playState={data.playState}
             item={activeItem.value}
             onChange={value => handleChangeAudio(value)}
+            onShow={(status: boolean) => {
+              data.showPlayer = status
+            }}
           />
         )}
       </div>

src/views/studentList/components/evaluationRecords.tsx

@@ -1,4 +1,4 @@
-import { Ref, defineComponent, onMounted, reactive, ref } from 'vue';
+import {  defineComponent, onMounted, reactive, ref } from 'vue';
 import styles from '../index.module.less';
 import {
   NButton,
@@ -6,14 +6,12 @@ import {
   NForm,
   NFormItem,
   NInput,
-  NInputGroup,
   NInputNumber,
   NModal,
-  NNumberAnimation,
   NSpace,
   NTag
 } from 'naive-ui';
-import { useECharts } from '@/hooks/web/useECharts';
+// import { useECharts } from '@/hooks/web/useECharts';
 import Pagination from '/src/components/pagination';
 import { getPracticeRecordList } from '../api';
 import {
@@ -21,7 +19,7 @@ import {
   getNowDateAndSunday,
   getTimes
 } from '/src/utils/dateFormat';
-import { vaildMusicScoreUrl, vaildUrl } from '@/utils/urlUtils';
+import { vaildMusicScoreUrl } from '@/utils/urlUtils';
 import CDatePicker from '/src/components/CDatePicker';
 import { useUserStore } from '/src/store/modules/users';
 import TheEmpty from '/src/components/TheEmpty';
@@ -194,12 +192,12 @@ export default defineComponent({
       state.pagination.pageTotal = res.data.total;
     };
     const gotoRecode = (row: any) => {
-      const tockn = userStore.getToken;
+      const token = userStore.getToken;
       reportSrc.value =
         vaildMusicScoreUrl() +
         `/instrument/?v=${+new Date()}#/evaluat-report?v=${+new Date()}&id=${
           row.id
-        }&platform=webTeacher&Authorization=${tockn}`;
+        }&platform=webTeacher&Authorization=${token}`;
       payForm.detailVisiable = true;
     };
     const search = () => {
@@ -360,7 +358,6 @@ export default defineComponent({
           <div class={styles.reportContainer} style={{ lineHeight: 0 }}>
             <iframe
               width={'100%'}
-              height={'450px'}
               ref={iframeRef}
               frameborder="0"
               onLoad={(val: any) => {

src/views/studentList/index.module.less

@@ -319,6 +319,10 @@
   overflow: hidden;
 }
 
+.reportContainer iframe {
+  height: 64vh;
+}
+
 .addStudentWrap {
   position: relative;
   width: 378px;

src/views/xiaoku-music/component/play-item/index.module.less

@@ -20,14 +20,15 @@
   &.containerModal {
     position: absolute;
     left: 0;
-
   }
 }
 
 .hidden {
   transform: translateY(100%);
-  opacity: 0;
-  display: none;
+  &.item {
+     opacity: 0;
+     display: none;
+  }
 }
 
 .item {
@@ -171,4 +172,32 @@
     white-space: nowrap;
     flex-shrink: 0;
   }
+}
+
+
+.iconArrow {
+  position: absolute;
+  top: -24px;
+  right: 30px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background-color: #fff;
+  cursor: pointer;
+  background: #ffffff;
+  border-radius: 100px 100px 0px 0px;
+  width: 44px;
+  height: 24px;
+  img {
+     margin-top: 3px;
+     width: 14px;
+     height: 14px;
+  }
+
+  &.down {
+     img {
+       margin-top: 0px;
+        transform: rotate(180deg);
+     }
+  }
 }

src/views/xiaoku-music/component/play-item/index.tsx

@@ -1,12 +1,4 @@
-import {
-  PropType,
-  Transition,
-  computed,
-  defineComponent,
-  reactive,
-  ref,
-  watch
-} from 'vue';
+import { PropType, computed, defineComponent, reactive, ref, watch } from 'vue';
 import styles from './index.module.less';
 import { NButton, NImage, NProgress, NSlider } from 'naive-ui';
 import { IMusicItem } from '../../type';
@@ -14,6 +6,7 @@ import icon_pre from '../../images/icon_pre.png';
 import icon_next from '../../images/icon_next.png';
 import icon_play from '../../images/icon_play.png';
 import icon_pause from '../../images/icon_pause.png';
+import song_arrow from '../../images/song-arrow.png';
 import { getSecondRPM } from '/src/utils';
 import TheNoticeBar from '/src/components/TheNoticeBar';
 
@@ -37,7 +30,7 @@ export default defineComponent({
       default: ''
     }
   },
-  emits: ['change'],
+  emits: ['change', 'show'],
   setup(props, { emit }) {
     let timer = null as any;
     const audioData = reactive({
@@ -127,7 +120,7 @@ export default defineComponent({
                 props.item.titleImg ||
                 'https://oss.dayaedu.com/klx/16983720423251690789356356.png'
               }
-              onLoad={e => {
+              onLoad={(e: any) => {
                 (e.target as any).dataset.loaded = 'true';
               }}
             />
@@ -202,7 +195,7 @@ export default defineComponent({
               class={styles.timeProgress}
               value={audioData.currentTime}
               max={audioData.duration}
-              onUpdate:value={val => handleChangeTime(val)}
+              onUpdate:value={(val: any) => handleChangeTime(val)}
             />
             <div class={styles.time}>{time.value}</div>
             <audio
@@ -218,6 +211,14 @@ export default defineComponent({
               }}></audio>
           </div>
         </div>
+
+        <div
+          class={[styles.iconArrow, props.show ? '' : styles.down]}
+          onClick={() => {
+            emit('show', !props.show);
+          }}>
+          <img src={song_arrow as any} />
+        </div>
       </div>
     );
   }

src/views/xiaoku-music/index.tsx

@@ -1132,6 +1132,9 @@ export default defineComponent({
             playState={data.playState}
             item={activeItem.value}
             onChange={value => handleChangeAudio(value)}
+            onShow={(status: boolean) => {
+              data.showPlayer = status
+           }}
           />
         )}
         {showGuide.value ? <Musicguide></Musicguide> : null}