1

1

src/components/timerMeter/components/countdown.tsx

@@ -166,6 +166,8 @@ export default defineComponent({
           init();
         },600)
       }else {
+        // isPlaying.value = false
+        count.value = 0;
         init();
       }
 
@@ -208,31 +210,52 @@ export default defineComponent({
       second.value = Math.floor(count.value % 60);
     };
 
-    const updateMin = () => {
-      console.log(mine.value, count.value);
-      const lastStr = getSecond(count.value);
-      count.value = mine.value * 60 + second.value;
-      const str = getSecond(count.value);
-      console.log(str, lastStr);
-      for (let i = 0; i < flipObjs.value.length; i++) {
-        if (lastStr[i] === str[i]) {
-          continue;
+    const updateMin = (e:any) => {
+      let targetCount =parseInt(e.target.value);
+      if(Number.isNaN(targetCount) ){
+        targetCount = 0
+      }
+      if(targetCount > 59){
+        targetCount = 59
+      }
+      mine.value = targetCount
+        const lastStr = getSecond(count.value);
+        console.log( mine.value);
+        count.value = mine.value * 60 + second.value;
+
+        const str = getSecond(count.value);
+        console.log(str, lastStr);
+        for (let i = 0; i < flipObjs.value.length; i++) {
+          if (lastStr[i] === str[i]) {
+            continue;
+          }
+          flipObjs.value[i].value.flipUp(lastStr[i], str[i]);
+
         }
-        flipObjs.value[i].value.flipUp(lastStr[i], str[i]);
+
       }
-    };
-    const updateSecond = () => {
-      console.log(mine.value);
-      const lastStr = getSecond(count.value);
-      count.value = mine.value * 60 + second.value;
-      const str = getSecond(count.value);
-      for (let i = 0; i < flipObjs.value.length; i++) {
-        if (lastStr[i] === str[i]) {
-          continue;
+
+    const updateSecond = (e:any) => {
+      let targetCount =parseInt(e.target.value);
+      if(Number.isNaN(targetCount) ){
+        targetCount = 0
+      }
+      if(targetCount > 59){
+        targetCount = 59
+      }
+      second.value = targetCount
+        const lastStr = getSecond(count.value);
+        count.value = mine.value * 60 + second.value;
+        const str = getSecond(count.value);
+        for (let i = 0; i < flipObjs.value.length; i++) {
+          if (lastStr[i] === str[i]) {
+            continue;
+          }
+          flipObjs.value[i].value.flipUp(lastStr[i], str[i]);
         }
-        flipObjs.value[i].value.flipUp(lastStr[i], str[i]);
+
       }
-    };
+
 
     watch(
       () => count.value,
@@ -240,7 +263,8 @@ export default defineComponent({
         mine.value = Math.floor(val / 60);
         second.value = Math.floor(val % 60);
       }
-    );
+    )
+
     return () => (
       <div class={styles.timerItemWrap}>
         <div class={styles.timerItemInfo}>
@@ -349,7 +373,7 @@ export default defineComponent({
             <NButton
               round
               type="primary"
-              disabled={count.value === 0}
+              disabled={count.value == 0}
               icon-placement="right"
               onClick={() => startTimer()}
               v-slots={{