浏览代码

日常开发

林旭祥 8 月之前
父节点
当前提交
5e4fdf4bb8
共有 2 个文件被更改,包括 16 次插入18 次删除
  1. 1 1
      src/components/Header/index.vue
  2. 15 17
      src/components/OptionWindow/index.vue

+ 1 - 1
src/components/Header/index.vue

@@ -129,7 +129,7 @@ $waiPadding: 6.51rem;
 
 
   img {
   img {
     //width: 14.563rem;
     //width: 14.563rem;
-    height: 2rem;
+    height: 3rem;
   }
   }
 
 
   .title {
   .title {

+ 15 - 17
src/components/OptionWindow/index.vue

@@ -24,7 +24,7 @@
               <div @click="getAllArea" class="allBtn" :class="{ 'active': chooseAllState }">{{ chooseAllState ? '重 置' :
               <div @click="getAllArea" class="allBtn" :class="{ 'active': chooseAllState }">{{ chooseAllState ? '重 置' :
                 '全 选' }}</div>
                 '全 选' }}</div>
             </div>
             </div>
-            <div class="standardBox">
+            <!-- <div class="standardBox">
               <div class="content-title content-title2">评分标准</div>
               <div class="content-title content-title2">评分标准</div>
               <div class="standardBoxBtn">
               <div class="standardBoxBtn">
                 <div v-for="(item, index) in standardList" :class="{ 'select': optionForm.standard == item.value }"
                 <div v-for="(item, index) in standardList" :class="{ 'select': optionForm.standard == item.value }"
@@ -32,7 +32,7 @@
                   <div>{{ item.label }}</div>
                   <div>{{ item.label }}</div>
                 </div>
                 </div>
               </div>
               </div>
-            </div>
+            </div> -->
             <div class="switchList">
             <div class="switchList">
               <div class="li">
               <div class="li">
                 <span>举手识别</span>
                 <span>举手识别</span>
@@ -44,13 +44,13 @@
                 <el-switch v-model="optionForm.experience" :active-value="true" :inactive-value="false"
                 <el-switch v-model="optionForm.experience" :active-value="true" :inactive-value="false"
                   style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC" />
                   style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC" />
               </div>
               </div>
-              <div class="li" v-if="['skiprope'].includes(optionForm.project)">
+              <div class="li" v-if="['skiprope'].includes(project.key)">
                 <span>接收心率</span>
                 <span>接收心率</span>
                 <el-switch v-model="optionForm.hasHB" :active-value="true" :inactive-value="false"
                 <el-switch v-model="optionForm.hasHB" :active-value="true" :inactive-value="false"
                   style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC" />
                   style="--el-switch-on-color: #08FFA9; --el-switch-off-color: #ACACAC" />
               </div>
               </div>
             </div>
             </div>
-            <div v-if="['heartbeat'].includes(optionForm.project)">
+            <div v-if="['heartbeat'].includes(project.key)">
               <div>设置运动量目标</div>
               <div>设置运动量目标</div>
               <div>
               <div>
                 平均心率:
                 平均心率:
@@ -68,13 +68,13 @@
               </div>
               </div>
             </div>
             </div>
             <div class="switchList">
             <div class="switchList">
-              <div class="li">
+              <div class="li" v-if="['jumprope', 'jumpingjack', 'situp'].includes(project.key)">
                 <span>时长</span>
                 <span>时长</span>
                 <el-select v-model="optionForm.time" :popper-append-to-body="false" placeholder="请选择">
                 <el-select v-model="optionForm.time" :popper-append-to-body="false" placeholder="请选择">
                   <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value" />
                   <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value" />
                 </el-select>
                 </el-select>
               </div>
               </div>
-              <div class="li">
+              <div class="li" v-if="['jumprope', 'jumpingjack', 'situp'].includes(project.key)">
                 <span>音乐</span>
                 <span>音乐</span>
                 <el-select v-model="optionForm.music" :popper-append-to-body="false" placeholder="请选择" clearable>
                 <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.url" />
                   <el-option v-for="item in musicList" :key="item.id" :label="item.name" :value="item.url" />
@@ -374,7 +374,7 @@ defineExpose({
 
 
         .testAreaChooseRoll {
         .testAreaChooseRoll {
           width: 100%;
           width: 100%;
-          max-height: 17vh;
+          max-height: 30vh;
           overflow-y: scroll;
           overflow-y: scroll;
           display: flex;
           display: flex;
           flex-wrap: wrap;
           flex-wrap: wrap;
@@ -384,29 +384,27 @@ defineExpose({
           margin-bottom: 5px;
           margin-bottom: 5px;
 
 
           .li {
           .li {
-            border: 2px solid #979797;
+            border: 3px solid #979797;
             color: #ffffff;
             color: #ffffff;
-            font-size: 1.2rem;
-            margin: 0 6px 12px 6px;
+            font-size: 1.6rem;
+            margin: 0 8px 16px 8px;
             padding: 5px 8px;
             padding: 5px 8px;
-            min-width: 2.5rem;
+            min-width: 2.6rem;
             border-radius: 4px;
             border-radius: 4px;
             font-weight: bold;
             font-weight: bold;
-            opacity: 0.7;
             text-align: center;
             text-align: center;
             cursor: pointer;
             cursor: pointer;
           }
           }
 
 
           .select {
           .select {
-            border: 2px solid #ffffff;
-            color: #ffffff;
-            opacity: 1;
+            border: 3px solid #ffffff;
+            background: #ffffff;
+            color: #1A293A;
           }
           }
 
 
           .ing {
           .ing {
-            border: 2px solid #ff0000;
+            border: 3px solid #ff0000;
             color: #ff0000;
             color: #ff0000;
-            opacity: 1;
           }
           }
 
 
           &::-webkit-scrollbar {
           &::-webkit-scrollbar {