Merge branch 'new-feature-tianyong' into ktyq-pre

src/helpers/formateMusic.ts

@@ -831,8 +831,8 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 
 			let relativeTime = usetime;
 			// 速度不能为0 此处的速度应该是按照设置的速度而不是校准后的速度，否则mp3速度不对
-			// let beatSpeed = (state.isSpecialBookCategory ? measureSpeed : baseSpeed) || 1;
-			let beatSpeed = measureSpeed || baseSpeed
+			let beatSpeed = (state.isSpecialBookCategory ? measureSpeed : baseSpeed) || 1;
+			// let beatSpeed = measureSpeed || baseSpeed
 			// 如果有节拍器,需要将节拍器的时间算出来
 			if (i === 0) {
 				fixtime += getFixTime(beatSpeed);
@@ -970,7 +970,7 @@ export const formateTimes = (osmd: OpenSheetMusicDisplay) => {
 				isRestFlag: note.isRestFlag,
 				noteId: note.NoteToGraphicalNoteObjectId,
 				measureListIndex: note.sourceMeasure.measureListIndex,
-				MeasureNumberXML: note.sourceMeasure.MeasureNumberXML,
+				MeasureNumberXML: note.sourceMeasure.MeasureNumberXML, // 当前的小节数，（从1开始）
 				_noteLength: _noteLength,
 				svgElement: svgElement,
 				frequency: note?.pitch?.frequency || -1,

src/page-instrument/evaluat-model/evaluat-result/index.tsx

@@ -57,7 +57,9 @@ export default defineComponent({
 		};
 
 		onMounted(() => {
-			handleAddRecord();
+			if (!evaluatingData.isErrorState) {
+				handleAddRecord();
+			}
 		});
 
 		watch(() => evaluatingData.resulstMode, (val) => {

src/page-instrument/evaluat-model/index.tsx

@@ -396,7 +396,7 @@ export default defineComponent({
 				</Popup> */}
 
         {
-          !evaluatingData.isErrorState && 
+          
           <Popup teleport="body" closeOnClickOverlay={false} class={["popup-custom", "van-scale"]} transition="van-scale" v-model:show={evaluatingData.resulstMode}>
             <EvaluatResult onClose={handleEvaluatResult} />
           </Popup>    

src/state.ts

@@ -943,9 +943,9 @@ const setState = (data: any, index: number) => {
   state.trackId = data.track;
   state.subjectId = data.subjectIds ? data.subjectIds.split(',')?.[0] : 0;
   // 声部code
-  const subjectCode = data.subjectCodes ? data.subjectCodes.split(',')?.[0] : 0;
+  const subjectCode = data.subjectCodes ? data.subjectCodes.split(',')?.[0] : '';
   // 乐器code
-  let musicalCode = data.musicalInstrumentIdCodes ? data.musicalInstrumentIdCodes.split(',')?.[0] : 0;
+  let musicalCode = data.musicalInstrumentIdCodes ? data.musicalInstrumentIdCodes.split(',')?.[0] : '';
   const pitchSubject = musicalInstrumentCodeInfo.find((n) => n.code.toLocaleLowerCase() === subjectCode.toLocaleLowerCase())
   const pitchMusical = musicalInstrumentCodeInfo.find((n) => n.code.toLocaleLowerCase() === musicalCode.toLocaleLowerCase())
   state.subjectCodeId = pitchSubject ? pitchSubject.id : 0
@@ -981,7 +981,7 @@ const setState = (data: any, index: number) => {
   state.musicSheetCategoriesId = data.musicCategoryId;
   state.playMode = data.playMode === "MP3" ? "MP3" : "MIDI";
   state.originSpeed = state.speed = data.playSpeed;
-  state.playIngSpeed = data.playSpeed;
+  // state.playIngSpeed = data.playSpeed;
   const track = data.code || data.track;
   state.track = track ? track.replace(/ /g, "").toLocaleLowerCase() : "";
   // 能否评测，根据当前声轨有无伴奏判断
@@ -1003,7 +1003,7 @@ const setState = (data: any, index: number) => {
   state.isPercussion = data.evaluationStandard === "AMPLITUDE" || data.evaluationStandard === "DECIBELS";
   state.evaluationStandard = data.evaluationStandard?.toLocaleLowerCase() || ''
   // 设置是否特殊曲谱, 是特殊曲谱取反(不理解之前的思考逻辑), 使用后台设置的速度
-  // state.isSpecialBookCategory = !classids.includes(data.musicCategoryId);
+  state.isSpecialBookCategory = !classids.includes(Number(data.musicCategoryId));
 
   // 设置指法
   // const code = state.isConcert ? mappingVoicePart(state.trackId, "ENSEMBLE") : mappingVoicePart(state.subjectId, "INSTRUMENT");

src/utils/index.ts

@@ -128,7 +128,8 @@ export const matchProductApiUrl = () => {
 			'dev': 'https://dev.kt.colexiu.com',
 			'test': 'https://test.kt.colexiu.com',
 			'test2': 'https://test.lexiaoya.cn',
-			'online': 'https://kt.colexiu.com'
+			// 'online': 'https://kt.colexiu.com',
+			'online': 'https://resource.colexiu.com'
 		}
 	}
 	let environment: 'dev' | 'test' | 'test2' | 'online' = location.origin.includes('//dev') ? 'dev' : location.origin.includes('//test') ? 'test' : (location.origin.includes('//online') || location.origin.includes('//mec')) ? 'online' : 'dev'