liushengqiang 2 éve
szülő
commit
ff190cd476

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

@@ -17,7 +17,7 @@ export default defineComponent({
 				// PC
 				// PC
 				setTimeout(() => {
 				setTimeout(() => {
 					showPC.value = true;
 					showPC.value = true;
-				}, 1000);
+				}, 500);
 			} else {
 			} else {
 				// 学生端
 				// 学生端
 				setTimeout(() => {
 				setTimeout(() => {
@@ -35,8 +35,8 @@ export default defineComponent({
 		);
 		);
 		return () => (
 		return () => (
 			<>
 			<>
-				<div id="modeType-box" class={[styles.wrap, headTopData.modeType === "init" ? "" : styles.hidden]}>
-					<div class={styles.infoWrap}>
+				<div class={[styles.wrap, headTopData.modeType === "init" ? "" : styles.hidden]}>
+					<div id="modeType-box" class={styles.infoWrap}>
 						<img
 						<img
 							id="modeType-0"
 							id="modeType-0"
 							onClick={() => headTopData.handleChangeModeType("practise")}
 							onClick={() => headTopData.handleChangeModeType("practise")}

+ 29 - 42
src/page-instrument/custom-plugins/guide-page/teacher-bootom.tsx

@@ -14,75 +14,61 @@ export default defineComponent({
 			show: false,
 			show: false,
 			steps: [
 			steps: [
 				{
 				{
-					ele: "",
-					eleRect: {} as DOMRect,
+					eleRect: {
+            left: '5rem',
+            top: '-3rem'
+          },
 					img: getImage("aiTeacher1.png"),
 					img: getImage("aiTeacher1.png"),
-					handStyle: {
-						top: "0.91rem",
-					},
 					imgStyle: {
 					imgStyle: {
-						top: "-3.01rem",
 						width: "6.48rem",
 						width: "6.48rem",
-						height: "3.01rem",
-						left: "4.67rem",
+						height: "3rem",
 					},
 					},
 					btnsStyle: {
 					btnsStyle: {
-						top: "-1.61rem",
-						left: "6rem",
+						bottom: ".9rem",
+						left: "3rem",
 					},
 					},
 				},
 				},
 				{
 				{
-					ele: "",
 					img: getImage("aiTeacher2.png"),
 					img: getImage("aiTeacher2.png"),
-					handStyle: {
-						top: "-1.39rem",
-						left: "0.15rem",
-						transform: "rotate(180deg)",
-					},
+          eleRect: {
+            top: '-3rem'
+          },
 					imgStyle: {
 					imgStyle: {
-						top: "-3.01rem",
 						width: "6.48rem",
 						width: "6.48rem",
 						height: "3.01rem",
 						height: "3.01rem",
 					},
 					},
 					btnsStyle: {
 					btnsStyle: {
-						top: "-1.61rem",
-						left: "1.3rem",
+						bottom: ".9rem",
+						left: "3rem",
 					},
 					},
 				},
 				},
 				{
 				{
-					ele: "",
 					img: getImage("aiTeacher3.png"),
 					img: getImage("aiTeacher3.png"),
-					handStyle: {
-						top: "-1.39rem",
-						left: "0.17rem",
-						transform: "rotate(180deg)",
-					},
+          eleRect: {
+            top: '-3rem'
+          },
 					imgStyle: {
 					imgStyle: {
-						top: "-3.01rem",
 						width: "6.48rem",
 						width: "6.48rem",
-						height: "3.01rem",
+						height: "3rem",
 					},
 					},
 					btnsStyle: {
 					btnsStyle: {
-						top: "-1.61rem",
-						left: "1.3rem",
+						bottom: ".9rem",
+						left: "3rem",
 					},
 					},
 				},
 				},
 				{
 				{
-					ele: "",
 					img: getImage("aiTeacher4.png"),
 					img: getImage("aiTeacher4.png"),
-					handStyle: {
-						top: "-1.39rem",
-						left: "1.4rem",
-						transform: "rotate(180deg)",
-					},
+          eleRect: {
+            top: '-3rem',
+            left: '-1rem'
+          },
 					imgStyle: {
 					imgStyle: {
-						top: "-3.01rem",
 						width: "6.48rem",
 						width: "6.48rem",
 						height: "3.01rem",
 						height: "3.01rem",
 					},
 					},
 					btnsStyle: {
 					btnsStyle: {
-						top: "-1.61rem",
-						left: "0.8rem",
+						bottom: ".9rem",
+						left: "1.7rem",
 						"justify-content": "center",
 						"justify-content": "center",
 						padding: 0,
 						padding: 0,
 					},
 					},
@@ -99,9 +85,10 @@ export default defineComponent({
 		} else {
 		} else {
 			tipShow.value = true;
 			tipShow.value = true;
 		}
 		}
+    const steps = ['modeType-box', 'modeType-0', 'modeType-1', 'modeType-2']
 		const getStepELe = () => {
 		const getStepELe = () => {
-			console.log(`modeType${data.step}`);
-			const ele: HTMLElement = document.getElementById(`modeType-${data.step}`)!;
+			console.log(steps[data.step]);
+			const ele: HTMLElement = document.getElementById(steps[data.step])!;
 			if (ele) {
 			if (ele) {
 				const eleRect = ele.getBoundingClientRect();
 				const eleRect = ele.getBoundingClientRect();
 				data.box = {
 				data.box = {
@@ -160,8 +147,8 @@ export default defineComponent({
 								class={styles.item}
 								class={styles.item}
 								style={{
 								style={{
 									display: index === data.step ? "" : "none",
 									display: index === data.step ? "" : "none",
-									left: `${item.eleRect?.left}px`,
-									top: `${item.eleRect?.top}px`,
+									left: `${item.eleRect?.left}`,
+									top: `${item.eleRect?.top}`,
 								}}
 								}}
 							>
 							>
 								<img class={styles.img} style={item.imgStyle} src={item.img} />
 								<img class={styles.img} style={item.imgStyle} src={item.img} />

+ 13 - 9
src/page-instrument/custom-plugins/work-ealuating/index.tsx

@@ -2,7 +2,7 @@ import { defineComponent, onMounted, reactive, watch } from "vue";
 import { useRoute } from "vue-router";
 import { useRoute } from "vue-router";
 // import { verifyMembershipServices } from "../vip-verify";
 // import { verifyMembershipServices } from "../vip-verify";
 import { api_lessonTrainingSubmitTraining } from "../../api";
 import { api_lessonTrainingSubmitTraining } from "../../api";
-import state, { IDifficulty } from "/src/state";
+import state, { IDifficulty, handleSetSpeed } from "/src/state";
 import { getQuery } from "/src/utils/queryString";
 import { getQuery } from "/src/utils/queryString";
 import { evaluatingData } from "/src/view/evaluating";
 import { evaluatingData } from "/src/view/evaluating";
 
 
@@ -14,7 +14,7 @@ export default defineComponent({
 			default: () => ({}),
 			default: () => ({}),
 		},
 		},
 	},
 	},
-	setup(props, {expose}) {
+	setup(props, { expose }) {
 		const query = getQuery();
 		const query = getQuery();
 		const evaluatingWorkData = reactive({
 		const evaluatingWorkData = reactive({
 			difficulty: "" as IDifficulty,
 			difficulty: "" as IDifficulty,
@@ -42,6 +42,10 @@ export default defineComponent({
 			if (["BEGINNER", "ADVANCED", "PERFORMER"].includes(trainingContent.evaluateDifficult)) {
 			if (["BEGINNER", "ADVANCED", "PERFORMER"].includes(trainingContent.evaluateDifficult)) {
 				evaluatingWorkData.difficulty = trainingContent.evaluateDifficult;
 				evaluatingWorkData.difficulty = trainingContent.evaluateDifficult;
 				state.setting.evaluationDifficulty = trainingContent.evaluateDifficult;
 				state.setting.evaluationDifficulty = trainingContent.evaluateDifficult;
+				//设置速度
+				if (trainingContent.evaluateSpeed) {
+					handleSetSpeed(trainingContent.evaluateSpeed);
+				}
 			}
 			}
 		};
 		};
 		/** 添加记录 */
 		/** 添加记录 */
@@ -55,19 +59,19 @@ export default defineComponent({
 				console.log(error);
 				console.log(error);
 			}
 			}
 		};
 		};
-		const handleAdd = () => {
-			if (evaluatingData.resulstMode && evaluatingData.isComplete) {
-				addEvaluatingWorkRecored(evaluatingData.resultData);
+		watch(
+			() => evaluatingData.resulstMode,
+			() => {
+				if (evaluatingData.resulstMode && evaluatingData.isComplete) {
+					addEvaluatingWorkRecored(evaluatingData.resultData);
+				}
 			}
 			}
-		}
+		);
 		onMounted(() => {
 		onMounted(() => {
 			handleHide();
 			handleHide();
 			getWorkData();
 			getWorkData();
 			// verifyMembershipServices();
 			// verifyMembershipServices();
 		});
 		});
-		expose({
-			handleAdd
-		})
 		return () => <div></div>;
 		return () => <div></div>;
 	},
 	},
 });
 });

+ 1 - 5
src/page-instrument/custom-plugins/work-index/index.tsx

@@ -6,7 +6,6 @@ import { api_lessonTrainingTrainingStudentDetail } from "../../api";
 import { headTopData } from "../../header-top";
 import { headTopData } from "../../header-top";
 
 
 const workHomeRef = ref();
 const workHomeRef = ref();
-const workEaluatRef = ref();
 
 
 const data = reactive({
 const data = reactive({
 	/** 作业类型:练习PRACTICE, 评测EVALUATION */
 	/** 作业类型:练习PRACTICE, 评测EVALUATION */
@@ -18,9 +17,6 @@ export const HANDLE_WORK_ADD = () => {
 	if (data.trainingType === "PRACTICE"){
 	if (data.trainingType === "PRACTICE"){
 		workHomeRef.value?.handleAdd();
 		workHomeRef.value?.handleAdd();
 	}
 	}
-	if (data.trainingType === "EVALUATION"){
-		workEaluatRef.value?.handleAdd();
-	}
 };
 };
 
 
 export default defineComponent({
 export default defineComponent({
@@ -50,7 +46,7 @@ export default defineComponent({
 				{data.trainingType === "PRACTICE" && <WorkHome ref={workHomeRef} workeData={data.worke} />}
 				{data.trainingType === "PRACTICE" && <WorkHome ref={workHomeRef} workeData={data.worke} />}
 				{/* 评测作业 */}
 				{/* 评测作业 */}
 				{data.trainingType === "EVALUATION" && (
 				{data.trainingType === "EVALUATION" && (
-					<WorkEaluating ref={workEaluatRef} workeData={data.worke} />
+					<WorkEaluating workeData={data.worke} />
 				)}
 				)}
 			</>
 			</>
 		);
 		);