Merge branch 'iteration-large-version' into jenkins

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

@@ -1,6 +1,7 @@
 import { defineComponent, ref } from 'vue';
 import styles from './index.module.less';
 import { useUserStore } from '/src/store/modules/users';
+import { vaildMusicScoreUrl } from '/src/utils/urlUtils';
 
 export default defineComponent({
   name: 'song-modal',
@@ -14,10 +15,10 @@ export default defineComponent({
     const userStore = useUserStore();
     const iframeRef = ref();
     const isLoaded = ref(false);
-    const origin = /(localhost|192)/.test(location.host)
-      ? 'https://test.lexiaoya.cn'
-      : location.origin;
-    const src = `${origin}/instrument?v=${+new Date()}&modelType=practise&id=${
+    // const origin = /(localhost|192)/.test(location.host)
+    //   ? 'https://test.lexiaoya.cn'
+    //   : location.origin;
+    const src = `${vaildMusicScoreUrl()}/instrument?v=${+new Date()}&modelType=practise&id=${
       props.item.content
     }&Authorization=${userStore.getToken}`;
     return () => (

src/utils/urlUtils.ts

@@ -15,3 +15,20 @@ export function vaildUrl() {
   }
   return returnUrl;
 }
+
+export function vaildMusicScoreUrl() {
+  const url: string = window.location.href;
+  let returnUrl = '';
+  if (/192/.test(url) || /localhost/.test(url)) {
+    //本地环境
+    returnUrl = 'https://test.kt.colexiu.com';
+  } else if (/test/.test(url)) {
+    // dev 环境
+    returnUrl = 'https://test.kt.colexiu.com';
+  } else if (/dev/.test(url)) {
+    returnUrl = 'https://dev.kt.colexiu.com';
+  } else {
+    returnUrl = 'https://mec.colexiu.com';
+  }
+  return returnUrl;
+}

src/views/attend-class/component/musicScore.tsx

@@ -3,6 +3,7 @@ import { NSkeleton } from 'naive-ui';
 import styles from './musicScore.module.less';
 import { usePageVisibility } from '@vant/use';
 import { useUserStore } from '/src/store/modules/users';
+import { vaildMusicScoreUrl } from '/src/utils/urlUtils';
 
 export default defineComponent({
   name: 'musicScore',
@@ -35,11 +36,11 @@ export default defineComponent({
     const isLoaded = ref(false);
     const renderError = ref(false);
     const renderSuccess = ref(false);
-    const origin = /(localhost|192)/.test(location.host)
-      ? 'https://test.lexiaoya.cn/instrument'
-      : // 'http://localhost:3000/instrument.html'
-        location.origin + '/instrument';
-    const src = `${origin}?v=${+new Date()}&showGuide=true&platform=pc&zoom=1.2&modelType=practise&id=${
+    // const origin = /(localhost|192)/.test(location.host)
+    //   ? 'https://test.lexiaoya.cn/instrument'
+    //   : // 'http://localhost:3000/instrument.html'
+    //     location.origin + '/instrument';
+    const src = `${vaildMusicScoreUrl()}/instrument?v=${+new Date()}&showGuide=true&platform=pc&zoom=1.2&modelType=practise&id=${
       props.music.content
     }&Authorization=${userStore.getToken}`;
     const checkView = () => {

src/views/attend-class/model/train-type/index.tsx

@@ -23,7 +23,7 @@ import eReport from './images/e-report.png';
 import eMessage from './images/e-message.png';
 import { useUserStore } from '/src/store/modules/users';
 import CardPreview from '/src/components/card-preview';
-import { vaildUrl } from '/src/utils/urlUtils';
+import { vaildMusicScoreUrl, vaildUrl } from '/src/utils/urlUtils';
 import { musicPracticeRecordDetail } from '/src/views/prepare-lessons/api';
 import { checkUrlType } from '/src/utils';
 type ItemType = {
@@ -103,7 +103,7 @@ export default defineComponent({
       }
       const tockn = userStore.getToken;
       reportSrc.value =
-        vaildUrl() +
+        vaildMusicScoreUrl() +
         `/instrument/#/evaluat-report?id=${row.id}&Authorization=${tockn}`;
       detailVisiable.value = true;
     };

src/views/home/index.tsx

@@ -36,6 +36,7 @@ import PlaceholderTone from '/src/components/layout/modals/placeholderTone';
 import PreviewWindow from '../preview-window';
 import { state } from '/src/state';
 import SubjectModal from './modals/subject-modal';
+import { vaildMusicScoreUrl } from '/src/utils/urlUtils';
 // import { state } from '/src/state';
 export const formatDateToDay = () => {
   const hours = dayjs().hour();
@@ -286,11 +287,13 @@ export default defineComponent({
               // musicsrc = `${origin}/instrument?modelType=practise&id=${
               //   data.list[data.listActive].xmlFileUrl
               // }&Authorization=${userStore.getToken}/#/preview`;
-              const origin = /(localhost|192)/.test(location.host)
-                ? 'https://test.lexiaoya.cn'
-                : location.origin;
+              // const origin = /(localhost|192)/.test(location.host)
+              //   ? 'https://test.lexiaoya.cn'
+              //   : location.origin;
               // view-figner?subjectCode=pan-flute
-              const src = `${origin}/instrument/#/view-figner?Authorization=${userStore.getToken}&code=${item.code}&platform=pc&type=listenMode`;
+              const src = `${vaildMusicScoreUrl()}/instrument/#/view-figner?Authorization=${
+                userStore.getToken
+              }&code=${item.code}&platform=pc&type=listenMode`;
               // const src = `http://192.168.3.220:3000/instrument.html#/view-figner?Authorization=${userStore.getToken}&code=${item.code}`;
               if (window.matchMedia('(display-mode: standalone)').matches) {
                 state.application = window.matchMedia(

src/views/prepare-lessons/model/select-resources/select-item/index.tsx

@@ -17,6 +17,7 @@ import { useDebounceFn, useResizeObserver } from '@vueuse/core';
 import CardPreview from '/src/components/card-preview';
 import { eventGlobal } from '/src/utils';
 import ClassSearchGroup from './class-search-group';
+import { useCatchStore } from '/src/store/modules/catchData';
 
 const formatType = (type: string) => {
   if (type === 'shareResources') {
@@ -43,6 +44,7 @@ export default defineComponent({
   },
   setup(props) {
     const prepareStore = usePrepareStore();
+    const catchStore = useCatchStore();
     const { type } = toRefs(props);
     const className = 'resourceSearchGroup' + +new Date();
     const state = reactive({
@@ -57,8 +59,9 @@ export default defineComponent({
         type: 'MUSIC', //
         name: '',
         bookVersionId: null,
-        subjectId: prepareStore.getSubjectId,
+        // subjectId: prepareStore.getSubjectId,
         sourceType: formatType(type.value),
+        musicalInstrumentId: null as any,
         enableFlag: true
       },
       tableList: [] as any,
@@ -163,7 +166,17 @@ export default defineComponent({
       }
     };
 
-    onMounted(() => {
+    onMounted(async () => {
+      // 获取声部
+      await catchStore.getSubjects();
+      catchStore.getSubjectInstruments.forEach((item: any) => {
+        if (item.id == prepareStore.getSubjectId) {
+          if (item.instruments && item.instruments.length > 0) {
+            state.searchGroup.musicalInstrumentId = item.instruments[0].value;
+          }
+        }
+      });
+
       getList();
 
       useResizeObserver(

src/views/studentList/components/evaluationRecords.tsx

@@ -18,7 +18,7 @@ import {
   getNowDateAndSunday,
   getTimes
 } from '/src/utils/dateFormat';
-import { vaildUrl } from '@/utils/urlUtils';
+import { vaildMusicScoreUrl, vaildUrl } from '@/utils/urlUtils';
 import CDatePicker from '/src/components/CDatePicker';
 import { useUserStore } from '/src/store/modules/users';
 import TheEmpty from '/src/components/TheEmpty';
@@ -160,7 +160,7 @@ export default defineComponent({
       console.log(row.id, 'gotoRecode');
       const tockn = userStore.getToken;
       reportSrc.value =
-        vaildUrl() +
+        vaildMusicScoreUrl() +
         `/instrument/?v=${+new Date()}#/evaluat-report?v=${+new Date()}&id=${
           row.id
         }&platform=webTeacher&Authorization=${tockn}`;

src/views/xiaoku-music/index.tsx

@@ -49,6 +49,7 @@ import Musicguide from '@/custom-plugins/guide-page/music-guide';
 import TheEmpty from '/src/components/TheEmpty';
 import { state } from '/src/state';
 import { useResizeObserver } from '@vueuse/core';
+import { vaildMusicScoreUrl } from '/src/utils/urlUtils';
 export default defineComponent({
   name: 'XiaokuMusic',
   setup() {
@@ -221,14 +222,14 @@ export default defineComponent({
     /** 选中的item */
     const activeItem = computed(() => {
       if (data.list[data.listActive]) {
-        const origin = /(localhost|192)/.test(location.host)
-          ? 'https://dev.kt.colexiu.com'
-          : location.origin;
-        console.log(
-          data.list[data.listActive].xmlFileUrl,
-          'data.list[data.listActive]'
-        );
-        musicsrc = `${origin}/instrument?modelType=practise&id=${
+        // const origin = /(localhost|192)/.test(location.host)
+        //   ? 'https://dev.kt.colexiu.com'
+        //   : location.origin;
+        // console.log(
+        //   data.list[data.listActive].xmlFileUrl,
+        //   'data.list[data.listActive]'
+        // );
+        musicsrc = `${vaildMusicScoreUrl()}/instrument?modelType=practise&id=${
           data.list[data.listActive].xmlFileUrl
         }&Authorization=${userStore.getToken}/#/preview`;
       } else {
@@ -287,15 +288,19 @@ export default defineComponent({
     const musicIframeLoad = () => {
       const token = userStore.getToken;
       const details = data.list[data.listActive];
-      const origin = /(localhost|192)/.test(location.host)
-        ? 'https://test.lexiaoya.cn'
-        : location.origin;
-      console.log(
-        origin,
-        'origin',
-        `${origin}/instrument/?id=${details.id}&modelType=practise&modeType=json&Authorization=${token}&isPreView=true&part-index=${data.musicInstrumentIndex}`
-      );
-      data.iframeSrc = `${origin}/instrument/?id=${details.id}&modelType=practise&modeType=json&Authorization=${token}&isPreView=true&part-index=${data.musicInstrumentIndex}`;
+      // const origin = /(localhost|192)/.test(location.host)
+      //   ? 'https://test.lexiaoya.cn'
+      //   : location.origin;
+      // console.log(
+      //   origin,
+      //   'origin',
+      //   `${origin}/instrument/?id=${details.id}&modelType=practise&modeType=json&Authorization=${token}&isPreView=true&part-index=${data.musicInstrumentIndex}`
+      // );
+      data.iframeSrc = `${vaildMusicScoreUrl()}/instrument/?id=${
+        details.id
+      }&modelType=practise&modeType=json&Authorization=${token}&isPreView=true&part-index=${
+        data.musicInstrumentIndex
+      }`;
     };
 
     /** 音频控制 */
@@ -553,10 +558,10 @@ export default defineComponent({
                   src={icon_goXiaoku}
                   onClick={() => {
                     handleChangeAudio('pause');
-                    const origin = /(localhost|192)/.test(location.host)
-                      ? 'https://test.lexiaoya.cn'
-                      : location.origin;
-                    const src = `${origin}/instrument?v=${+new Date()}&platform=pc&showGuide=true&id=${
+                    // const origin = /(localhost|192)/.test(location.host)
+                    //   ? 'https://test.lexiaoya.cn'
+                    //   : location.origin;
+                    const src = `${vaildMusicScoreUrl()}/instrument?v=${+new Date()}&platform=pc&showGuide=true&id=${
                       activeItem.value.id
                     }&Authorization=${user.getToken}`;
                     if (