修改样式

public/version.json

@@ -1 +1 @@
-{"version":1725966216504}
+{"version":1724323258503}

src/components/card-preview/music-modal/index.module.less

@@ -1,6 +1,7 @@
 .musicScore {
   width: 100%;
   height: 518px;
+  background-color: #213793;
 
   iframe {
     width: inherit;

src/components/card-preview/video-modal/index.tsx

@@ -231,6 +231,11 @@ export default defineComponent({
     });
     onUnmounted(() => {
       window.removeEventListener('fullscreenchange', onFullScreenChange);
+      if(videoItem.value) {
+        videoItem.value.pause()
+        videoItem.value.dispose()
+        videoItem.value = null
+      }
     });
 
     expose({

src/utils/contants.ts

@@ -77,9 +77,9 @@ export const gradeToCN = {
  * 场景
  */
 export const audioPlayType = {
-  PLAY: '演奏',
   SING: '演唱',
-  PLAY_SING: '演奏+演唱'
+  PLAY: '演奏',
+  PLAY_SING: '演唱+演奏'
 } as any;
 
 /**

src/views/content-information/content-instrument/detail.module.less

@@ -39,6 +39,11 @@
 
     .highlight {
       color: #0378EC;
+      background-color: #E1F0FF;
+    }
+
+    .speak-label {
+      cursor: pointer;
     }
 
   }
@@ -434,9 +439,10 @@
     padding: 0 27px;
     user-select: text;
     position: relative;
+    cursor: pointer;
 
-    &::selection {
-      background-color: #dfdfdf;
+    ::selection {
+      background-color: #E1F0FF;
     }
 
     &>img {

src/views/content-information/content-knowledge/index.module.less

@@ -38,6 +38,11 @@
 
     .highlight {
       color: #0378EC;
+      background-color: #E1F0FF;
+    }
+
+    .speak-label {
+      cursor: pointer;
     }
   }
 
@@ -271,6 +276,10 @@
     user-select: text;
     position: relative;
 
+    ::selection {
+      background-color: #E1F0FF;
+    }
+
     &>img {
       width: 100%;
     }

src/views/content-information/content-music/components/list/search-group-resources.tsx

@@ -101,6 +101,38 @@ export default defineComponent({
       return [];
     });
 
+    const formatParentId = (id: any, list: any, ids = [] as any) => {
+      for (const item of list) {
+        if (item.childrenList && item.childrenList.length > 0) {
+          const cIds: any = formatParentId(id, item.childrenList, [
+            ...ids,
+            item.id
+          ]);
+          if (cIds.includes(id)) {
+            return cIds;
+          }
+        }
+        if (item.id === id) {
+          return [...ids, id];
+        }
+      }
+      return ids;
+    };
+
+    onMounted(() => {
+      // 处理缓存反显
+      if(props.wikiCategoryId) {
+        const ids = formatParentId(props.wikiCategoryId, props.categoryChildList)
+        if(ids.length > 0) {
+          forms.wikiCategoryId = ids[0]
+          forms.wikiCategoryIdChild = ids[ids.length - 1]
+        }
+      } else {
+        forms.wikiCategoryId = props.defaultWikiCategoryId
+      }
+      
+    })
+
     return () => (
       <div class={styles.searchGroup}>
         <div

src/views/content-information/content-music/detail.module.less

@@ -38,6 +38,11 @@
 
     .highlight {
       color: #0378EC;
+      background-color: #E1F0FF;
+    }
+
+    .speak-label {
+      cursor: pointer;
     }
   }
 
@@ -421,6 +426,10 @@
     user-select: text;
     position: relative;
 
+    ::selection {
+      background-color: #E1F0FF;
+    }
+
     &>img {
       width: 100%;
     }

src/views/prepare-lessons/components/directory-main/index.module.less

@@ -40,6 +40,10 @@
   }
 }
 
+.theTooltip {
+  max-width: 300px !important;
+}
+
 .select-directory-info {
   display: flex;
   align-items: center;
@@ -133,6 +137,8 @@
       max-width: 200px;
     }
 
+    
+
     .subjects {
       font-size: max(14px, 11Px);
       color: #777777;

src/views/prepare-lessons/components/directory-main/index.tsx

@@ -1,6 +1,6 @@
 import { computed, defineComponent, onMounted, reactive, ref } from 'vue';
 import styles from './index.module.less';
-import { NIcon, NSpin, NScrollbar, NModal, NImage } from 'naive-ui';
+import { NIcon, NSpin, NScrollbar, NModal, NImage, NTooltip } from 'naive-ui';
 import {
   lessonCoursewareDetail,
   lessonCoursewarePage,
@@ -12,7 +12,7 @@ import { usePrepareStore } from '/src/store/modules/prepareLessons';
 import { useUserStore } from '/src/store/modules/users';
 import { useRoute } from 'vue-router';
 import { eventGlobal } from '/src/utils';
-import TheNoticeBar from '/src/components/TheNoticeBar';
+// import TheNoticeBar from '/src/components/TheNoticeBar';
 import { getSubjectList2 } from '/src/api/user';
 import LessonsGuide from '@/custom-plugins/guide-page/lessons-guide';
 import { modalClickMask } from '/src/state';
@@ -273,17 +273,29 @@ export default defineComponent({
                     src={prepareStore.getBaseCourseware.coverImg}
                     lazy
                     previewDisabled={true}
-                    onLoad={e => {
+                    onLoad={(e: any) => {
                       (e.target as any).dataset.loaded = 'true';
                     }}
                   />
                 </div>
                 <div class={styles.itemContent}>
                   <h2>
-                    <TheNoticeBar text={prepareStore.getBaseCourseware.name} />
+                    {/* <TheNoticeBar text={prepareStore.getBaseCourseware.name} /> */}
+                    <NTooltip showArrow={false} class={styles.theTooltip} placement="top-start">
+                      {{
+                        trigger: () => prepareStore.getBaseCourseware.name,
+                        default: () => prepareStore.getBaseCourseware.name
+                      }}
+                    </NTooltip>
                   </h2>
                   <div class={styles.subjects}>
-                    <TheNoticeBar text={formatInstrumentNames.value} />
+                    {/* <TheNoticeBar text={formatInstrumentNames.value} /> */}
+                    <NTooltip showArrow={false} class={styles.theTooltip} placement="top-start">
+                      {{
+                        trigger: () => formatInstrumentNames.value,
+                        default: () => formatInstrumentNames.value
+                      }}
+                    </NTooltip>
                   </div>
                   <div
                     class={styles.changeDir}

src/views/prepare-lessons/components/directory-main/select-lessonware/index.tsx

@@ -22,8 +22,6 @@ import AddTeaching, {
 import {
   lessonCoursewarePage,
   lessonCoursewareRemove,
-  bookVersionPage,
-  api_lessonCoursewarePage,
   api_lessonCoursewareTeacherCategory
 } from '../../../api';
 import iconUploadBg from '../images/icon-upload-bg.png';
@@ -243,11 +241,11 @@ export default defineComponent({
               </NFormItem>}
               
 
-              <NFormItem label="声部：">
+              <NFormItem label="乐器：">
                 <NSpace class={styles.spaceSection}>
                   {[
                     { name: '全部乐器', value: '' },
-                    ...catchStore.getSubjectList
+                    ...catchStore.getSubjectInstrumentOnly
                   ].map((subject: any) =>
                     subject.instruments && subject.instruments.length > 1 ? (
                       <NPopselect

src/views/prepare-lessons/model/source-instrument/detail.module.less

@@ -35,6 +35,11 @@
   :global {
     .highlight {
       color: #0378EC;
+      background-color: #E1F0FF;
+    }
+
+    .speak-label {
+      cursor: pointer;
     }
   }
 }
@@ -442,8 +447,8 @@
     user-select: text;
     position: relative;
 
-    &::selection {
-      background-color: #dfdfdf;
+    ::selection {
+      background-color: #E1F0FF;
     }
 
     &>img {

src/views/prepare-lessons/model/source-knowledge/index.module.less

@@ -269,6 +269,10 @@
     position: relative;
     user-select: text;
     position: relative;
+    
+    ::selection {
+      background-color: #E1F0FF;
+    }
 
     &:focus-visible {
       border: none !important;
@@ -279,6 +283,11 @@
     :global {
       .highlight {
         color: #0378EC;
+        background-color: #E1F0FF;
+      }
+  
+      .speak-label {
+        cursor: pointer;
       }
     }
 

src/views/prepare-lessons/model/source-music/detail.module.less

@@ -23,6 +23,11 @@
   :global {
     .highlight {
       color: #0378EC;
+      background-color: #E1F0FF;
+    }
+
+    .speak-label {
+      cursor: pointer;
     }
   }
 }
@@ -395,6 +400,10 @@
     user-select: text;
     position: relative;
 
+    ::selection {
+      background-color: #E1F0FF;
+    }
+
     &>img {
       width: 100%;
     }

src/views/xiaoku-music/index.module.less

@@ -530,7 +530,7 @@
   .previewIframe {
     width: 100%;
     height: 85vh;
-    background-color: #fff;
+    background-color: #213793;
     border-radius: 16px;
   }
 }

src/views/xiaoku-music/index.tsx

@@ -865,7 +865,7 @@ export default defineComponent({
                               objectFit="cover"
                               previewDisabled={true}
                               src={item.titleImg || icon_default}
-                              onLoad={e => {
+                              onLoad={(e: any) => {
                                 (e.target as any).dataset.loaded = 'true';
                               }}
                             />
@@ -883,17 +883,16 @@ export default defineComponent({
                               <TheNoticeBar text={item.musicSheetName} />
                             </div>
                             <div class={styles.titleDes}>
-                              {item.audioPlayTypeArray?.includes('PLAY') && (
+                            {item.audioPlayTypeArray?.includes('SING') && (
                                 <span
-                                  class={[styles.iconType, styles.iconPlay]}>
-                                  演奏
+                                  class={[styles.iconType, styles.iconSing]}>
+                                  演唱
                                 </span>
                               )}
-
-                              {item.audioPlayTypeArray?.includes('SING') && (
+                              {item.audioPlayTypeArray?.includes('PLAY') && (
                                 <span
-                                  class={[styles.iconType, styles.iconSing]}>
-                                  演唱
+                                  class={[styles.iconType, styles.iconPlay]}>
+                                  演奏
                                 </span>
                               )}