Merge branch 'hqyDev' of http://git.dayaedu.com/lex/classroom-instruments into online

src/components/timerMeter/TimerMeter.vue

@@ -138,10 +138,10 @@
         class="timeDownBom"
         :class="{ palyDisabled: playState === 'play' }"
       >
-        <div @click="handleTimeNum(300)">5分</div>
-        <div @click="handleTimeNum(60)">1分</div>
-        <div @click="handleTimeNum(30)">30秒</div>
-        <div @click="handleTimeNum(5)">5秒</div>
+        <div @click="handleTimeNum(300, 1)">5分</div>
+        <div @click="handleTimeNum(60, 2)">1分</div>
+        <div @click="handleTimeNum(30, 3)">30秒</div>
+        <div @click="handleTimeNum(5, 4)">5秒</div>
       </div>
       <img v-else class="timeUpBom" src="./img/timeUpBom.png" />
       <Dragbom />
@@ -219,9 +219,20 @@ function handleSSTime(num: number) {
   }
   ssValue.value = newSsValue;
 }
-function handleTimeNum(num: number) {
+let numType = 0;
+function handleTimeNum(num: number, type: number) {
   if (playState.value === 'play') return;
-  timeNum.value = num;
+  if (numType !== type) {
+    numType = type;
+    timeNum.value = num;
+    return;
+  }
+  const timeNumNow = timeNum.value + num;
+  if (timeNumNow >= 3599) {
+    timeNum.value = 3599;
+    return;
+  }
+  timeNum.value = timeNumNow;
 }
 // 开始
 function handlePlay() {