lsc 2 years ago
parent
commit
edd105772e
3 changed files with 13 additions and 13 deletions
  1. 6 6
      src/components/index.vue
  2. 4 4
      src/components/studentIndex.vue
  3. 3 3
      src/components/studio/index.vue

+ 6 - 6
src/components/index.vue

@@ -300,7 +300,7 @@ export default {
     getCourse(typeName, ftypeId, typeid, type) {
       this.page = 1;
       this.zoneClass = [];
-      if (typeName == "年级") {
+      if (typeid == "34628934-d02f-11ec-8c78-005056b86db5" || ftypeId == '34628934-d02f-11ec-8c78-005056b86db5') {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
              if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
@@ -381,7 +381,7 @@ export default {
             }
           }
         }
-      } else if (typeName == "主题") {
+      } 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'){
@@ -435,7 +435,7 @@ export default {
             }
           }
         }
-      } else if (typeName == "学科") {
+      } else if (typeid == "34629907-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629907-d02f-11ec-8c78-005056b86db5') {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
              if(this.oid == '69893dca-1d47-11ed-8c78-005056b86db5'){
@@ -711,12 +711,12 @@ 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.CourseType3[1].id.push(res.data[0][cti].id);
               this.CourseType3[0].id.push(res.data[0][cti].id);
-            } else if (res.data[0][cti].name == "主题") {
+            } else if (res.data[0][cti].id == "34629bcc-d02f-11ec-8c78-005056b86db5") {
               this.CourseType3[2].id.push(res.data[0][cti].id);
             }
           }

+ 4 - 4
src/components/studentIndex.vue

@@ -377,7 +377,7 @@ export default {
             }
           }
         }
-      } else if (typeName == "主题") {
+      } else if (typeid == "2f8beae3-d030-11ec-8c78-005056b86db5" || ftypeId == '2f8beae3-d030-11ec-8c78-005056b86db5') {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
             this.typeE.splice(this.typeE.indexOf(typeid), 1);
@@ -397,7 +397,7 @@ export default {
             }
           }
         }
-      } else if (typeName == "赛道") {
+      } else if (typeid == "34629ce3-d02f-11ec-8c78-005056b86db5" || ftypeId == '34629ce3-d02f-11ec-8c78-005056b86db5') {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
             this.typeE.splice(this.typeE.indexOf(typeid), 1);
@@ -417,7 +417,7 @@ export default {
             }
           }
         }
-      } else if (typeName == "项目类型") {
+      } else if (typeid == "34629ce3-d02f-11ec-8c78-005056b86db5"  || ftypeId == '34629ce3-d02f-11ec-8c78-005056b86db5') {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
             this.typeE.splice(this.typeE.indexOf(typeid), 1);
@@ -702,7 +702,7 @@ export default {
               this.CourseTypeJson[res.data[0][i].id] = [];
             }
             if (this.oid == "1c3b9def-8fbe-11ed-b13d-005056b86db5") {
-              if (res.data[0][i].name == "赛道") {
+              if (res.data[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86db5") {
                 this.CourseType[0][i].name = "项目类型";
               }
             }

+ 3 - 3
src/components/studio/index.vue

@@ -267,7 +267,7 @@ export default {
     getCourse(typeName, ftypeId, typeid, type) {
       this.page = 1;
       this.zoneClass = [];
-      if (typeName == "类型") {
+      if (typeid == "2f8beae3-d030-11ec-8c78-005056b86abc" || ftypeId == '2f8beae3-d030-11ec-8c78-005056b86abc') {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
             this.typeE.splice(this.typeE.indexOf(typeid), 1);
@@ -287,7 +287,7 @@ export default {
             }
           }
         }
-      } else if (typeName == "对象") {
+      } else if (typeid == "34629bcc-d02f-11ec-8c78-005056b86abc" || ftypeId == '34629bcc-d02f-11ec-8c78-005056b86abc') {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
             this.typeE.splice(this.typeE.indexOf(typeid), 1);
@@ -307,7 +307,7 @@ export default {
             }
           }
         }
-      } else if (typeName == "主题") {
+      } else if (typeid == "34629ce3-d02f-11ec-8c78-005056b86abc" || ftypeId == '34629ce3-d02f-11ec-8c78-005056b86abc') {
         if (type == 1) {
           if (this.typeE.indexOf(typeid) != -1) {
             this.typeE.splice(this.typeE.indexOf(typeid), 1);