Merge branch 'feature-tianyong-newVersion' into ktyq-test-new

src/page-instrument/custom-plugins/work-home/index.tsx

@@ -103,13 +103,6 @@ export default defineComponent({
 		const handleStart = () => {
 			training.timer = setInterval(() => {
 				training.trainingTimeSecond += 1;
-				// console.log('累积时间',111,state.isWorkDone,training.trainingTimeSecond,training.times * 60)
-				// 如果播放中，作业从未达标到达标状态，需要暂停播放，并且弹窗提示作业已达标
-				if (!state.isWorkDone && training.trainingTimeSecond >= training.times * 60) {
-					state.isWorkDone = true
-					training.showWorkDonePop = true
-					togglePlay("paused")
-				}
 				// console.log('练习时长',training.trainingTimeSecond)
 			}, 1000);
 		};
@@ -132,6 +125,18 @@ export default defineComponent({
 				}
 			}
 		);
+		watch(
+			() => training.trainingTimeSecond,
+			() => {
+				// console.log('累积时间',111,state.isWorkDone,training.trainingTimeSecond,training.times * 60)
+				// 如果播放中，作业从未达标到达标状态，需要暂停播放，并且弹窗提示作业已达标
+				if (!state.isWorkDone && training.trainingTimeSecond >= training.times * 60 || (state.isWorkDone && training.trainingTimeSecond === training.times * 60)) {
+					state.isWorkDone = true
+					training.showWorkDonePop = true
+					togglePlay("paused")
+				}
+			}
+		);
 		const handleAdd = () => {
 			if (state.playState === "play") {
 				console.log("退出");