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

src/components/pages/addCourse.vue

@@ -7928,27 +7928,16 @@ ol {
   color: #6c6c6c;
 }
 
-.progressBox .lbox {
-  height: 100px;
-  font-size: 16px;
-  display: flex;
-  align-items: center;
-}
-
-.progressBox .lbox img {
-  width: 40px;
-  margin-right: 20px;
-}
-
 .progressBox>>>.el-progress-bar__outer {
   background-color: #d1dfff !important;
 }
 
 .progressBox .lbox {
-  height: 100px;
+  height: 60px;
   font-size: 19px;
   display: flex;
   align-items: center;
+  color: #747474;
 }
 
 .progressBox .lbox img {
@@ -7956,6 +7945,19 @@ ol {
   margin-right: 20px;
 }
 
+.closeCss {
+  position: absolute;
+  top: 8px;
+  right: 8px;
+  cursor: pointer;
+  width: 20px;
+  height: 20px;
+}
+.closeCss > img {
+  width: 100%;
+  height: 100%;
+}
+
 .updateTips::after {
   content: "协同编辑课程暂不支持修改基本信息，只支持修改阶段内容。";
   font-size: 14px;

src/components/pages/course.vue

@@ -454,6 +454,8 @@ export default {
               typeb = this.courseTypeId[this.CourseType[0][i].id];
             } else if (this.CourseType[0][i].name == "学院") {
               typeb = this.courseTypeId[this.CourseType[0][i].id];
+            } else if (this.CourseType[0][i].name == "主题") {
+              typeb = this.courseTypeId[this.CourseType[0][i].id];
             } else if (this.CourseType[0][i].name == "新技能") {
               typec = this.courseTypeId[this.CourseType[0][i].id];
             } else if (this.CourseType[0][i].name == "学科") {