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

src/components/courseDetail.vue

@@ -69,9 +69,12 @@
                   }}</span>
                 </div>
                 <div class="Tname" v-if="Tname.length > 0">
-                  协同人员：<span v-for="(tname, tIndex) in Tname" :key="tIndex" style="margin: 0 5px; color: #000">{{
-                    tname
-                  }}</span>
+                  协同人员：<span
+                    v-for="(tname, tIndex) in Tname"
+                    :key="tIndex"
+                    style="margin: 0 5px; color: #000"
+                    >{{ tname }}</span
+                  >
                 </div>
               </div>
               <div class="cType" style="font-size: 18px; color: #6c6c6c">
@@ -171,7 +174,6 @@
                           flex-wrap: nowrap;
                           justify-content: center;
                           align-items: center;
-                          padding: 0 10px;
                         "
                         @click="addUserRate(index)"
                       >
@@ -525,6 +527,9 @@
                               flex-wrap: nowrap;
                               align-items: center;
                             "
+                            v-if="
+                              item2.task[0].tool != undefined && item2.isWork
+                            "
                           >
                             <div
                               style="
@@ -876,6 +881,7 @@ export default {
           var a = res.data[0];
           var b = res.data[1];
           var c = res.data[2];
+          var d = res.data[3];
           for (var i = 0; i < b.length; i++) {
             // if (!this.id) {
             //   this.courseType[b[i].id] = [];
@@ -948,7 +954,14 @@ export default {
               // _chaptersJson.tool[i][z] = [];
               _chaptersJson.tool[i].array[z] = { array: [], name: el[z].task };
               _chaptersJson.chapter[i][z] = [];
-              _chaptersJson.work[i].chapter[z] = { name: el[z].task, task: [] };
+              _chaptersJson.work[i].chapter[z] = {
+                name: el[z].task,
+                task: [],
+                isWork: false,
+              };
+              if (d.length > 0) {
+                _chaptersJson.work[i].chapter[z].isWork = true;
+              }
               _chaptersJson.work[i].is = false;
               let tools = el[z].toolChoose;
               for (var k = 0; k < tools.length; k++) {
@@ -1478,7 +1491,7 @@ export default {
   border-radius: 5px;
   height: 200px;
   overflow: auto;
-  min-width: 150px;
+  max-width: 150px;
 }
 
 .p_tool {
@@ -1636,6 +1649,7 @@ export default {
 
 .chapter {
   margin-right: 30px;
+  min-width: 180px;
 }
 
 .chapter + .chapter {
@@ -1652,16 +1666,17 @@ export default {
   line-height: 50px;
   font-size: 18px;
   text-align: center;
+  min-width: 180px;
 }
 
 .chapter .task {
   display: flex;
   width: 100%;
+  min-width: 180px;
 }
 
 .chapter .task .taskBox {
-  min-width: 110px;
-  max-width: 180px;
+  min-width: 180px;
   height: 100%;
 }
 
@@ -1671,11 +1686,13 @@ export default {
 
 .chapter .task .taskBox .taskName {
   text-align: center;
-  margin: 10px;
+  margin: 10px 0;
   display: flex;
   flex-direction: row;
   flex-wrap: nowrap;
   align-items: center;
+  min-width: 180px;
+  width: 100%;
 }
 
 .toolIcon::before {

src/components/tools/time.vue

@@ -82,6 +82,7 @@ export default {
       isPaused: false,
       isStarted: false,
       displayString: "",
+      isWhole:true,
     };
   },
   methods: {