TIANYONG 1 rok temu
rodzic
commit
5d09f59c4a

Plik diff jest za duży
+ 0 - 0
src/page-instrument/component/mode-type-mode/icon/index.json


+ 2 - 1
src/page-instrument/component/mode-type-mode/index.tsx

@@ -90,8 +90,9 @@ export default defineComponent({
 						/>
 						<img
 							id="modeType-2"
+							style={{ cursor: state.enableEvaluation ? "pointer" : "not-allowed" }}
 							onClick={() => headTopData.handleChangeModeType("evaluating")}
-							src={icons.icon_3}
+							src={state.enableEvaluation ? icons.icon_3 : icons.icon_4}
 						/>
 					</div>
 					{data.showPC && data.showTip ? <TeacherBootom></TeacherBootom> : null}

+ 23 - 20
src/page-instrument/header-top/index.tsx

@@ -35,6 +35,7 @@ export const headTopData = reactive({
   settingMode: false,
   /** 切换模式 */
   handleChangeModeType(value: "practise" | "follow" | "evaluating") {
+    if (!state.enableEvaluation) return
     // 跟练模式,光标只有音符模式,无节拍模式
     if (value === 'follow' && metronomeData.cursorMode === 2) {
       metronomeData.cursorMode = 1
@@ -411,26 +412,28 @@ export default defineComponent({
                 default: () => <Speed />,
               }}
             </Popover>
-            <Popover trigger="manual" v-model:show={headData.musicTypeShow} placement="bottom-end" overlay={false}>
-              {{
-                reference: () => (
-                  <div
-                    id={state.platform === IPlatform.PC ? "teacherTop-5" : "studnetT-5"}
-                    style={{ display: converBtn.value.display ? "" : "none" }}
-                    class={[styles.btn, converBtn.value.disabled && styles.disabled]}
-                    onClick={(e: Event) => {
-                      e.stopPropagation();
-                      headData.musicTypeShow = !headData.musicTypeShow;
-                    }}
-                  >
-                    <img class={styles.iconBtn} src={headImg("icon_zhuanpu.svg")} />
-                    <span>{state.musicRenderType === "staff" ? "转谱" : "转谱"}</span>
-                  </div>
-                ),
-                default: () => <MusicType />,
-              }}
-            </Popover>
-
+            {
+              state.enableNotation ? 
+              <Popover trigger="manual" v-model:show={headData.musicTypeShow} placement="bottom-end" overlay={false}>
+                {{
+                  reference: () => (
+                    <div
+                      id={state.platform === IPlatform.PC ? "teacherTop-5" : "studnetT-5"}
+                      style={{ display: converBtn.value.display ? "" : "none" }}
+                      class={[styles.btn, converBtn.value.disabled && styles.disabled]}
+                      onClick={(e: Event) => {
+                        e.stopPropagation();
+                        headData.musicTypeShow = !headData.musicTypeShow;
+                      }}
+                    >
+                      <img class={styles.iconBtn} src={headImg("icon_zhuanpu.svg")} />
+                      <span>{state.musicRenderType === "staff" ? "转简谱" : "转五线谱"}</span>
+                    </div>
+                  ),
+                  default: () => <MusicType />,
+                }}
+              </Popover> : null            
+            }
             <div id={state.platform === IPlatform.PC ? "teacherTop-6" : "studnetT-6"} style={{ display: settingBtn.value.display ? "" : "none" }} class={[styles.btn, settingBtn.value.disabled && styles.disabled]} onClick={() => (headTopData.settingMode = true)}>
               <img class={styles.iconBtn} src={headImg("icon_menu.svg")} />
               <span>设置</span>

+ 1 - 1
src/page-instrument/view-detail/index.tsx

@@ -214,7 +214,7 @@ export default defineComponent({
       state.times = formateTimes(osmd);
       state.times = resetFrequency(state.times);
       state.times = setNoteHalfTone(state.times);
-      console.log("🚀 ~ state.times:", state.times, state.subjectId);
+      console.log("🚀 ~ state.times:", state.times, state.subjectId, state);
       try {
         metronomeData.metro = new Metronome();
         metronomeData.metro.init(state.times);

Plik diff jest za duży
+ 0 - 0
src/page-orchestra/header-top/image/headerTop.json


+ 3 - 2
src/page-orchestra/header-top/mode-type-mode/index.tsx

@@ -1,6 +1,7 @@
 import { defineComponent, onMounted, Teleport, Transition } from "vue";
 import styles from "./index.module.less";
-import { model1, model2, model3 } from "../image/headerTop.json";
+import { model1, model2, model3, model4 } from "../image/headerTop.json";
+import state from "/src/state";
 
 export default defineComponent({
 	name: "modelWraper",
@@ -10,7 +11,7 @@ export default defineComponent({
 			<div class={styles.wrap}>
 				<img id="modeType-0" onClick={() => emit("close", "practise")} src={model1} />
 				<img id="modeType-1" onClick={() => emit("close", "follow")} src={model3} />
-				<img id="modeType-2" onClick={() => emit("close", "evaluating")} src={model2} />
+				<img id="modeType-2" onClick={() => emit("close", "evaluating")} src={ model4 } />
 			</div>
 		);
 	},

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików