Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -388,7 +388,7 @@ U.MD.D.I.szscOrganizerDeskIcon = [
     { "Name": "项目管理", "Url": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
     // { "Name": "学校管理", "Url": "tcSchool", "style": { "cssText": "background-image:url(/img/icon/school.png)" } },
-    { "Name": "教师管理", "Url": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+    { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
     { "Name": "我的资料", "Url": "tcData", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
     { "Name": "消息通知", "Url": "tcNotice", "style": { "cssText": "background-image:url(/img/icon/news.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
@@ -1010,7 +1010,7 @@ U.MD.D.I.szjkyAdminDeskIcon = [
     // { "Name": "工作管理", "Url": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
     // { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.png)" } },
     { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
-    { "Name": "教师管理", "Url": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+    { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
     { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
     { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
     // { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
@@ -1732,7 +1732,7 @@ U.MD.D.I.SCNUETAdminDeskIcon = [
     // { "Name": "工作管理", "Url": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
     // { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.png)" } },
     { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
-    { "Name": "教师管理", "Url": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+    { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
     { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
     { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
     // { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
@@ -2030,7 +2030,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
     }
 
     //010606 组织
-    if (_oid == 'f297fbdc-f0a0-11ee-b534-005056b86db5') {
+    if (_oid == 'f297fbdc-f0a0-11ee-b534-005056b86db5' || _oid == '4eb38bbd-90ee-11ef-9b30-005056b86db5') {
         _teacherDesktopIconInfo.push(
             { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
         )
@@ -2054,7 +2054,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
 
     if(_org == 'b50cf65a-001c-11ee-91d8-005056b86db5' && _role == '1'){
         _hkTeacherDeskIconInfo.push(
-            { "Name": "教师管理", "Url": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+            { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
         )
     }