Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -1695,6 +1695,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "观察记录", "Url": "Record", "style": { "cssText": "background-image:url(/img/icon/Record.png)" } },
             { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
             { "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)" } },
         )
     }
 
@@ -1772,6 +1773,13 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         )
     }
 
+    //  Education Artificial Intelligence
+    if(_org == "0f4359aa-1065-423f-afcc-a70cc21ea9d0"){
+        _teacherDesktopIconInfo.push(
+            { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
+        )
+    }
+
     if (_oid == "215340ee-8f22-11ee-b98c-005056b86db5" || _oid == "1bc66f4e-8798-11ee-b98c-005056b86db5") {
         _teacherDesktopIconInfo.push(
             { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
@@ -5800,6 +5808,19 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             }, { "style": { "height": "36px" } }).form; //创建窗体
             _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/aigpt.png)" }, "name": "AI助手+", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
 
+            break;
+        case "aiKnowledge": //aiKnowledge
+            _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": "https://beta.cloud.cocorobo.cn/aigpt/#/knowledge_construction/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                "id": "aiKnowledge",
+                "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
+                "onresize": function () { }
+            }, {
+                closecallback: function () { }
+            }, { "style": { "height": "36px" } }).form; //创建窗体
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/aiKnowledge.png)" }, "name": "知识建构", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
             break;
         case "futureClass": //AI共创
             _formdiv = new U.UF.UI.form(