Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -664,7 +664,7 @@ U.MD.D.I.siesteacherDeskIcon = [
     { "Name": "数据融合", "Url": "dataBoardSies", "style": { "cssText": "background-image:url(/img/icon/dataBoardSies.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
     { "Name": "评测看板", "Url": "dataBoardTest", "style": { "cssText": "background-image:url(/img/icon/databoardTest.png)" } },
-    // { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
+    { "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": "testTeacherSies", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
     { "Name": "教师中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
@@ -677,6 +677,7 @@ U.MD.D.I.siesStudentDeskIcon = [
     { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     { "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)" } },
 ];
 
 //福田
@@ -5764,7 +5765,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
         case "pblCourse":
                 _formdiv = new U.UF.UI.form(
                     "学生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 }), {
+                    $$("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/#/guide?userid=" + _userid + "&oid=" + _oid + "&org=" + _org }), {
                     "id": "pblCourse",
                     "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                     "onresize": function () { }