Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -1357,6 +1357,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "评测管理", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
             { "Name": "评测中心", "Url": "testStudent", "style": { "cssText": "background-image:url(/img/icon/testStudent.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)" } },
         )
     }
     // if (_oid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
@@ -2730,6 +2731,8 @@ window.addEventListener('message', function (e) { // 监听 message 事件
         //3是展示全部阶段  2学生 1老师 4专家
     } else if (e.data.screenType && e.data.screenType == "3") { //课程管理传入
         U.MD.D.I.openInApplication("studyDetail", e.data.cid, 2, 1)
+    } else if (e.data.screenType && e.data.screenType == "3train") { //培训管理传入
+        U.MD.D.I.openInApplication("studyDetailTrain", e.data.cid, 2, 1)
     } else if (e.data.screenType && e.data.screenType == "3NT") { //课程管理传入
         U.MD.D.I.openInApplication("studyDetailNT", e.data.cid, 2, 1)
     } else if (e.data.screenType && e.data.screenType == "3s") { //课程管理传入
@@ -3001,6 +3004,24 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/study.png)" }, "name": "课程中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
                 break;
             }
+        case "studyDetailTrain":
+                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-student-table/dist/#/courseDetailTrain?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
+                        "id": "studyDetailTrain",
+                        "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/study.png)" }, "name": "课程中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+                    break;
+                }
         case "studyDetailS":
             if (!_userinfo || Object.keys(_userinfo).length === 0) {
                 setTimeout(() => {
@@ -4740,7 +4761,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
         case "gpt4": //gpt4
             _formdiv = new U.UF.UI.form(
                 "AI助手",
-                $$("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://cloud.cocorobo.cn/gpt4/" }), {
+                $$("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://cloud.cocorobo.cn/gpt4/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
                 "id": "ainew",
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                 "onresize": function () { }
@@ -4749,6 +4770,19 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             }, { "style": { "height": "36px" } }).form; //创建窗体
             _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/gpt4.png)" }, "name": "AI助手", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
 
+            break;
+        case "aigpt": //gpt4
+            _formdiv = new U.UF.UI.form(
+                "AI助手+",
+                $$("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://cloud.cocorobo.cn/aigpt/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                "id": "ainew",
+                "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/aigpt.png)" }, "name": "AI助手+", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
             break;
         case "futureClass": //AI共创
             _formdiv = new U.UF.UI.form(