Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -767,6 +767,7 @@ U.MD.D.I.hkaceteacherDeskIcon = [
     // { "Name": "AI Agent", "Url": "aiagent", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.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)" } },
+    { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
 ];
 
 //hk
@@ -1484,6 +1485,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
             { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
             { "Name": "观察记录", "Url": "Record", "style": { "cssText": "background-image:url(/img/icon/Record.png)" } },
+            { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
         )
     }
     // if (_oid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
@@ -3197,10 +3199,14 @@ window.addEventListener('message', function (e) { // 监听 message 事件
         U.MD.D.I.openInApplication("openCourseUpdate", e.data.cid)
     }else if (e.data.tools && e.data.tools == "openCourseEUpdate") {
         U.MD.D.I.openInApplication("openCourseEUpdate", e.data.cid)
+    }else if (e.data.tools && e.data.tools == "openNewCourseUpdate") {
+        U.MD.D.I.openInApplication("openNewCourseUpdate", e.data.cid)
     }else if (e.data.tools && e.data.tools == "inviteLoginSz") {
         U.MD.D.I.openInApplication("inviteLoginSz", e.data.cid)
     }else if (e.data.tools && e.data.tools == "loginSz") {
         U.MD.D.I.openInApplication("loginSz")
+    }else if (e.data.tools && e.data.tools == "classroom_observation_board"){
+        U.MD.D.I.openInApplication("classroom_observation_board", e.data.type)
     }
     
 
@@ -3441,6 +3447,23 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 }, { "style": { "height": "36px" } }).form; //创建窗体
                 break;
             }
+        case "openNewCourseUpdate":
+                if (!_userinfo || Object.keys(_userinfo).length === 0) {
+                    setTimeout(() => {
+                        U.MD.U.L.login();
+                    }, 2000);
+                } else {
+                    _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/#/newAddCourse?cid=" + data + "&userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                        "id": "openCourseNewUpdate",
+                        "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
+                        "onresize": function () { }
+                    }, {
+                        closecallback: function () { }
+                    }, { "style": { "height": "36px" } }).form; //创建窗体
+                    break;
+                }
         case "openCourseEUpdate":
             if (!_userinfo || Object.keys(_userinfo).length === 0) {
                 setTimeout(() => {
@@ -3548,6 +3571,23 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 }, { "style": { "height": "36px" } }).form; //创建窗体
                 break;
             }
+        case "classroom_observation_board":
+            if (!_userinfo || Object.keys(_userinfo).length === 0) {
+                setTimeout(() => {
+                    U.MD.U.L.login();
+                }, 2000);
+            } else {
+                _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/#/classroom_observation_board?tid="+data }), {
+                    "id": "classroom_observation_board",
+                    "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
+                    "onresize": function () { }
+                }, {
+                    closecallback: function () { }
+                }, { "style": { "height": "36px" } }).form; //创建窗体
+                break;
+            }
     }
 }
 U.MD.D.I.openApplication = function (str, obj, info) {
@@ -5428,8 +5468,20 @@ U.MD.D.I.openApplication = function (str, obj, info) {
                 }, { "style": { "height": "36px" } }).form; //创建窗体
                 _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/aigptCourse.png)" }, "name": "AI智能体", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
                 break;
+        case "classroomObservation":
+            _formdiv = new U.UF.UI.form(
+                "课堂观察",
+                $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/classroomObservation?userid=" + _userid + "&oid=" + _oid + "&org=" + _org }), {
+                "id": "classroomObservation",
+                "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/aigptCourse.png)" }, "name": "课堂观察", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+            break;
     }
-
+    
 
     //U.MD.D.I.openClick(str);
     //如果有任务栏信息

js/Desktop/Onload.js

@@ -466,6 +466,11 @@ U.MD.D.getuser = function () {
                                 }else{
                                     U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
                                 }
+                                let shareCourseId = window.location.href.indexOf("?shareCourseId=")!=-1?window.location.href.split("?shareCourseId=")[1].toString():''
+                                if(shareCourseId){
+                                    console.log(shareCourseId);
+                                    U.MD.D.I.openInApplication("studyDetail", shareCourseId, 5, 1)
+                                }
                                 U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
                             }, [], { "type": "GET", "withCredentials": true });
                         }