Merge branch 'beta' into HK

src/components/pages/addCourse.vue

@@ -6798,12 +6798,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.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 == "34629bcc-d02f-11ec-8c78-005056b86db5") {
               this.CourseType2[2].id.push(res.data[0][cti].id);
             }
           }

src/components/pages/course.vue

@@ -699,7 +699,7 @@ export default {
     },
     getCourse2(typeName, ftypeId, typeid, type) {
       this.page = 1;
-      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") {
@@ -780,7 +780,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") {
@@ -834,7 +834,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") {
@@ -1005,12 +1005,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.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 == "34629bcc-d02f-11ec-8c78-005056b86db5") {
               this.CourseType2[2].id.push(res.data[0][cti].id);
             }
           }

src/components/pages/student/course.vue

@@ -416,11 +416,11 @@ export default {
               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 == "赛道") {
+            } else if (this.CourseType[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86db5") {
               typed = this.courseTypeId[this.CourseType[0][i].id];
             } else if (this.CourseType[0][i].name == "项目类型") {
               typed = this.courseTypeId[this.CourseType[0][i].id];
-            }  else if (this.CourseType[0][i].name == "主题") {
+            }  else if (this.CourseType[0][i].id == "2f8beae3-d030-11ec-8c78-005056b86db5") {
               typef = this.courseTypeId[this.CourseType[0][i].id];
             }
             this.courseTypeSon.push(
@@ -534,7 +534,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 = "项目类型";
               }
             }

src/components/pages/studio/course.vue

@@ -390,11 +390,11 @@ export default {
           if (this.courseTypeId[this.CourseType[0][i].id] == "1") {
             typeE.push(this.CourseType[0][i].id);
           } else if (this.courseTypeId[this.CourseType[0][i].id] != "") {
-            if (this.CourseType[0][i].name == "类型") {
+            if (this.CourseType[0][i].id == "2f8beae3-d030-11ec-8c78-005056b86abc") {
               typea = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "对象") {
+            } else if (this.CourseType[0][i].id == "34629bcc-d02f-11ec-8c78-005056b86abc") {
               typeb = this.courseTypeId[this.CourseType[0][i].id];
-            } else if (this.CourseType[0][i].name == "主题") {
+            } else if (this.CourseType[0][i].id == "34629ce3-d02f-11ec-8c78-005056b86abc") {
               typec = this.courseTypeId[this.CourseType[0][i].id];
             } 
             this.courseTypeSon.push(

src/components/pages/teacherSource/dialog.vue

@@ -164,19 +164,19 @@ export default {
                 }else{
                     if(this.typea == 'b107f98f-1dc4-4ede-80b4-178ba22b6a59'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return ['备课资源','作业资源' ].indexOf(e.name) != -1 
+                            return ['fd7fc4a9-e934-47d5-9edf-f478a59010f0','5143a350-b20f-4a07-9d19-5ad305fefaac' ].indexOf(e.id) != -1 
                         })
                     }else if(this.typea == '3b12e8d9-866f-46bb-aa22-76cb3b7788b3'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return ['语文','科学','英语','历史','化学','信息技术','物理','科学','音乐','通用'].indexOf(e.name) != -1 
+                            return ['fd7fc4a9-e934-47d5-9edf-f478a578789x','fd7fc4a9-e934-47d5-9edf-f478a5789631','1ab97776-71fa-40b1-84c3-5b311d9f6fd9','7c222102-cc32-4613-8f0f-e117ab3f49c0','d8c176a9-9c94-46a0-a824-d2b740323e62','7e79947e-5445-4ed2-935b-e078661a6256','df502b3d-8836-4449-b8c0-09d9d5f9b86d','fd7fc4a9-e934-47d5-9edf-f478a5789631','9fc98487-8e9c-47fa-ae5e-05122f0bf742','1de1bf4d-d4c9-4874-8993-4d3037a10fa1'].indexOf(e.id) != -1 
                         })
                     }else if(this.typea == 'd760341a-5ab7-417f-bfc8-0fd3f183408a'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return  ['优质课例','理论研究'].indexOf(e.name) != -1 
+                            return  ['d8c176a9-9c94-46a0-a824-d2b740323abc','5f9afbf8-9c7b-403a-8629-162c1d6adea4'].indexOf(e.id) != -1 
                         })
                     }else if(this.typea == '926efcf3-da23-4123-aa57-50341bf7d85f'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return  ['图像获取','图像处理','图像生成','视频处理','视频生成'].indexOf(e.name) != -1 
+                            return  ['c3eaac53-3599-43c6-a224-a9e8b1e6eb7a','65196690-f7bc-4fc2-9175-b9ddc7dcba07','1874291f-96e5-4d9f-8747-170f87edb171','3777ef66-96ff-4f08-8e6d-a7b6acc6cb89','56ef86e8-c379-4b35-b752-f9a12e0dd2e7'].indexOf(e.id) != -1 
                         })
                     }else if(this.typeE.indexOf('e4cb3395-5602-4441-801c-f380e8935a74') != -1){
                         return this.CourseTypeJson[tid]
@@ -255,7 +255,7 @@ export default {
         },
         getCourse2(typeName, ftypeId, typeid, type) {
             this.page = 1;
-            if (typeName == "场景") {
+            if (typeid == "e4cb3395-5602-4441-801c-f380e8935a74" || ftypeId == 'e4cb3395-5602-4441-801c-f380e8935a74') {
                 this.typeb = "";
                 if (type == 1) {
                     if (this.typeE.indexOf(typeid) != -1) {
@@ -276,7 +276,7 @@ export default {
                         }
                     }
                 }
-            } else if (typeName == "类型") {
+            } else if (typeid == "37076c23-7053-46eb-b25b-756824806608" || ftypeId == '37076c23-7053-46eb-b25b-756824806608') {
                 if (type == 1) {
                     if (this.typeE.indexOf(typeid) != -1) {
                         this.typeE.splice(this.typeE.indexOf(typeid), 1);

src/components/pages/teacherSource/index.vue

@@ -166,19 +166,19 @@ export default {
                 }else{
                     if(this.typea == 'b107f98f-1dc4-4ede-80b4-178ba22b6a59'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return ['备课资源','作业资源' ].indexOf(e.name) != -1 
+                            return ['fd7fc4a9-e934-47d5-9edf-f478a59010f0','5143a350-b20f-4a07-9d19-5ad305fefaac' ].indexOf(e.id) != -1 
                         })
                     }else if(this.typea == '3b12e8d9-866f-46bb-aa22-76cb3b7788b3'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return ['语文','科学','英语','历史','化学','信息技术','物理','科学','音乐','通用'].indexOf(e.name) != -1 
+                            return ['fd7fc4a9-e934-47d5-9edf-f478a578789x','fd7fc4a9-e934-47d5-9edf-f478a5789631','1ab97776-71fa-40b1-84c3-5b311d9f6fd9','7c222102-cc32-4613-8f0f-e117ab3f49c0','d8c176a9-9c94-46a0-a824-d2b740323e62','7e79947e-5445-4ed2-935b-e078661a6256','df502b3d-8836-4449-b8c0-09d9d5f9b86d','fd7fc4a9-e934-47d5-9edf-f478a5789631','9fc98487-8e9c-47fa-ae5e-05122f0bf742','1de1bf4d-d4c9-4874-8993-4d3037a10fa1'].indexOf(e.id) != -1 
                         })
                     }else if(this.typea == 'd760341a-5ab7-417f-bfc8-0fd3f183408a'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return  ['优质课例','理论研究'].indexOf(e.name) != -1 
+                            return  ['d8c176a9-9c94-46a0-a824-d2b740323abc','5f9afbf8-9c7b-403a-8629-162c1d6adea4'].indexOf(e.id) != -1 
                         })
                     }else if(this.typea == '926efcf3-da23-4123-aa57-50341bf7d85f'){
                         return this.CourseTypeJson[tid].filter(e => {
-                            return  ['图像获取','图像处理','图像生成','视频处理','视频生成'].indexOf(e.name) != -1 
+                            return  ['c3eaac53-3599-43c6-a224-a9e8b1e6eb7a','65196690-f7bc-4fc2-9175-b9ddc7dcba07','1874291f-96e5-4d9f-8747-170f87edb171','3777ef66-96ff-4f08-8e6d-a7b6acc6cb89','56ef86e8-c379-4b35-b752-f9a12e0dd2e7'].indexOf(e.id) != -1 
                         })
                     }else if(this.typeE.indexOf('e4cb3395-5602-4441-801c-f380e8935a74') != -1){
                         return this.CourseTypeJson[tid]
@@ -247,7 +247,7 @@ export default {
         },
         getCourse2(typeName, ftypeId, typeid, type) {
             this.page = 1;
-            if (typeName == "场景") {
+            if (typeid == "e4cb3395-5602-4441-801c-f380e8935a74" || ftypeId == 'e4cb3395-5602-4441-801c-f380e8935a74') {
                 this.typeb = "";
                 if (type == 1) {
                     if (this.typeE.indexOf(typeid) != -1) {
@@ -268,7 +268,7 @@ export default {
                         }
                     }
                 }
-            } else if (typeName == "类型") {
+            } else if (typeid == "37076c23-7053-46eb-b25b-756824806608" || ftypeId == '37076c23-7053-46eb-b25b-756824806608') {
                 if (type == 1) {
                     if (this.typeE.indexOf(typeid) != -1) {
                         this.typeE.splice(this.typeE.indexOf(typeid), 1);