Переглянути джерело

添加动态获取乐器编码

lex-xin 1 тиждень тому
батько
коміт
9bf37e22c1

+ 215 - 210
src/constant/instruments.ts

@@ -1,226 +1,231 @@
-const instruments = {
-  'Acoustic Grand Piano': '大钢琴',
-  'Bright Acoustic Piano': '明亮的钢琴',
-  'Electric Grand Piano': '电钢琴',
-  'Rhodes Piano': '柔和的电钢琴',
-  'Chorused Piano': '加合唱效果的电钢琴',
-  'Harpsichord': '羽管键琴',
-  'Clavichord': '科拉维科特琴',
-  'Celesta': '钢片琴',
-  'Glockenspiel': '钢片琴',
-  'Music box': '八音盒',
-  'Vibraphone': '颤音琴',
-  'Marimba': '马林巴',
-  'Xylophone': '木琴',
-  'Tubular Bells': '管钟',
-  'Dulcimer': '大扬琴',
-  'Hammond Organ': '击杆风琴',
-  'Percussive Organ': '打击式风琴',
-  'Rock Organ': '摇滚风琴',
-  'Church Organ': '教堂风琴',
-  'Reed Organ': '簧管风琴',
-  'Accordian': '手风琴',
-  'Harmonica': '口琴',
-  'Tango Accordian': '探戈手风琴',
-  'Acoustic Guitar': '钢弦吉他',
-  'Electric Guitar': '闷音电吉他',
-  'Overdriven Guitar': '加驱动效果的电吉他',
-  'Distortion Guitar': '加失真效果的电吉他',
-  'Guitar Harmonics': '吉他和音',
-  'Acoustic Bass': '大贝司',
-  'Electric Bass': '电贝司',
-  'Fretless Bass': '无品贝司',
-  'Slap Bass': '掌击',
-  'Synth Bass': '电子合成',
-  'Violin': '小提琴',
-  'Viola': '中提琴',
-  'Cello': '大提琴',
-  'Contrabass': '低音大提琴',
-  'Tremolo Strings': '弦乐群颤音音色',
-  'Pizzicato Strings': '弦乐群拨弦音色',
-  'Orchestral Harp': '竖琴',
-  'Timpani': '定音鼓',
-  'String Ensemble': '弦乐合奏音色',
-  'Synth Strings': '合成弦乐合奏音色',
-  'Choir Aahs': '人声合唱',
-  'Voice Oohs': '人声',
-  'Synth Voice': '合成人声',
-  'Orchestra Hit': '管弦乐敲击齐奏',
-  'Trumpet': '小号',
-  'Trombone': '长号',
-  'Tuba': '大号',
-  'Muted Trumpet': '加弱音器小号',
-  'French Horn': '法国号',
-  'Brass Section': '铜管组',
-  'Synth Brass': '合成铜管音色',
-  'Soprano Sax': '高音萨克斯管',
-  'Alto Sax': '中音萨克斯管',
-  'Tenor Sax': '次中音萨克斯管',
-  'Baritone Sax': '低音萨克斯管',
-  'Oboe': '双簧管',
-  'English Horn': '英国管',
-  'Bassoon': '巴松',
-  'Soprano Saxophone': '高音萨克斯管',
-  'Alto Saxophone': '中音萨克斯管',
-  'Tenor Saxophone': '次中音萨克斯管',
-  'Baritone Saxophone': '低音萨克斯管',
-  'Piccolo': '短笛',
-  'Flute': '长笛',
-  'Recorder': '竖笛',
-  'Soprano Recorder': '高音竖笛',
-  'Pan Flute': '排箫',
-  'Bottle Blow': '瓶木管',
-  'Whistle': '口哨声',
-  'Ocarina': '陶笛',
-  'Lead': '合成主音',
-  'Lead lead': '合成主音',
-  'Pad age': '合成音色',
-  'Pad': '合成音色',
-  'FX': '合成效果  科幻',
-  'Sitar': '西塔尔',
-  'Banjo': '班卓琴',
-  'Shamisen': '三昧线',
-  'Koto': '十三弦筝',
-  'Kalimba': '卡林巴',
-  'Bagpipe': '风笛',
-  'Fiddle': '民族提琴',
-  'Shanai': '山奈',
-  'Tinkle Bell': '叮当铃',
-  'Agogos': '阿戈戈铃',
-  'Steel Drums': '钢鼓',
-  'Taiko Drum': '太鼓',
-  'Melodic Toms': '嗵嗵鼓',
-  'Synth Drums': '合成鼓',
-  'Reverse Cymbals': '反向镲',
-  'Agogo Bells': '阿戈戈铃',
-  'Taiko Drums': '太鼓',
-  'Bongos': '邦戈鼓',
-  'Bongo Bell': '邦戈铃',
-  'Congas': '康加鼓',
-  'Guiro': '刮壶',
-  'Guitar Fret Noise': '吉他换把杂音',
-  'Breath Noise': '呼吸声',
-  'Seashore': '海浪声',
-  'Bird Tweet': '鸟鸣',
-  'Telephone Ring': '电话铃',
-  'Helicopter': '直升机',
-  'Applause': '鼓掌声',
-  'Gunshot': '枪声',
-  'Acoustic Bass Drum': '大鼓',
-  'Bass Drum': '大鼓',
-  'Side Drum': '小鼓鼓边',
-  'Acoustic Snare': '小鼓',
-  'Hand Claps': '拍手',
-  'Electric Snare': '小鼓',
-  'Low Floor Tom': '低音嗵鼓',
-  'Closed Hi-Hat': '闭合踩镲',
-  'High Floor Tom': '高音落地嗵鼓',
-  'Pedal Hi-Hat': '脚踏踩镲',
-  'Low Tom': '低音嗵鼓',
-  'Open Hi-Hat': '开音踩镲',
-  'Low-Mid Tom': '中低音嗵鼓',
-  'Hi Mid Tom': '高音鼓',
-  'Crash Cymbals': '对镲',
-  'High Tom': '高音嗵鼓',
-  'Ride Cymbals': '叮叮镲',
-  'Chinese Cymbals': '中国镲',
-  'Ride Bell': '圆铃',
-  'Tambourine': '铃鼓',
-  'Splash Cymbal': '溅音镲',
-  'Cowbell': '牛铃',
-  'Crash Cymbal': '强音钹',
-  'Vibra-Slap': '颤音器',
-  'Ride Cymbal': '打点钹',
-  'Hi Bongo': '高音邦戈鼓',
-  'Low Bongo': '低音邦戈鼓',
-  'Mute Hi Conga': '弱音高音康加鼓',
-  'Open Hi Conga': '强音高音康加鼓',
-  'Low Conga': '低音康加鼓',
-  'High Timbale': '高音天巴鼓',
-  'Low Timbale': '低音天巴鼓',
-  'High Agogo': '高音阿戈戈铃',
-  'Low Agogo': '低音阿戈戈铃',
-  'Cabasa': '卡巴萨',
-  'Maracas': '沙锤',
-  'Short Whistle': '短口哨',
-  'Long Whistle': '长口哨',
-  'Short Guiro': '短刮壶',
-  'Long Guiro': '长刮壶',
-  'Claves': '响棒',
-  'Hi Wood Block': '高音木鱼',
-  'Low Wood Block': '低音木鱼',
-  'Mute Triangle': '弱音三角铁',
-  'Open Triangle': '强音三角铁',
-  'Drum Set': '架子鼓',
-  'Hulusi flute': '葫芦丝',
-  'Melodica': '口风琴',
-  'Snare Drum': '小军鼓',
-  'Horn in F': '圆号',
-  'Triangle': '三角铁',
-  'Vibrato': '颤音琴',
-  'Suspend Cymbals': '吊镲',
-  'Suspended Cymbals': '吊镲',
-  'Tom-Toms': '嗵嗵鼓',
-  'Bell': '铃铛',
-  'Bells': '铃铛',
-  'Alto Clarinet': '中音单簧管',
-  'Bass Clarinet': '低音单簧管',
-  'Clarinet': '单簧管',
-  'Cornet': '短号',
-  'Euphonium': '上低音号',
-  'crash cymbals': '对镲',
-  'Castanets': '响板',
-  'Shaker': '沙锤',
-  'Mark tree': '音树',
-  'Chimes': '管钟',
-  'Mark Tree': '音树',
-  'Tom-toms': '嗵嗵鼓',
-  'Hi-Hat': '踩镲',
-  'Sleigh Bells': '雪橇铃',
-  'Flexatone': '弹音器',
-  'Brake drum': '闸鼓',
-  'Gong': '锣',
-  'concert tom': '音乐会嗵嗵鼓',
-  'brake drum': '车轮鼓',
-  'finger cymbal': '指钹',
-  'ride cymbal': '叮叮镲',
-  'Concert Toms': '音乐会嗵嗵鼓',
-  'Vibraslap': '弹音器',
-  'Wood Blocks': '木鱼',
-  'Temple Blocks': '木鱼',
-  'Wood Block': '木鱼',
-  'Field Drum': '军鼓',
-  'Quad-Toms': '筒鼓',
-  'Quads': '筒鼓',
-  'Drums set': '架子鼓',
-  'High Bongo': '邦戈',
-  'Timbales': '天巴鼓',
-  'rain stick': '雨棒',
-  'String Bass': '弦乐低音',
-  'Floor Tom': '侧嗵鼓',
-  'Brake Drum': '闸鼓',
-  'Tam-tam': '大锣',
-  'Cymbal': '镲',
-  'Cymbals': '镲',
-}
+// const instruments = {
+//   'Acoustic Grand Piano': '大钢琴',
+//   'Bright Acoustic Piano': '明亮的钢琴',
+//   'Electric Grand Piano': '电钢琴',
+//   'Rhodes Piano': '柔和的电钢琴',
+//   'Chorused Piano': '加合唱效果的电钢琴',
+//   'Harpsichord': '羽管键琴',
+//   'Clavichord': '科拉维科特琴',
+//   'Celesta': '钢片琴',
+//   'Glockenspiel': '钢片琴',
+//   'Music box': '八音盒',
+//   'Vibraphone': '颤音琴',
+//   'Marimba': '马林巴',
+//   'Xylophone': '木琴',
+//   'Tubular Bells': '管钟',
+//   'Dulcimer': '大扬琴',
+//   'Hammond Organ': '击杆风琴',
+//   'Percussive Organ': '打击式风琴',
+//   'Rock Organ': '摇滚风琴',
+//   'Church Organ': '教堂风琴',
+//   'Reed Organ': '簧管风琴',
+//   'Accordian': '手风琴',
+//   'Harmonica': '口琴',
+//   'Tango Accordian': '探戈手风琴',
+//   'Acoustic Guitar': '钢弦吉他',
+//   'Electric Guitar': '闷音电吉他',
+//   'Overdriven Guitar': '加驱动效果的电吉他',
+//   'Distortion Guitar': '加失真效果的电吉他',
+//   'Guitar Harmonics': '吉他和音',
+//   'Acoustic Bass': '大贝司',
+//   'Electric Bass': '电贝司',
+//   'Fretless Bass': '无品贝司',
+//   'Slap Bass': '掌击',
+//   'Synth Bass': '电子合成',
+//   'Violin': '小提琴',
+//   'Viola': '中提琴',
+//   'Cello': '大提琴',
+//   'Contrabass': '低音大提琴',
+//   'Tremolo Strings': '弦乐群颤音音色',
+//   'Pizzicato Strings': '弦乐群拨弦音色',
+//   'Orchestral Harp': '竖琴',
+//   'Timpani': '定音鼓',
+//   'String Ensemble': '弦乐合奏音色',
+//   'Synth Strings': '合成弦乐合奏音色',
+//   'Choir Aahs': '人声合唱',
+//   'Voice Oohs': '人声',
+//   'Synth Voice': '合成人声',
+//   'Orchestra Hit': '管弦乐敲击齐奏',
+//   'Trumpet': '小号',
+//   'Trombone': '长号',
+//   'Tuba': '大号',
+//   'Muted Trumpet': '加弱音器小号',
+//   'French Horn': '法国号',
+//   'Brass Section': '铜管组',
+//   'Synth Brass': '合成铜管音色',
+//   'Soprano Sax': '高音萨克斯管',
+//   'Alto Sax': '中音萨克斯管',
+//   'Tenor Sax': '次中音萨克斯管',
+//   'Baritone Sax': '低音萨克斯管',
+//   'Oboe': '双簧管',
+//   'English Horn': '英国管',
+//   'Bassoon': '巴松',
+//   'Soprano Saxophone': '高音萨克斯管',
+//   'Alto Saxophone': '中音萨克斯管',
+//   'Tenor Saxophone': '次中音萨克斯管',
+//   'Baritone Saxophone': '低音萨克斯管',
+//   'Piccolo': '短笛',
+//   'Flute': '长笛',
+//   'Recorder': '竖笛',
+//   'Soprano Recorder': '高音竖笛',
+//   'Pan Flute': '排箫',
+//   'Bottle Blow': '瓶木管',
+//   'Whistle': '口哨声',
+//   'Ocarina': '陶笛',
+//   'Lead': '合成主音',
+//   'Lead lead': '合成主音',
+//   'Pad age': '合成音色',
+//   'Pad': '合成音色',
+//   'FX': '合成效果  科幻',
+//   'Sitar': '西塔尔',
+//   'Banjo': '班卓琴',
+//   'Shamisen': '三昧线',
+//   'Koto': '十三弦筝',
+//   'Kalimba': '卡林巴',
+//   'Bagpipe': '风笛',
+//   'Fiddle': '民族提琴',
+//   'Shanai': '山奈',
+//   'Tinkle Bell': '叮当铃',
+//   'Agogos': '阿戈戈铃',
+//   'Steel Drums': '钢鼓',
+//   'Taiko Drum': '太鼓',
+//   'Melodic Toms': '嗵嗵鼓',
+//   'Synth Drums': '合成鼓',
+//   'Reverse Cymbals': '反向镲',
+//   'Agogo Bells': '阿戈戈铃',
+//   'Taiko Drums': '太鼓',
+//   'Bongos': '邦戈鼓',
+//   'Bongo Bell': '邦戈铃',
+//   'Congas': '康加鼓',
+//   'Guiro': '刮壶',
+//   'Guitar Fret Noise': '吉他换把杂音',
+//   'Breath Noise': '呼吸声',
+//   'Seashore': '海浪声',
+//   'Bird Tweet': '鸟鸣',
+//   'Telephone Ring': '电话铃',
+//   'Helicopter': '直升机',
+//   'Applause': '鼓掌声',
+//   'Gunshot': '枪声',
+//   'Acoustic Bass Drum': '大鼓',
+//   'Bass Drum': '大鼓',
+//   'Side Drum': '小鼓鼓边',
+//   'Acoustic Snare': '小鼓',
+//   'Hand Claps': '拍手',
+//   'Electric Snare': '小鼓',
+//   'Low Floor Tom': '低音嗵鼓',
+//   'Closed Hi-Hat': '闭合踩镲',
+//   'High Floor Tom': '高音落地嗵鼓',
+//   'Pedal Hi-Hat': '脚踏踩镲',
+//   'Low Tom': '低音嗵鼓',
+//   'Open Hi-Hat': '开音踩镲',
+//   'Low-Mid Tom': '中低音嗵鼓',
+//   'Hi Mid Tom': '高音鼓',
+//   'Crash Cymbals': '对镲',
+//   'High Tom': '高音嗵鼓',
+//   'Ride Cymbals': '叮叮镲',
+//   'Chinese Cymbals': '中国镲',
+//   'Ride Bell': '圆铃',
+//   'Tambourine': '铃鼓',
+//   'Splash Cymbal': '溅音镲',
+//   'Cowbell': '牛铃',
+//   'Crash Cymbal': '强音钹',
+//   'Vibra-Slap': '颤音器',
+//   'Ride Cymbal': '打点钹',
+//   'Hi Bongo': '高音邦戈鼓',
+//   'Low Bongo': '低音邦戈鼓',
+//   'Mute Hi Conga': '弱音高音康加鼓',
+//   'Open Hi Conga': '强音高音康加鼓',
+//   'Low Conga': '低音康加鼓',
+//   'High Timbale': '高音天巴鼓',
+//   'Low Timbale': '低音天巴鼓',
+//   'High Agogo': '高音阿戈戈铃',
+//   'Low Agogo': '低音阿戈戈铃',
+//   'Cabasa': '卡巴萨',
+//   'Maracas': '沙锤',
+//   'Short Whistle': '短口哨',
+//   'Long Whistle': '长口哨',
+//   'Short Guiro': '短刮壶',
+//   'Long Guiro': '长刮壶',
+//   'Claves': '响棒',
+//   'Hi Wood Block': '高音木鱼',
+//   'Low Wood Block': '低音木鱼',
+//   'Mute Triangle': '弱音三角铁',
+//   'Open Triangle': '强音三角铁',
+//   'Drum Set': '架子鼓',
+//   'Hulusi flute': '葫芦丝',
+//   'Melodica': '口风琴',
+//   'Snare Drum': '小军鼓',
+//   'Horn in F': '圆号',
+//   'Triangle': '三角铁',
+//   'Vibrato': '颤音琴',
+//   'Suspend Cymbals': '吊镲',
+//   'Suspended Cymbals': '吊镲',
+//   'Tom-Toms': '嗵嗵鼓',
+//   'Bell': '铃铛',
+//   'Bells': '铃铛',
+//   'Alto Clarinet': '中音单簧管',
+//   'Bass Clarinet': '低音单簧管',
+//   'Clarinet': '单簧管',
+//   'Cornet': '短号',
+//   'Euphonium': '上低音号',
+//   'crash cymbals': '对镲',
+//   'Castanets': '响板',
+//   'Shaker': '沙锤',
+//   'Mark tree': '音树',
+//   'Chimes': '管钟',
+//   'Mark Tree': '音树',
+//   'Tom-toms': '嗵嗵鼓',
+//   'Hi-Hat': '踩镲',
+//   'Sleigh Bells': '雪橇铃',
+//   'Flexatone': '弹音器',
+//   'Brake drum': '闸鼓',
+//   'Gong': '锣',
+//   'concert tom': '音乐会嗵嗵鼓',
+//   'brake drum': '车轮鼓',
+//   'finger cymbal': '指钹',
+//   'ride cymbal': '叮叮镲',
+//   'Concert Toms': '音乐会嗵嗵鼓',
+//   'Vibraslap': '弹音器',
+//   'Wood Blocks': '木鱼',
+//   'Temple Blocks': '木鱼',
+//   'Wood Block': '木鱼',
+//   'Field Drum': '军鼓',
+//   'Quad-Toms': '筒鼓',
+//   'Quads': '筒鼓',
+//   'Drums set': '架子鼓',
+//   'High Bongo': '邦戈',
+//   'Timbales': '天巴鼓',
+//   'rain stick': '雨棒',
+//   'String Bass': '弦乐低音',
+//   'Floor Tom': '侧嗵鼓',
+//   'Brake Drum': '闸鼓',
+//   'Tam-tam': '大锣',
+//   'Cymbal': '镲',
+//   'Cymbals': '镲',
+// }
 
 /**
  * 获取乐器名称
+ * @param instruments 乐器列表
  * @param instrumentName 乐器code
  * @returns
  */
-export const getInstrumentName = (instrumentName: string) => {
-  const _instrumentName = instrumentName.replace(/ /g, ' ').toLocaleLowerCase()
+export const getInstrumentName = (instruments: any, instrumentName: string) => {
+  const _instrumentName = instrumentName
+    .replace(/ /g, '')
+    .replace(/\d+|\d+/g, '')
+    .trim()
+    .toLocaleLowerCase()
   const _instrument = Object.keys(instruments)
   for (let i = 0; i < _instrument.length; i++) {
-    const _name = _instrument[i].replace(/ /g, ' ').toLocaleLowerCase()
+    const _name = _instrument[i].replace(/ /g, '').toLocaleLowerCase()
     if (_name === _instrumentName) {
       return instruments[_instrument[i]] || ''
     }
   }
   for (let i = 0; i < _instrument.length; i++) {
-    const _name = _instrument[i].replace(/ /g, ' ').toLocaleLowerCase()
-    if (_instrumentName.includes(_name)) {
+    const _name = _instrument[i].replace(/ /g, '').toLocaleLowerCase()
+    if (_name.includes(_instrumentName)) {
       return instruments[_instrument[i]] || ''
     }
   }

+ 26 - 22
src/views/accompany/music-detail.tsx

@@ -46,7 +46,8 @@ export default defineComponent({
 
       selectedPartName: '' as any,
       selectedPartIndex: 0,
-      partXmlIndex: 0
+      partXmlIndex: 0,
+      instrumentCodes: {} as any // 乐器编码
     })
     const loading = ref(false)
     const downloadStatus = ref(false)
@@ -178,7 +179,7 @@ export default defineComponent({
         (item: any) => !item.track?.toLocaleUpperCase()?.includes('COMMON')
       )
       partColumns.value = partList.map((item: any, index: number) => {
-        const instrumentName = getInstrumentName(item.track)
+        const instrumentName = getInstrumentName(staffData.instrumentCodes, item.track)
         const xmlIndex = staffData.partNames.findIndex((name: any) => name === item.track?.trim())
         return {
           text: item.track + (instrumentName ? `(${instrumentName})` : ''),
@@ -315,7 +316,30 @@ export default defineComponent({
       }
     }
 
+    /** 获取乐器编码 */
+    const getInstrumentCodes = async () => {
+      try {
+        const { data } = await request.get('/musicSheet/instrumentCode', {
+          prefix:
+            state.platformType === 'TEACHER' ? '/api-teacher' : '/api-student'
+        })
+        if (Array.isArray(data)) {
+          const tempCodes: any = {}
+          data.forEach((item: any) => {
+            const codes = item.code?.split(',')
+            codes.forEach((code: any) => {
+              tempCodes[code] = item.name
+            })
+          })
+          staffData.instrumentCodes = tempCodes
+        }
+      } catch {
+        //
+      }
+    }
+
     onMounted(async () => {
+      await getInstrumentCodes()
       await getMusicDetail()
       window.addEventListener('message', showLoading)
     })
@@ -380,26 +404,6 @@ export default defineComponent({
                 }}
               ></iframe>
             ) : ''}
-            {/* <iframe
-              id="staffIframeRef"
-              style={{
-                opacity: loading.value ? 0 : 1,
-                width: '100%',
-                height: '100%'
-              }}
-              src={staffData.iframeSrc}
-              onLoad={musicIframeLoad}
-            ></iframe> */}
-            {/* </> */}
-            {/* // ) : (
-            //   <>
-            //     {showImg.value.length > 0 && (
-            //       <>
-            //         <img src={showImg.value[0]} alt="" class={styles.musicImg} />
-            //       </>
-            //     )}
-            //   </>
-            // )} */}
           </div>
         </div>
 

+ 48 - 76
src/views/accompany/music-list.tsx

@@ -3,19 +3,7 @@ import { postMessage } from '@/helpers/native-message'
 import request from '@/helpers/request'
 import { state } from '@/state'
 import OFullRefresh from '@/components/o-full-refresh'
-import {
-  Cell,
-  CellGroup,
-  DropdownItem,
-  DropdownMenu,
-  Icon,
-  List,
-  Picker,
-  Popup,
-  Toast,
-  closeToast,
-  showLoadingToast
-} from 'vant'
+import { Cell, CellGroup, DropdownItem, DropdownMenu, Icon, List, Picker, Popup } from 'vant'
 import { defineComponent, reactive, ref, onMounted, nextTick, computed } from 'vue'
 import { useRoute, useRouter } from 'vue-router'
 import { getImage } from './images'
@@ -66,7 +54,8 @@ export default defineComponent({
         //   state.platformApi + '/musicSheetCategories/queryTree?enable=true&parentId=' + route.query.categorieid
         // )
         const res: any = await request.post(
-          state.platformApi + '/musicSheetCategories/queryTreeByParentId', {
+          state.platformApi + '/musicSheetCategories/queryTreeByParentId',
+          {
             data: {
               parentId: route.query.categorieid,
               enable: true
@@ -115,7 +104,7 @@ export default defineComponent({
     }
     const option1 = computed(() => {
       const v1: any = data.musicTree
-    //.find((n: any) => n.id == route.query.categorieid)
+      //.find((n: any) => n.id == route.query.categorieid)
       if (Array.isArray(v1)) {
         const list = v1.map((m: any) => {
           if (!data.value1) {
@@ -224,52 +213,38 @@ export default defineComponent({
       partIndex: 0,
       partList: [] as any[]
     })
-    const getPartNames = async (item: any) => {
-      let partNames: any[] = []
-      // showLoadingToast('加载中...')
-      // try {
-      //   const res = await fetch(xmlUrl).then((response) => response.text())
-      //   const xml = new DOMParser().parseFromString(res, 'text/xml')
-      //   let parts = Array.from(xml.getElementsByTagName('part-name'))
-      //   parts = parts.filter((n) => !n.textContent?.toLocaleUpperCase()?.includes('COMMON'))
-      //   for (let i = 0; i < parts.length; i++) {
-      //     const name = getInstrumentName(parts[i].textContent || '')
-      //     partNames.push({ text: name ? parts[i].textContent + `(${name})` : parts[i].textContent || '', value: i })
-      //   }
-      //   closeToast()
-      // } catch (error) {
-      //   console.log(error)
-      // }
-      try {
-        const { data } = await request.get(state.platformApi + '/musicSheet/detail/' + item.id)
-        let partList = data.background || []
-        partList = partList.filter(
-          (item: any) => !item.track?.toLocaleUpperCase()?.includes('COMMON')
-        )
-        partNames = partList.map((item: any, index: number) => {
-          const instrumentName = getInstrumentName(item.track)
-          return {
-            text: item.track + (instrumentName ? `(${instrumentName})` : ''),
-            value: index
-          }
-        })
-      } catch (error) {
-        console.log(error)
-      }
-      console.log('🚀 ~ partNames:', partNames)
-      return partNames
-    }
+    // const getPartNames = async (item: any) => {
+    //   let partNames: any[] = []
+    //   try {
+    //     const { data } = await request.get(state.platformApi + '/musicSheet/detail/' + item.id)
+    //     let partList = data.background || []
+    //     partList = partList.filter(
+    //       (item: any) => !item.track?.toLocaleUpperCase()?.includes('COMMON')
+    //     )
+    //     partNames = partList.map((item: any, index: number) => {
+    //       const instrumentName = getInstrumentName(item.track)
+    //       return {
+    //         text: item.track + (instrumentName ? `(${instrumentName})` : ''),
+    //         value: index
+    //       }
+    //     })
+    //   } catch (error) {
+    //     console.log(error)
+    //   }
+    //   console.log('🚀 ~ partNames:', partNames)
+    //   return partNames
+    // }
 
-    const openMutilPart = async (item: any) => {
-      if (staffData.musicXml[item.id]) {
-        staffData.instrumentName = item.id
-        staffData.open = true
-        return Promise.resolve()
-      }
-      staffData.musicXml[item.id] = await getPartNames(item)
-      staffData.instrumentName = item.id
-      staffData.open = true
-    }
+    // const openMutilPart = async (item: any) => {
+    //   if (staffData.musicXml[item.id]) {
+    //     staffData.instrumentName = item.id
+    //     staffData.open = true
+    //     return Promise.resolve()
+    //   }
+    //   staffData.musicXml[item.id] = await getPartNames(item)
+    //   staffData.instrumentName = item.id
+    //   staffData.open = true
+    // }
 
     return () => (
       <div class={styles['accompany-music-list']}>
@@ -306,22 +281,19 @@ export default defineComponent({
                 }}
               >
                 {{
-                  left: () => (
-                    <>
-                      {state.platformType == 'TEACHER' ? (
-                        <DropdownMenu activeColor="var(--van-primary)">
-                          <DropdownItem
-                            v-model:modelValue={data.musicSubject}
-                            options={data.subjectList}
-                            onChange={() => {
-                              localStorage.setItem(subjectKey, data.musicSubject)
-                              onSearch()
-                            }}
-                          ></DropdownItem>
-                        </DropdownMenu>
-                      ) : null}
-                    </>
-                  )
+                  left: () =>
+                    state.platformType == 'TEACHER' ? (
+                      <DropdownMenu activeColor="var(--van-primary)">
+                        <DropdownItem
+                          v-model:modelValue={data.musicSubject}
+                          options={data.subjectList}
+                          onChange={() => {
+                            localStorage.setItem(subjectKey, data.musicSubject)
+                            onSearch()
+                          }}
+                        ></DropdownItem>
+                      </DropdownMenu>
+                    ) : null
                 }}
               </OSearch>
             </div>

+ 1 - 1
vite.config.ts

@@ -12,7 +12,7 @@ function resolve(dir: string) {
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
 // const proxyUrl = 'https://online.lexiaoya.cn/';
-const proxyUrl = 'https://dev.lexiaoya.cn/'
+const proxyUrl = 'https://test.lexiaoya.cn/'
 // const proxyUrl = 'http://47.98.131.38:8989/'
 // const proxyUrl = 'http://192.168.3.20:8989/' // 邹旋
 // const proxyUrl = 'http://192.168.3.143:8989/' // 尚科