Merge branch 'hqyDev' of http://git.dayaedu.com/tianyong/gym-music-score into gym-online

src/page-instrument/component/the-music-list/list.tsx

@@ -25,7 +25,7 @@ export default defineComponent({
       name: "",
       page: 1,
       rows: 20,
-      musicalInstrumentId: state.isConcert ? "" : state.instrumentId,
+      musicalInstrumentId: state.specialPercussionFlag ? state.musicalInstrumentIds.split(",")[0] : (state.isConcert ? "" : state.instrumentId),
       musicSheetCategoriesId: state.bizMusicCategoryId,
       recentFlag: props.recentFlag ? true : null,
       excludeMusicId: props.recentFlag ? null : state.examSongId,

src/state.ts

@@ -461,6 +461,10 @@ const state = reactive({
   scrollContainer: "musicAndSelection",
   /** 是否是打击乐 */
   isPercussion: false,
+  /* 特殊打击乐 */
+  specialPercussionFlag: false,
+  /* 打击乐乐器id集合 */
+  musicalInstrumentIds: "",
   /** 评测标准 */
   evaluationStandard: '',
   /** 是否重复节拍器的时间 */
@@ -1715,6 +1719,9 @@ const setState = (data: any, index: number) => {
   state.subjectId = data.subjectIds ? data.subjectIds.split(',')?.[0] : 0;
   // 声部code
   const subjectCode = data.subjectCodes ? data.subjectCodes.split(',')?.[0] : '';
+  // 打击乐列表查询用
+  state.specialPercussionFlag = data.specialPercussionFlag
+  state.musicalInstrumentIds = data.musicalInstrumentIds || ""
   // 乐器code
   // let musicalCode = data.musicalInstrumentIdCodes ? data.musicalInstrumentIdCodes.split(',')?.[0] : '';
   /**

src/style.css

@@ -162,37 +162,13 @@ body {
 
 @keyframes noteAnimate {
   0% {
-    scale: 0.4;
-  }
-  10% {
-    scale: 0.6;
-  }
-  20% {
-    scale: 0.8;
-  }
-  30% {
-    scale: 1;
-  }
-  40% {
-    scale: 1.2;
+    transform: scale(1);
   }
   50% {
-    opacity: 1.4;
-  }
-  60% {
-    opacity: 1.6;
-  }
-  70% {
-    opacity: 1.4;
-  }
-  80% {
-    opacity: 1.2;
-  }
-  90% {
-    opacity: 1.1;
+    transform: scale(1.2);
   }
   100% {
-    opacity: 1;
+    transform: scale(1);
   }
 }