update

src/components/pages/addCourse.vue

@@ -6876,26 +6876,30 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectAllType", params)
         .then((res) => {
+          if(this.oid == "69893dca-1d47-11ed-8c78-005056b86db5"){
+            res.data[0] = [...res.data[0],...res.data[4]]
+          }
           this.CourseType = res.data;
           this.CourseType2 = [
             { name: "智见课程", id: [] },
             { name: "智行课程", id: [] },
             { name: "智创课程", id: [] },
           ];
-
           for (var cti = 0; cti < res.data[0].length; cti++) {
             if (
               res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" ||
               res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5"
             ) {
-              this.CourseType2[1].id.push(res.data[0][cti].id);
               this.CourseType2[0].id.push(res.data[0][cti].id);
+            }else if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5" ||
+              res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
+              this.CourseType2[1].id.push(res.data[0][cti].id);
             } else if (res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5") {
               this.CourseType2[2].id.push(res.data[0][cti].id);
             }
-            if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5"){
+            if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5"){
               res.data[0][cti].name = "年级";
-            }else if(res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5"){
+            }else if(res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
               res.data[0][cti].name = "学科";
             }else if(res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5"){
               res.data[0][cti].name = "主题";
@@ -9204,7 +9208,7 @@ ol {
 }
 
 .all_choose+.all_choose {
-  margin-top: 10px
+  /* margin-top: 10px */
 }
 
 .all_choose>span {

src/components/pages/course.vue

@@ -709,7 +709,7 @@ export default {
     },
     getCourse2(typeName, ftypeId, typeid, type) {
       this.page = 1;
-      if (typeid == "34628934-d02f-11ec-8c78-005056b86db5" || ftypeId == '34628934-d02f-11ec-8c78-005056b86db5') {
+      if (typeid == "34628934-d02f-11ec-8c78-005056b86db5" || ftypeId == '34628934-d02f-11ec-8c78-005056b86db5' || typeid == "34628934-d02f-11ec-8c78-005056b86ac5" || ftypeId == "34628934-d02f-11ec-8c78-005056b86ac5") {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
             if (this.oid == "69893dca-1d47-11ed-8c78-005056b86db5") {
@@ -790,7 +790,7 @@ export default {
             }
           }
         }
-      } else if (typeid == "34629bcc-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629bcc-d02f-11ec-8c78-005056b86db5') {
+      } else if (typeid == "34629bcc-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629bcc-d02f-11ec-8c78-005056b86db5' ) {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
             if (this.oid == "69893dca-1d47-11ed-8c78-005056b86db5") {
@@ -844,7 +844,7 @@ export default {
             }
           }
         }
-      } else if (typeid == "34629907-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629907-d02f-11ec-8c78-005056b86db5') {
+      } else if (typeid == "34629907-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629907-d02f-11ec-8c78-005056b86db5' || typeid == "34629907-d02f-11ec-8c78-005056b86ac5" || ftypeId == "34629907-d02f-11ec-8c78-005056b86ac5") {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
             if (this.oid == "69893dca-1d47-11ed-8c78-005056b86db5") {
@@ -1006,6 +1006,9 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectAllType", params)
         .then((res) => {
+          if(this.oid == "69893dca-1d47-11ed-8c78-005056b86db5"){
+            res.data[0] = [...res.data[0],...res.data[4]]
+          }
           this.CourseType = res.data;
           this.CourseType2 = [
             { name: "智见课程", id: [] },
@@ -1018,14 +1021,16 @@ export default {
               res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" ||
               res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5"
             ) {
-              this.CourseType2[1].id.push(res.data[0][cti].id);
               this.CourseType2[0].id.push(res.data[0][cti].id);
+            }else if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5" ||
+              res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
+              this.CourseType2[1].id.push(res.data[0][cti].id);
             } else if (res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5") {
               this.CourseType2[2].id.push(res.data[0][cti].id);
             }
-            if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5"){
+            if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5"){
               res.data[0][cti].name = "年级";
-            }else if(res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5"){
+            }else if(res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
               res.data[0][cti].name = "学科";
             }else if(res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5"){
               res.data[0][cti].name = "主题";

src/components/pages/easy/addCourse.vue

@@ -7829,6 +7829,9 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectAllType", params)
         .then((res) => {
+          if(this.oid == "69893dca-1d47-11ed-8c78-005056b86db5"){
+            res.data[0] = [...res.data[0],...res.data[4]]
+          }
           this.CourseType = res.data;
           this.CourseType2 = [
             { name: "智见课程", id: [] },
@@ -7838,17 +7841,19 @@ export default {
 
           for (var cti = 0; cti < res.data[0].length; cti++) {
             if (
-              res.data[0][cti].name == "年级" ||
-              res.data[0][cti].name == "学科"
+              res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" ||
+              res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5"
             ) {
-              this.CourseType2[1].id.push(res.data[0][cti].id);
               this.CourseType2[0].id.push(res.data[0][cti].id);
-            } else if (res.data[0][cti].name == "主题") {
+            }else if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5" ||
+              res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
+              this.CourseType2[1].id.push(res.data[0][cti].id);
+            } else if (res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5") {
               this.CourseType2[2].id.push(res.data[0][cti].id);
             }
-            if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5"){
+            if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5"){
               res.data[0][cti].name = "年级";
-            }else if(res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5"){
+            }else if(res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
               res.data[0][cti].name = "学科";
             }else if(res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5"){
               res.data[0][cti].name = "主题";

src/components/pages/task/addCourse.vue

@@ -10428,6 +10428,9 @@ export default {
       this.ajax
         .get(this.$store.state.api + "selectAllType", params)
         .then((res) => {
+          if(this.oid == "69893dca-1d47-11ed-8c78-005056b86db5"){
+            res.data[0] = [...res.data[0],...res.data[4]]
+          }
           this.CourseType = res.data;
           this.CourseType2 = [
             { name: "智见课程", id: [] },
@@ -10437,17 +10440,19 @@ export default {
 
           for (var cti = 0; cti < res.data[0].length; cti++) {
             if (
-              res.data[0][cti].name == "年级" ||
-              res.data[0][cti].name == "学科"
+              res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" ||
+              res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5"
             ) {
-              this.CourseType2[1].id.push(res.data[0][cti].id);
               this.CourseType2[0].id.push(res.data[0][cti].id);
-            } else if (res.data[0][cti].name == "主题") {
+            }else if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5" ||
+              res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
+              this.CourseType2[1].id.push(res.data[0][cti].id);
+            } else if (res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5") {
               this.CourseType2[2].id.push(res.data[0][cti].id);
             }
-            if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5"){
+            if(res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34628934-d02f-11ec-8c78-005056b86ac5"){
               res.data[0][cti].name = "年级";
-            }else if(res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5"){
+            }else if(res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86db5" || res.data[0][cti].id == "34629907-d02f-11ec-8c78-005056b86ac5"){
               res.data[0][cti].name = "学科";
             }else if(res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5"){
               res.data[0][cti].name = "主题";