纵跳摸高 和立定跳远 不需要倒计时播报

src/components/OptionWindow/index.vue

@@ -15,19 +15,16 @@
                 {{ project.key !== 'skiprope' ? '测试区域' : '设备组' }}
               </div>
               <div class="testAreaChooseRoll">
-                <div
-                  class="li"
-                  v-for="(item, index) in areaList"
-                  :class="{ 'select': chooseArea.includes(item.key), 'ing': item.value != '0' }"
-                  :key="index"
-                  @click="getChooseArea(item)"
-                >
+                <div class="li" v-for="(item, index) in areaList"
+                  :class="{ 'select': chooseArea.includes(item.key), 'ing': item.value != '0' }" :key="index"
+                  @click="getChooseArea(item)">
                   <div>{{ item.name }}</div>
                 </div>
               </div>
-              <div @click="getAllArea" class="allBtn" :class="{ 'active': chooseAllState }" v-if="!['skiprope','heartbeat'].includes(project.key)">
+              <div @click="getAllArea" class="allBtn" :class="{ 'active': chooseAllState }"
+                v-if="!['skiprope', 'heartbeat', 'jump'].includes(project.key)">
                 {{ chooseAllState ? '重 置' :
-                '全 选' }}
+                  '全 选' }}
               </div>
             </div>
             <!-- <div class="standardBox">
@@ -40,51 +37,37 @@
               </div>
             </div> -->
             <div class="switchList">
-              <div class="li" v-if="!['skiprope','heartbeat'].includes(project.key)">
+              <div class="li" v-if="!['skiprope', 'heartbeat'].includes(project.key)">
                 <span>举右手识别</span>
-                <el-switch
-                  v-model="optionForm.gesture"
-                  :active-value="true"
-                  :inactive-value="false"
-                  style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC"
-                />
+                <el-switch v-model="optionForm.gesture" :active-value="true" :inactive-value="false"
+                  style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC" />
               </div>
               <div class="li" v-if="project.key.slice(0, 3) != 'run'">
                 <span>体验模式</span>
-                <el-switch
-                  v-model="optionForm.demo"
-                  :active-value="1"
-                  :inactive-value="0"
-                  style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC"
-                />
+                <el-switch v-model="optionForm.demo" :active-value="1" :inactive-value="0"
+                  style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC" />
               </div>
               <div class="li" v-if="['skiprope'].includes(project.key)">
                 <span>接收心率</span>
-                <el-switch
-                  v-model="optionForm.hasHB"
-                  :active-value="true"
-                  :inactive-value="false"
-                  style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC"
-                />
+                <el-switch v-model="optionForm.hasHB" :active-value="true" :inactive-value="false"
+                  style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC" />
               </div>
             </div>
             <div class="switchList">
-              <div
-                class="li"
-                v-if="['situp', 'jumprope', 'jumpingjack', 'highknees', 'footballv1', 'basketballv1', 'volleyball', 'volleyballv1', 'pingpong', 'skiprope', 'heartbeat'].includes(project.key)"
-              >
+              <div class="li"
+                v-if="['situp', 'jumprope', 'jumpingjack', 'highknees', 'footballv1', 'basketballv1', 'volleyball', 'volleyballv1', 'pingpong', 'skiprope', 'heartbeat'].includes(project.key)">
                 <span>时长</span>
-                <el-select v-model="optionForm.time" :popper-append-to-body="false" placeholder="请选择" v-if="['heartbeat'].includes(project.key)">
-                  <el-option v-for="item in timeListHeartbeat" :key="item.value" :label="item.label" :value="item.value" />
+                <el-select v-model="optionForm.time" :popper-append-to-body="false" placeholder="请选择"
+                  v-if="['heartbeat'].includes(project.key)">
+                  <el-option v-for="item in timeListHeartbeat" :key="item.value" :label="item.label"
+                    :value="item.value" />
                 </el-select>
                 <el-select v-model="optionForm.time" :popper-append-to-body="false" placeholder="请选择" v-else>
                   <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
               </div>
-              <div
-                class="li"
-                v-if="['situp', 'jumprope', 'jumpingjack', 'highknees', 'footballv1', 'basketballv1', 'volleyball', 'volleyballv1', 'pingpong', 'skiprope'].includes(project.key)"
-              >
+              <div class="li"
+                v-if="['situp', 'jumprope', 'jumpingjack', 'highknees', 'footballv1', 'basketballv1', 'volleyball', 'volleyballv1', 'pingpong', 'skiprope'].includes(project.key)">
                 <span>音乐</span>
                 <el-select v-model="optionForm.music" :popper-append-to-body="false" placeholder="请选择" clearable>
                   <el-option v-for="item in musicList" :key="item.id" :label="item.name" :value="item.id" />
@@ -319,15 +302,15 @@ const getChooseArea = (data: any) => {
       return item != id;
     });
   } else {
-    //不存在就点选
-    if (['skiprope', 'heartbeat'].includes(project.value.key)) {
+    //单选
+    if (['skiprope', 'heartbeat', 'jump'].includes(project.value.key)) {
       chooseArea.value = [];
     }
     chooseArea.value.push(id);
     //排序
     chooseArea.value = areaList.value.filter((item: any) => {
       return chooseArea.value.includes(item.key);
-    }).map((item: any)=>{
+    }).map((item: any) => {
       return item.key;
     });
   }
@@ -430,7 +413,7 @@ const getGesture = async (myProject: any, data: any) => {
   confirm();
 };
 
-onMounted(() => {});
+onMounted(() => { });
 
 onBeforeUnmount(() => {
   loading.value = false;
@@ -613,6 +596,7 @@ defineExpose({
           ::v-deep(.el-select) {
             width: 100px;
             font-size: 16px;
+
             .el-select__selection {
               font-weight: bold !important;
             }
@@ -621,6 +605,7 @@ defineExpose({
           ::v-deep(.el-input) {
             width: 100px;
             font-size: 16px;
+
             .el-input__inner {
               text-align: center;
               font-weight: bold !important;

src/views/train/multiple.vue

@@ -4,7 +4,7 @@
     <Transition :enter-active-class="proxy?.animate.dialog.enter" :leave-active-class="proxy?.animate.dialog.leave">
       <div class="time"
         :class="{ 'time1': styleType == 1, 'time2': styleType == 2, 'time3': styleType == 3, 'time4': styleType == 4, }"
-        v-show="(needStart && [42].includes(examState)) || (['situp', 'jumprope', 'jumpingjack', 'highknees', 'verticaljump', 'pullup', 'sidepullup', 'squat', 'jumpleftright', 'crossjump', 'kneeupclap'].includes(parameter.project) && [42].includes(examState))">
+        v-show="(needStart && [42].includes(examState)) || (['situp', 'jumprope', 'jumpingjack', 'highknees', 'pullup', 'sidepullup', 'squat', 'jumpleftright', 'crossjump', 'kneeupclap'].includes(parameter.project) && [42].includes(examState))">
         {{
           time.countdownNum
         }}
@@ -35,7 +35,7 @@
       <template v-else>
         <template v-if="examState == 43">
           <div class="btn startBtn" @click="getReady"
-            v-if="['situp', 'jumprope', 'jumpingjack', 'highknees', 'verticaljump', 'pullup', 'sidepullup', 'squat', 'jumpleftright', 'crossjump', 'kneeupclap'].includes(parameter.project)">
+            v-if="['situp', 'jumprope', 'jumpingjack', 'highknees', 'pullup', 'sidepullup', 'squat', 'jumpleftright', 'crossjump', 'kneeupclap'].includes(parameter.project)">
             开始测试
           </div>
           <div class="btn startBtn" @click="getStartOneTest" v-else>开始测试</div>
@@ -927,7 +927,7 @@ onBeforeMount(() => {
     styleType.value = 4;
   }
   //需要开始按钮的项目
-  let myList = ['situp', 'jumprope', 'jumpingjack', 'highknees', 'verticaljump', 'pullup', 'sidepullup', 'squat', 'jumpleftright', 'crossjump', 'kneeupclap'];
+  let myList = ['situp', 'jumprope', 'jumpingjack', 'highknees', 'pullup', 'sidepullup', 'squat', 'jumpleftright', 'crossjump', 'kneeupclap'];
   if (myList.includes(project) && styleType.value == 3) {
     needStart.value = true;
   }