TIANYONG пре 3 месеци
родитељ
комит
887fae912a

+ 10 - 5
src/page-instrument/report-new/index.module.less

@@ -114,17 +114,19 @@
 }
 
 .scoreTable {
-    padding-top: calc(var(--header-height) + 30px);
-    background: #ECFDFC;
+    padding-top: calc(var(--header-height) + 1px);
+    background: #EFF7FF;
     .stContent {
         position: relative;
         &::before {
+            content: "";
             position: absolute;
             left: 0;
             top: 0;
             width: 47px;
-            height: 200px;
-            background: linear-gradient( 90deg, rgba(212,244,237,0) 0%, #D4F5EE 100%);
+            height: 100%;
+            background: linear-gradient( 90deg, #D4F5EE 0%, rgba(212,244,237,0) 100%);
+            z-index: 0;
         }
         border: 1px solid rgba(120, 211, 205, 0.58);
         display: flex;
@@ -171,10 +173,13 @@
         display: flex;
         align-items: center;
         border-bottom: 1px solid rgba(120, 211, 205, 0.25);
+        border-right: 1px solid rgba(120, 211, 205, 0.58);
+        width: 160px;
         &:last-child {
             border-bottom: none;
         }
         li {
+            position: relative;
             width: 40px;
             height: 15px;
             border-right: 1px dashed;
@@ -187,7 +192,7 @@
                 transparent 6px
             ) 1;
             &:last-child {
-                //border-right: none;
+                border-right: none;
             }
         }
     }

+ 19 - 2
src/page-instrument/report-new/index.tsx

@@ -6,6 +6,7 @@ import styles from "./index.module.less";
 import { getQuery } from "/src/utils/queryString";
 import backIcon from "./image/back_icon.png";
 import videoIcon from "./image/video_icon.png";
+import { api_musicPracticeRecordDetail } from "../api";
 
 
 export default defineComponent({
@@ -15,14 +16,30 @@ export default defineComponent({
     const scoreData = reactive({
         videoFilePath: "", // 回放视频路径
         openRealPitch: false,
+        xmlNotes: [],
     });
 
+    const getRecordDetail = async () => {
+        state.isEvaluatReport = true;
+        const res = await api_musicPracticeRecordDetail(query.id);
+        state.partIndex = Number(res?.data?.partIndex);
+        let resultData = {} as any;
+        try {
+          resultData = eval('(' + res?.data?.scoreData + ')');
+          scoreData.xmlNotes = eval('(' + JSON.parse(res.data.scoreData)?.musicalNotesPlayStats?.musicXmlBasicInfo + ')')?.musicXmlInfos || []
+        } catch (error) {
+          console.error("解析评测结果:", error);
+        }
+        console.log(11111,scoreData.xmlNotes)
+        scoreData.videoFilePath = res.data?.videoFilePath || res.data?.recordFilePath;
+    }
+
     onBeforeMount(() => {
 
     });
 
     onMounted(async () => {
-      state.isEvaluatReport = true;
+        getRecordDetail()
     });
 
 
@@ -66,7 +83,7 @@ export default defineComponent({
                 {
                     [1,1,1,1,1,1,1,1,1,1].map((item: any, mIndex: number) => 
                         <>
-                            <div>
+                            <div class={styles.stColumn}>
                                 <div class={styles.stMeasure}>
                                     <p class={styles.mBeat}>
                                         <span>4</span>

+ 1 - 1
vite.config.ts

@@ -81,7 +81,7 @@ export default defineConfig({
     // https: true,
     proxy: {
       "^/instrument/.*": {
-        target: "https://test.gym.lexiaoya.cn",
+        target: "https://dev.gym.lexiaoya.cn",
         changeOrigin: true,
         rewrite: (path) => path.replace(/^\/instrument/, ""),
       },