Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -1844,6 +1844,7 @@ U.MD.D.I.tianyuanTeacherDeskIcon = [
     { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
     { "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": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
@@ -2035,8 +2036,8 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _x010608TeacherDeskIconInfo = U.MD.D.I.x010608TeacherDeskIcon, //010608
         _x010611StudentDeskIconInfo = U.MD.D.I.x010611StudentDeskIcon, //010611
         _x010611TeacherDeskIconInfo = U.MD.D.I.x010611TeacherDeskIcon, //010611
-        _tianyuantudentDeskIconInfo = U.MD.D.I.tianyuanStudentDeskIcon, //010611
-        _tianyuanTeacherDeskIconInfo = U.MD.D.I.tianyuanTeacherDeskIcon, //010611
+        _tianyuantudentDeskIconInfo = U.MD.D.I.tianyuanStudentDeskIcon, //tianyuan
+        _tianyuanTeacherDeskIconInfo = U.MD.D.I.tianyuanTeacherDeskIcon, //tianyuan
         _xhlyStudentDeskIconInfo = U.MD.D.I.xhlyStudentDeskIcon, //xhly
         _xhlyTeacherDeskIconInfo = U.MD.D.I.xhlyTeacherDeskIcon, //xhly
         _CUHKEDUStudentDeskIconInfo = U.MD.D.I.CUHKEDUStudentDeskIcon, //CUHK_EDU
@@ -2091,6 +2092,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
             { "Name": "知识建构", "Url": "aiKnowledge", "style": { "cssText": "background-image:url(/img/icon/aiKnowledge.png)" } },
             { "Name": "教师管理", "Url": "teacher", "style": { "cssText": "background-image:url(/img/icon/teacher.png)" } },
+            // { "Name": "应用中心", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
         )
     }
 
@@ -7157,7 +7159,19 @@ U.MD.D.I.openApplication = function (str, obj, info) {
                 }, {
                     closecallback: function () { }
                 }, { "style": { "height": "36px" } }).form; //创建窗体
-                _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/pblCourse.png)" }, "name": "课堂观察", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+                _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/pblCourse.png)" }, "name": "学生PBL", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+                break;
+        case "appStore":
+                _formdiv = new U.UF.UI.form(
+                    "应用中心",
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "","frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/appStore?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                    "id": "pblCourse",
+                    "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
+                    "onresize": function () { }
+                }, {
+                    closecallback: function () { }
+                }, { "style": { "height": "36px" } }).form; //创建窗体
+                _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/appStore.png)" }, "name": "应用中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
                 break;
     }