浏览代码

style: 评测报告样式调整

TIANYONG 1 年之前
父节点
当前提交
82da628dc6

+ 4 - 1
src/page-instrument/view-evaluat-report/component/share-top/index.module.less

@@ -264,7 +264,7 @@
         width: 50%;
         display: flex;
         align-items: center;
-        padding: 7px 0;
+        padding: 12px 0 12px 6px;
         span{
             margin-left: 12px;
             font-size: 12px;
@@ -273,6 +273,9 @@
         svg {
             visibility: visible;
         }
+        &:nth-child(2n) {
+            transform: translateX(20px);
+        }
     }
     .itemTone {
         width: 50%;

+ 4 - 4
src/page-instrument/view-evaluat-report/component/share-top/index.tsx

@@ -187,11 +187,11 @@ export default defineComponent({
 							{itemType.value === "intonation" && (
 								<>
 									<div>
-										<Note fill="rgba(1, 193, 181, .8)" shadowFill="#FFAB25" shadow x={-2} y={0} />
+										<Note fill="rgba(42, 188, 111, 1)" shadowFill="#FFAB25" shadow x={-2} y={0} />
 										<span>演奏偏高</span>
 									</div>
 									<div>
-										<Note fill="rgba(1, 193, 181, .8)" shadowFill="#FFAB25" shadow x={-1} y={-3} />
+										<Note fill="rgba(42, 188, 111, 1)" shadowFill="#FFAB25" shadow x={-1} y={-3} />
 										<span>演奏偏低</span>
 									</div>
 								</>
@@ -199,11 +199,11 @@ export default defineComponent({
 							{itemType.value === "cadence" && (
 								<>
 									<div>
-										<Note fill="rgba(1, 193, 181, .8)" shadowFill="#FFAB25" shadow x={0.5} y={-1} />
+										<Note fill="rgba(42, 188, 111, 1)" shadowFill="#FFAB25" shadow x={0.5} y={-1} />
 										<span>节奏偏快</span>
 									</div>
 									<div>
-										<Note fill="rgba(1, 193, 181, .8)" shadowFill="#FFAB25" shadow x={-3} y={-2.5} />
+										<Note fill="rgba(42, 188, 111, 1)" shadowFill="#FFAB25" shadow x={-3} y={-2.5} />
 										<span>演奏偏低</span>
 									</div>
 								</>

+ 5 - 5
src/page-instrument/view-evaluat-report/index.tsx

@@ -239,13 +239,13 @@ export default defineComponent({
 		  }
 	  
 		  const filterNotes = () => {
-			const include = ['RIGHT', 'WRONG', 'NOT_PLAYED']
+			let include = ['RIGHT', 'WRONG', 'NOT_PLAYED']
 			if (scoreData.itemType === 'intonation') { // 音准
 			  include.push(...['HIGH', 'LOW', 'DURATION_INSUFFICIENT'])
 			} else if (scoreData.itemType === 'cadence') { // 节奏
 			  include.push(...['EARLY', 'LATE'])
 			} else if (scoreData.itemType === 'integrity') { // 完整性
-			  include.push(...['DURATION_INSUFFICIENT'])
+			  include = ['DURATION_INSUFFICIENT', 'RIGHT', 'NOT_PLAYED']
 			}
 			if (scoreData.itemType === 'cadence') {
 				return detailData.musicalNotesPlayStats.filter((item: any) => include.includes(item.rhythmicAssessment.result))
@@ -310,9 +310,9 @@ export default defineComponent({
 				  }
 				  if (scoreData.musicType === 'staff') {
 					copySvg.style.transform = getOffsetPosition(errType)
-					svgEl.style.opacity = '.7'
+					//svgEl.style.opacity = '.7'
 					if (stemEl) {
-					  stemEl.style.opacity = '.7'
+					  //stemEl.style.opacity = '.7'
 					}
 				  }
 				  copySvg.id = 'vf-' + active.id + '-copy'
@@ -423,7 +423,7 @@ export default defineComponent({
 					class={[styles.container, !state.setting.displayCursor && "hideCursor"]}
 				>
 					{/* 曲谱渲染 */}
-					{!detailData.isLoading && <MusicScore onRendered={handleRendered} />}
+					{!detailData.isLoading && <MusicScore musicColor={'#ADADAD'} onRendered={handleRendered} />}
 					{
 						<div class={styles.arrowSvg}>
 							<TopArrow />