Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/CocoRoboDesktop

js/Desktop/DeskTop.js

@@ -25,6 +25,7 @@ U.MD.D.I.teacherDeskIcon = [
     { "Name": "思维导图", "Url": "mind", "style": { "cssText": "background-image:url(/img/icon/mindMapping.png)" } },
     { "Name": "协同文档", "Url": "doc", "style": { "cssText": "background-image:url(/img/icon/doc.png)" } },
     { "Name": "思维网格", "Url": "mindNetwork", "style": { "cssText": "background-image:url(/img/icon/mindNetwork.png)" } },
+    { "Name": "训练服务器", "Url": "train", "style": { "cssText": "background-image:url(/img/icon/trainPlatform.png)" } },
     { "Name": "实时课堂", "Url": "teacherClassRoom", "style": { "cssText": "background-image:url(/img/icon/classRoom.png)" } },
     { "Name": "目标管理", "Url": "sys", "style": { "cssText": "background-image:url(/img/icon/sys.png)" } },
     { "Name": "课程设计", "Url": "courseDesign", "style": { "cssText": "background-image:url(/img/icon/courseDesign.png)" } }
@@ -42,6 +43,7 @@ U.MD.D.I.studentDeskIcon = [
     // { "Name": "量规评分", "Url": "score", "style": { "cssText": "background-image:url(/img/icon/score.png)" } },
     { "Name": "思维导图", "Url": "mind", "style": { "cssText": "background-image:url(/img/icon/mindMapping.png)" } },
     { "Name": "协同文档", "Url": "doc", "style": { "cssText": "background-image:url(/img/icon/doc.png)" } },
+    { "Name": "训练服务器", "Url": "train", "style": { "cssText": "background-image:url(/img/icon/trainPlatform.png)" } },
     { "Name": "思维网格", "Url": "mindNetwork", "style": { "cssText": "background-image:url(/img/icon/mindNetwork.png)" } },
     { "Name": "实时课堂", "Url": "studentClassRoom", "style": { "cssText": "background-image:url(/img/icon/classRoom.png)" } }
 ];
@@ -422,7 +424,7 @@ window.addEventListener('message', function(e) { // 监听 message 事件
         U.UF.F.windowZooming(_formel);
     } else if (e.data.tools && e.data.tools == "1") {
         // U.MD.D.I.openApplication("whiteboard")
-         U.MD.D.I.openApplicationJie("whiteboard", e.data.cid, e.data.stage, e.data.task, e.data.tool)
+        U.MD.D.I.openApplicationJie("whiteboard", e.data.cid, e.data.stage, e.data.task, e.data.tool)
     } else if (e.data.tools && e.data.tools == "2") {
         U.MD.D.I.openApplication("note")
     } else if (e.data.tools && e.data.tools == "3") {
@@ -633,6 +635,19 @@ U.MD.D.I.openApplication = function(str, obj, info) {
                     }, { "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 "train": //好友打开
+
+                _formdiv = new U.UF.UI.form(
+                    "训练服务器",
+                    $$("iframe", { "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "src": "https://edu.cocorobo.cn/tutor/recordeds/1306" }), {
+                        "id": "mindNetwork",
+                        "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/mindNetwork.png)" }, "name": "训练服务器", "forms": _formdiv, "click": function() { U.MD.D.I.openApplication(str, obj, info); } }
+                break;
             case "mindNetwork": //好友打开
                 _formdiv = new U.UF.UI.form(
                     "思维网格",
@@ -796,6 +811,19 @@ U.MD.D.I.openApplication = function(str, obj, info) {
                 })
                 _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/doc.png)" }, "name": "协同文档", "forms": _formdiv, "click": function() { U.MD.D.I.openApplication(str, obj, info); } }
                 break;
+            case "train": //好友打开
+
+                _formdiv = new U.UF.UI.form(
+                    "训练服务器",
+                    $$("iframe", { "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "src": "https://edu.cocorobo.cn/tutor/recordeds/1306" }), {
+                        "id": "mindNetwork",
+                        "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/mindNetwork.png)" }, "name": "训练服务器", "forms": _formdiv, "click": function() { U.MD.D.I.openApplication(str, obj, info); } }
+                break;
             case "studentStudy":
                 _formdiv = new U.UF.UI.form(
                     "学习中心",
@@ -1072,6 +1100,19 @@ U.MD.D.I.openApplication = function(str, obj, info) {
                 _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/mindNetwork.png)" }, "name": "思维网格", "forms": _formdiv, "click": function() { U.MD.D.I.openApplication(str, obj, info); } }
                 break;
 
+            case "train": //好友打开
+
+                _formdiv = new U.UF.UI.form(
+                    "训练服务器",
+                    $$("iframe", { "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "src": "https://edu.cocorobo.cn/tutor/recordeds/1306" }), {
+                        "id": "mindNetwork",
+                        "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/mindNetwork.png)" }, "name": "训练服务器", "forms": _formdiv, "click": function() { U.MD.D.I.openApplication(str, obj, info); } }
+                break;
             case "teacherClassRoom": //好友打开
 
                 _formdiv = new U.UF.UI.form(
@@ -1234,7 +1275,7 @@ U.MD.D.I.openApplication = function(str, obj, info) {
 
                 _formdiv = new U.UF.UI.form(
                     "训练服务器",
-                    $$("iframe", { "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "src": "https://xunlian.cocorobo.cn" }), {
+                    $$("iframe", { "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "src": "https://edu.cocorobo.cn/tutor/recordeds/1306" }), {
                         "id": "mindNetwork",
                         "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                         "onresize": function() {}
@@ -1441,7 +1482,7 @@ U.MD.D.I.openApplication = function(str, obj, info) {
 //#endregion
 
 
-U.MD.D.I.openApplicationJie = function (str,cid,stage,task,tool) {
+U.MD.D.I.openApplicationJie = function(str, cid, stage, task, tool) {
     var _taskbar, //_taskbar 作为任务栏显示的元素，包含图标和名字
         _formdiv, //创建任务栏时同时弹出的窗体元素。
         _userinfo = US.userInfo, //登录用户信息
@@ -1491,9 +1532,9 @@ U.MD.D.I.openApplicationJie = function (str,cid,stage,task,tool) {
                         "height": "90%",
                         "overflow": 'hidden'
                     },
-                    "onresize": function () {}
+                    "onresize": function() {}
                 }, {
-                    closecallback: function () {}
+                    closecallback: function() {}
                 }, {
                     "style": {
                         "height": "36px"
@@ -1506,7 +1547,7 @@ U.MD.D.I.openApplicationJie = function (str,cid,stage,task,tool) {
                 },
                 "name": "电子白板",
                 "forms": _formdiv,
-                "click": function () {
+                "click": function() {
                     U.MD.D.I.openApplication(str, obj, info);
                 }
             }
@@ -1532,9 +1573,9 @@ U.MD.D.I.openApplicationJie = function (str,cid,stage,task,tool) {
                         "height": "90%",
                         "overflow": 'hidden'
                     },
-                    "onresize": function () {}
+                    "onresize": function() {}
                 }, {
-                    closecallback: function () {}
+                    closecallback: function() {}
                 }, {
                     "style": {
                         "height": "36px"
@@ -1547,7 +1588,7 @@ U.MD.D.I.openApplicationJie = function (str,cid,stage,task,tool) {
                 },
                 "name": "思维导图",
                 "forms": _formdiv,
-                "click": function () {
+                "click": function() {
                     U.MD.D.I.openApplication(str, obj, info);
                 }
             }
@@ -1573,16 +1614,16 @@ U.MD.D.I.openApplicationJie = function (str,cid,stage,task,tool) {
                         "height": "90%",
                         "overflow": 'hidden'
                     },
-                    "onresize": function () {}
+                    "onresize": function() {}
                 }, {
-                    closecallback: function () {}
+                    closecallback: function() {}
                 }, {
                     "style": {
                         "height": "36px"
                     }
                 }).form; //创建窗体
 
-            U.UF.DL.iframeLoad($("iframe", _formdiv)[0], function () {
+            U.UF.DL.iframeLoad($("iframe", _formdiv)[0], function() {
                 $("iframe", _formdiv)[0].contentWindow.U.MD.O.W.load();
             })
             _taskbar = {
@@ -1592,7 +1633,7 @@ U.MD.D.I.openApplicationJie = function (str,cid,stage,task,tool) {
                 },
                 "name": "协同文档",
                 "forms": _formdiv,
-                "click": function () {
+                "click": function() {
                     U.MD.D.I.openApplication(str, obj, info);
                 }
             }
@@ -1621,9 +1662,9 @@ U.MD.D.I.openApplicationJie = function (str,cid,stage,task,tool) {
                         "height": "90%",
                         "overflow": 'hidden'
                     },
-                    "onresize": function () {}
+                    "onresize": function() {}
                 }, {
-                    closecallback: function () {}
+                    closecallback: function() {}
                 }, {
                     "style": {
                         "height": "36px"
@@ -1636,7 +1677,7 @@ U.MD.D.I.openApplicationJie = function (str,cid,stage,task,tool) {
                 },
                 "name": "思维网格",
                 "forms": _formdiv,
-                "click": function () {
+                "click": function() {
                     U.MD.D.I.openApplication(str, obj, info);
                 }
             }
@@ -1694,7 +1735,7 @@ U.MD.D.I.openApplicationJie = function (str,cid,stage,task,tool) {
                 "'" +
                 ", " +
                 "'" +
-                tool  +
+                tool +
                 "'" +
                 ")\n" +
                 " });\n" +