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

src/components/pages/addCourse.vue

@@ -2100,7 +2100,7 @@
             >
               {{ steps == 4 ? "返回首页" : "上一步" }}
             </button>
-            <button class="info_btn" v-if="steps < 5" @click="nextSteps">
+            <button class="info_btn" v-if="steps < 4" @click="nextSteps">
               {{ steps == 3 ? "确认上传" : "下一步" }}
             </button>
           </div>
@@ -5434,6 +5434,23 @@ export default {
                   ? this.unitJson[j].chapterInfo[i].taskJson[this.taskCount]
                       .toolChoose
                   : [];
+                for (var k in this.unitJson[j].chapterInfo[i].taskJson) {
+                  let _chapterData = [];
+                  for (var c in this.unitJson[j].chapterInfo[i].taskJson[k]
+                    .chapterData) {
+                    if (
+                      this.unitJson[j].chapterInfo[i].taskJson[k].chapterData[c]
+                    ) {
+                      _chapterData.push(
+                        this.unitJson[j].chapterInfo[i].taskJson[k].chapterData[
+                          c
+                        ]
+                      );
+                    }
+                  }
+                  this.unitJson[j].chapterInfo[i].taskJson[k].chapterData =
+                    _chapterData;
+                }
               }
             }
             this.courseName = res.data[0][0].title;

src/components/pages/race/eventCenter.vue

@@ -24,8 +24,15 @@
     <div class="center_btn">
       <el-button
         type="primary"
+        style="background: rgb(112, 135, 228)"
         @click="goTo('/addRace?userid=' + userid + '&oid=' + oid)"
-        >案例设计</el-button
+        >案例设计（必填）</el-button
+      >
+      <el-button
+        type="primary"
+        style="margin-left: 110px; background: rgb(91, 134, 210)"
+        @click="goToX()"
+        >平台实施（选填）</el-button
       >
     </div>
   </div>
@@ -55,6 +62,11 @@ export default {
     goTo(path) {
       this.$router.push(path);
     },
+    goToX() {
+      this.$message("暂未开放");
+      return;
+      window.parent.postMessage({ tools: "46" }, "*");
+    },
   },
 };
 </script>
@@ -84,24 +96,25 @@ export default {
   align-items: center;
   justify-content: center;
   width: 100%;
-  margin: 10px 0;
+  margin: 20px auto 10px;
 }
 
 .center_nav span {
   box-sizing: border-box;
   padding: 8px 5px;
   cursor: pointer;
-  color: #444444;
-  height: 35px;
+  color: #767676;
+  height: 42px;
+  font-size: 18px;
 }
 
 .center_nav span + span {
-  margin-left: 10px;
+  margin-left: 90px;
 }
 
 .center_nav .active {
-  color: #001fff;
-  border-bottom: 2px solid #001fff;
+  color: #191919;
+  border-bottom: 5px solid rgb(96 162 231);
 }
 
 .center_body {
@@ -109,13 +122,18 @@ export default {
   width: 100%;
   justify-content: center;
   margin: 0 auto;
-  height: calc(100% - 360px);
+  height: calc(100% - 372px);
 }
 
 .center_btn {
-  width: 90%;
-  margin: 10px auto 0;
+  width: 100%;
   display: flex;
   justify-content: center;
+  background: #fff;
+  height: 58px;
+  align-items: center;
+  box-shadow: 0 -5px 5px 0px #eeeeee;
+  z-index: 99;
+  position: relative;
 }
 </style>

src/components/pages/race/eventCenter/eventMessage.vue

@@ -163,11 +163,14 @@ export default {
 }
 
 .center_body {
-  width: 70%;
+  /* width: 70%; */
   margin: 0 auto 20px;
   height: 100%;
   overflow: auto;
-  max-width: calc(100% - (200px * 2));
+  width: calc(100% - (200px * 2));
+  box-shadow: inset 0px 14px 7px -14px #b9b9b9;
+  padding-bottom: 20px;
+  box-sizing: border-box;
 }
 .center_box {
   margin-top: 25px;

src/components/pages/race/eventCenter/myAnli.vue

@@ -139,6 +139,7 @@ export default {
   /* height: 500px; */
   overflow: auto;
   height: 100%;
+  /* box-shadow: inset 0px 14px 7px -14px #b9b9b9; */
 }
 .center_content {
   width: 100%;

src/components/pages/race/eventCenter/projectJd.vue

@@ -101,11 +101,15 @@ export default {};
 }
 
 .jd_body {
-  width: 70%;
+  /* width: 70%; */
+  width: calc(100% - 200px);
   margin: 0 auto 20px;
   height: 100%;
   overflow: auto;
   min-width: 600px;
+  /* box-shadow: inset 0px 14px 7px -14px #b9b9b9; */
+  padding-bottom: 10px;
+  box-sizing: border-box;
 }
 
 .jd_title {
@@ -206,12 +210,12 @@ export default {};
   color: rgb(205, 205, 205);
 }
 
-.jd_tr .td .state  .active{
+.jd_tr .td .state .active {
   color: rgb(106, 106, 106);
 }
 
-.jd_tr .td .state  .active::after{
-  content: '';
+.jd_tr .td .state .active::after {
+  content: "";
   background-image: url(../../../../assets/icon/race/right.png);
   width: 25px;
   height: 25px;