Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -768,6 +768,7 @@ U.MD.D.I.hkaceteacherDeskIcon = [
     { "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)" } },
+    { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
 ];
 
 //hk
@@ -1004,7 +1005,7 @@ U.MD.D.I.szjkyTeacherDeskIcon = [
     // { "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": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
-    { "Name": "学生pbl", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+    { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
 ];
 
 //未来教育基地
@@ -1031,7 +1032,7 @@ U.MD.D.I.szjkyAdminDeskIcon = [
     // { "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": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
-    { "Name": "学生pbl", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+    { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
 ];
 
 //未来教育基地
@@ -1490,7 +1491,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "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)" } },
-            { "Name": "学生pbl", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
+            { "Name": "学生PBL", "Url": "pblCourse", "style": { "cssText": "background-image:url(/img/icon/pblCourse.png)" } },
         )
     }
 
@@ -5498,7 +5499,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             break;
         case "pblCourse":
                 _formdiv = new U.UF.UI.form(
-                    "学生pbl",
+                    "学生PBL",
                     $$("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/#/pblCourse?userid=" + _userid + "&oid=" + _oid + "&org=" + _org }), {
                     "id": "pblCourse",
                     "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
@@ -6967,7 +6968,11 @@ U.MD.D.I.openApplicationJieTeacher = function (str, cid, stage, task, tool, stud
                 U.MD.D.I.getContent(cid, stage, task, tool, _userid, '3', _iframe)
             };
             if (onloadListener) {
-                _iframe.contentDocument.location.reload()
+                try {
+                    _iframe.src += ""
+                    _iframe.contentWindow.document.location.reload()
+                } catch (error) {
+                }
             } else {
                 _iframe.contentDocument.location.reload()
             }