Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/pbl-student-table

src/components/study.vue

@@ -16,8 +16,15 @@
                 @click="openTask(stageIndex, navIndex, nav.id)"
                 :class="{ openTaskActive: nav.id == navId }"
               >
-                <div class="vedioNav" style="margin: 0">任务{{ navIndex + 1 }}</div>
-                <div class="navTaskname">{{ nav.taskName }}</div>
+                <div
+                  class="vedioNav"
+                  style="margin: 0; background: #aee3d2; color: #32a77a"
+                >
+                  任务{{ navIndex + 1 }}
+                </div>
+                <div class="navTaskname">
+                  {{ nav.taskName }}
+                </div>
               </div>
             </div>
           </div>
@@ -326,6 +333,7 @@
                 <div
                   class="filebox"
                   style="flex-wrap: nowrap; margin: 20px 0 10px 20px"
+                  :class="tool.toolDetail != '' ? 'isWidth' : ''"
                   v-for="(tool, toolIndex) in task.toolChoose"
                   :key="toolIndex"
                 >
@@ -436,12 +444,11 @@
                       </div>
                     </div>
                   </div>
-                  <div
-                    style="padding: 0 0 20px 30px; width: 30%"
-                    v-if="tool.toolDetail != ''"
-                  >
+                  <div style="padding: 0 0 20px 10px" v-if="tool.toolDetail != ''">
                     <div style="margin: 0 0 20px 0">工具描述</div>
-                    <div>{{ tool.toolDetail != "" ? tool.toolDetail : "暂无描述" }}</div>
+                    <div style="height: 50px; overflow: auto">
+                      {{ tool.toolDetail != "" ? tool.toolDetail : "暂无描述" }}
+                    </div>
                   </div>
                 </div>
               </div>
@@ -2043,7 +2050,7 @@ export default {
   flex-wrap: wrap;
   flex-direction: row;
   justify-content: flex-start;
-  align-items: center;
+  align-items: flex-start;
   padding: 15px 0;
 }
 
@@ -2619,6 +2626,9 @@ export default {
 .toolHeng > div {
   padding-left: 20px;
 }
+.isWidth {
+  width: 20%;
+}
 .textTitle >>> .el-form-item__label {
   font-size: 20px;
 }
@@ -2690,20 +2700,25 @@ export default {
 .twoChild {
   width: 95%;
   margin: 10px;
-  border-radius: 11px;
+  border-radius: 5px;
   background: #f2f2f2;
   display: flex;
   flex-direction: column;
   flex-wrap: nowrap;
-  justify-content: center;
+  justify-content: flex-start;
   align-items: flex-start;
   transition: all 0.5s;
   overflow: hidden;
   max-height: 0;
+  height: 140px;
+}
+.twoChild > div:nth-child(1) {
+  margin-top: 5px;
 }
 .navChild {
   width: 100%;
   cursor: pointer;
+  margin-bottom: 10px;
 }
 
 .navActive {