update

js/Desktop/DeskTop.js

@@ -200,6 +200,44 @@ U.MD.D.I.GMstudentDeskIcon = [
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
 ];
 
+//北师大
+U.MD.D.I.BSDNSteacherDeskIcon = [
+    { "Name": "项目管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/project.png)" } },
+    { "Name": "学习中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
+    { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
+    { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
+    { "Name": "我的资料", "Url": "my", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
+    { "Name": "通知公告", "Url": "notice", "style": { "cssText": "background-image:url(/img/icon/news.png)" } },
+    { "Name": "素材库", "Url": "library", "style": { "cssText": "background-image:url(/img/icon/library.png)" } },
+    { "Name": "电子白板", "Url": "whiteboard", "style": { "cssText": "background-image:url(/img/icon/whiteBoard.png)" } },
+    { "Name": "问卷调查", "Url": "investigation", "style": { "cssText": "background-image:url(/img/icon/ask.png)" } },
+    { "Name": "便签分类", "Url": "note", "style": { "cssText": "background-image:url(/img/icon/note.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": "mindNetwork", "style": { "cssText": "background-image:url(/img/icon/mindNetwork.png)" } },
+    { "Name": "实时课堂", "Url": "teacherClassRoom", "style": { "cssText": "background-image:url(/img/icon/classRoom.png)" } },
+    { "Name": "目标管理", "Url": "sys", "style": { "cssText": "background-image:url(/img/icon/evalua.png)" } },
+    { "Name": "课程设计", "Url": "courseDesign", "style": { "cssText": "background-image:url(/img/icon/courseDesign.png)" } },
+    { "Name": "训练平台", "Url": "train", "style": { "cssText": "background-image:url(/img/icon/trainPlatform.png)" } },
+    { "Name": "编程平台", "Url": "program", "style": { "cssText": "background-image:url(/img/icon/program.png)" } },
+    { "Name": "AI体验", "Url": "AIprogram2", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.png)" } },
+    { "Name": "Python", "Url": "Pythonprogram", "style": { "cssText": "background-image:url(/img/icon/Pythonprogram.png)" } },
+    { "Name": "AI编程", "Url": "AIprogram", "style": { "cssText": "background-image:url(/img/icon/AIprogram.png)" } },
+    { "Name": "源码编辑", "Url": "codeEdit", "style": { "cssText": "background-image:url(/img/icon/code.png)" } },
+    { "Name": "MindMap", "Url": "MindMap", "style": { "cssText": "background-image:url(/img/icon/MIndMap.png)" } },
+    { "Name": "翻译", "Url": "translation", "style": { "cssText": "background-image:url(/img/icon/translation.png)" } },
+    // { "Name": " 魔盒识字", "Url": "mohe", "style": { "cssText": "background-image:url(/img/icon/mohe.png)" } },
+    // { "Name": "24点", "Url": "24game", "style": { "cssText": "background-image:url(/img/icon/24game.png)" } },
+    { "Name": "数学画板", "Url": "netWorkPanel", "style": { "cssText": "background-image:url(/img/icon/networkPanel.png)" } },
+    { "Name": "GeoGebra", "Url": "GeoGebra", "style": { "cssText": "background-image:url(/img/icon/GeoGebra.png)" } },
+    { "Name": "项目进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
+    { "Name": "赛诺梵", "Url": "snf", "style": { "cssText": "background-image:url(/img/icon/snf.png)" } },
+    { "Name": "汉字宫", "Url": "han", "style": { "cssText": "background-image:url(/img/icon/han.png)" } },
+    { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+    { "Name": "数字实验室", "Url": "number", "style": { "cssText": "background-image:url(/img/icon/number.png)" } },
+];
+
 //#region 桌面初始化a
 
 /**
@@ -272,6 +310,7 @@ U.MD.D.I.initDesktopIcons = function(el) {
         _orgStemDeskIcon = U.MD.D.I.orgStemDeskIcon,
         _hanDeskIcon = U.MD.D.I.hanDeskIcon,
         _schoolDesktopIconInfo = U.MD.D.I.schoolDeskIcon, //获取测试学校桌面图标
+        _BSDNSteacherDesktopIconInfo = U.MD.D.I.BSDNSteacherDeskIcon,//获取北师大
         _GMteacherDesktopIconInfo = U.MD.D.I.GMteacherDeskIcon, //获取光明学校桌面图标
         _GMstudentDesktopIconInfo = U.MD.D.I.GMstudentDeskIcon; //获取光明学校桌面图标
     var _oidA = ['69893dca-1d47-11ed-8c78-005056b86db5',"91305d49-01ba-11ed-8c78-005056b86db5","d9db3320-503a-11ed-8c78-005056b86db5"];
@@ -313,7 +352,7 @@ U.MD.D.I.initDesktopIcons = function(el) {
             $$("div", { className: "U_MD_D_KOS U_Img", "style": _studentDesktopIconInfo2[i].style }, _iconcontent);
             $$("div", { className: "U_MD_D_KOX", "innerHTML": _studentDesktopIconInfo2[i].Name }, _iconcontent);
         }
-    }else if ((_type == 1 || _type == 4) && _oid == "69893dca-1d47-11ed-8c78-005056b86db5") {
+    } else if ((_type == 1 || _type == 4) && _oid == "69893dca-1d47-11ed-8c78-005056b86db5") {
         for (i = 0; i < _teacherDesktopIconInfo2.length; i++) {
             _content = $$("div", {
                 className: "U_MD_D_KO",
@@ -467,6 +506,24 @@ U.MD.D.I.initDesktopIcons = function(el) {
             $$("div", { className: "U_MD_D_KOX", "innerHTML": _teacherDesktopIconInfo[i].Name }, _iconcontent);
         }
     }
+    // else if ((_type == 1 || _type == 4) && _oid == "857af1c7-c8ee-4b04-85b5-fd182903adb7") {
+    //     for (i = 0; i < _BSDNSteacherDesktopIconInfo.length; i++) {
+    //         _content = $$("div", {
+    //             className: "U_MD_D_KO",
+    //             "onmousedown": U.UF.C.closure(function(obj) {
+    //                 //防止拖动图标即打开了桌面应用
+    //                 U.MD.D.click(this, obj);
+    //             }, [_BSDNSteacherDesktopIconInfo[i]]),
+    //             "onclick": U.UF.C.closure(function(obj) {
+    //                 //防止拖动图标即打开了桌面应用
+    //                 U.MD.D.click(this, obj);
+    //             }, [_BSDNSteacherDesktopIconInfo[i]])
+    //         }, _frag); // 
+    //         _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+    //         $$("div", { className: "U_MD_D_KOS U_Img", "style": _BSDNSteacherDesktopIconInfo[i].style }, _iconcontent);
+    //         $$("div", { className: "U_MD_D_KOX", "innerHTML": _BSDNSteacherDesktopIconInfo[i].Name }, _iconcontent);
+    //     }
+    // }
 
     //加载好后给图标定位
     U.MD.D.iconPostion($(_frag).Child());
@@ -1844,7 +1901,7 @@ U.MD.D.I.openApplication = function(str, obj, info) {
         case "GeoGebra": //GeoGebra
             _formdiv = new U.UF.UI.form(
                 "GeoGebra",
-                $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//www.geogebra.org/calculator" }), {
+                $$("iframe", { "allow": "camera *; microphone *", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "","frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//www.geogebra.org/calculator" }), {
                     "id": "GeoGebra",
                     "style": { "width": "80%", "height": "90%", "overflow": 'hidden' },
                     "onresize": function() {}
@@ -2107,6 +2164,19 @@ U.MD.D.I.openApplication = function(str, obj, info) {
                 _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/jupyter.png)" }, "name": "jupyter", "forms": _formdiv, "click": function() { U.MD.D.I.openApplication(str, obj, info); } }
 
                 break;    
+            case "number": //数字实验室
+                _formdiv = new U.UF.UI.form(
+                    "数字实验室",
+                    $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://cocorobo.cn/cloud/iot/events" }), {
+                        "id": "number",
+                        "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/number.png)" }, "name": "数字实验室", "forms": _formdiv, "click": function() { U.MD.D.I.openApplication(str, obj, info); } }
+
+                break;  
     }
 
 
@@ -2314,7 +2384,7 @@ U.MD.D.I.openApplicationJie = function(str, cid, stage, task, tool) {
     let _lspan = document.createElement('span')
     _lspan.innerHTML = "上传中..."
     _lchild.appendChild(_lspan)
-    _lchild.style = "color: #fff;padding: 15px;background: #00000070;border-radius: 5px;font-size: 18px;display:flex;align-items:center;"
+    _lchild.style = "color: #fff;padding: 15px;background: #00000000;border-radius: 5px;font-size: 18px;display:flex;align-items:center;"
     _loading.appendChild(_lchild)
 
     var _box = $$('div', {

js/gm/DeskTop.js

@@ -2244,12 +2244,16 @@ 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, //登录用户信息
         _userid = US.userInfo.userid //登录用户id
     let _iframe;
+    let _cid = cid,
+    _stage = stage,
+    _task = task,
+    _tool = tool;
     var _jie = $$("div", {
         "style": {
             "position": "absolute",
@@ -2264,10 +2268,10 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
         },
         "innerHTML": "提交作业"
     })
-
+    let aTool = ''
     let _loading = document.createElement('div')
     _loading.style = "width:100%;height:100%;background:#0000008f;position:absolute;top:0;left:0;z-index:99999999999999;display: none;justify-content: center;align-items: center;"
-    //  _loading.id = "";
+        //  _loading.id = "";
     let _lchild = document.createElement('div')
     let _limg = document.createElement('img')
     _limg.src = 'https://pbl.cocorobo.cn/pbl-student-table/dist/js/loading.gif'
@@ -2276,7 +2280,7 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
     let _lspan = document.createElement('span')
     _lspan.innerHTML = "上传中..."
     _lchild.appendChild(_lspan)
-    _lchild.style = "color: #fff;padding: 15px;background: #00000070;border-radius: 5px;font-size: 18px;display:flex;align-items:center;"
+    _lchild.style = "color: #fff;padding: 15px;background: #00000000;border-radius: 5px;font-size: 18px;display:flex;align-items:center;"
     _loading.appendChild(_lchild)
 
     var _box = $$('div', {
@@ -2290,6 +2294,7 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
     _box.id = str + '_loadLi'
     switch (str) {
         case "whiteboard":
+            aTool = 1;
             _iframe = $$("iframe", {
                 "frameborder": "no",
                 "border": "0",
@@ -2304,20 +2309,20 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
             _formdiv = new U.UF.UI.form(
                 "电子白板",
                 _box, {
-                "id": "whiteboard",
-                "style": {
-                    "width": "90%",
-                    "height": "90%",
-                    "overflow": 'hidden'
-                },
-                "onresize": function () { }
-            }, {
-                closecallback: function () { }
-            }, {
-                "style": {
-                    "height": "36px"
-                }
-            }).form; //创建窗体
+                    "id": "whiteboard",
+                    "style": {
+                        "width": "90%",
+                        "height": "90%",
+                        "overflow": 'hidden'
+                    },
+                    "onresize": function() {}
+                }, {
+                    closecallback: function() {}
+                }, {
+                    "style": {
+                        "height": "36px"
+                    }
+                }).form; //创建窗体
             _taskbar = {
                 "id": str + _formdiv.id,
                 "style": {
@@ -2325,12 +2330,13 @@ 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);
                 }
             }
             break;
         case "mind":
+            aTool = 3;
             _iframe = $$("iframe", {
                 "frameborder": "no",
                 "border": "0",
@@ -2345,20 +2351,20 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
             _formdiv = new U.UF.UI.form(
                 "思维导图",
                 _box, { //"/jsmind/example/demo.html" 
-                "id": "mind",
-                "style": {
-                    "width": "90%",
-                    "height": "90%",
-                    "overflow": 'hidden'
-                },
-                "onresize": function () { }
-            }, {
-                closecallback: function () { }
-            }, {
-                "style": {
-                    "height": "36px"
-                }
-            }).form; //创建窗体
+                    "id": "mind",
+                    "style": {
+                        "width": "90%",
+                        "height": "90%",
+                        "overflow": 'hidden'
+                    },
+                    "onresize": function() {}
+                }, {
+                    closecallback: function() {}
+                }, {
+                    "style": {
+                        "height": "36px"
+                    }
+                }).form; //创建窗体
             _taskbar = {
                 "id": str + _formdiv.id,
                 "style": {
@@ -2366,12 +2372,13 @@ 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);
                 }
             }
             break;
         case "MindMap":
+            aTool = 3;
             _iframe = $$("iframe", {
                 "frameborder": "no",
                 "border": "0",
@@ -2386,20 +2393,20 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
             _formdiv = new U.UF.UI.form(
                 "思维导图",
                 _box, { //"/jsmind/example/demo.html" 
-                "id": "mind",
-                "style": {
-                    "width": "90%",
-                    "height": "90%",
-                    "overflow": 'hidden'
-                },
-                "onresize": function () { }
-            }, {
-                closecallback: function () { }
-            }, {
-                "style": {
-                    "height": "36px"
-                }
-            }).form; //创建窗体
+                    "id": "mind",
+                    "style": {
+                        "width": "90%",
+                        "height": "90%",
+                        "overflow": 'hidden'
+                    },
+                    "onresize": function() {}
+                }, {
+                    closecallback: function() {}
+                }, {
+                    "style": {
+                        "height": "36px"
+                    }
+                }).form; //创建窗体
             _taskbar = {
                 "id": str + _formdiv.id,
                 "style": {
@@ -2407,12 +2414,13 @@ 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);
                 }
             }
             break;
         case "doc":
+            aTool = 6;
             _iframe = $$("iframe", {
                 "frameborder": "no",
                 "border": "0",
@@ -2427,22 +2435,22 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
             _formdiv = new U.UF.UI.form(
                 "协同文档",
                 _box, {
-                "id": "doc",
-                "style": {
-                    "width": "90%",
-                    "height": "90%",
-                    "overflow": 'hidden'
-                },
-                "onresize": function () { }
-            }, {
-                closecallback: function () { }
-            }, {
-                "style": {
-                    "height": "36px"
-                }
-            }).form; //创建窗体
+                    "id": "doc",
+                    "style": {
+                        "width": "90%",
+                        "height": "90%",
+                        "overflow": 'hidden'
+                    },
+                    "onresize": 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 = {
@@ -2452,12 +2460,13 @@ 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);
                 }
             }
             break;
         case "mindNetwork": //好友打开
+            aTool = 7;
             _iframe = $$("iframe", {
                 "webkitallowfullscreen": "",
                 "mozallowfullscreen": "",
@@ -2475,20 +2484,20 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
             _formdiv = new U.UF.UI.form(
                 "思维网格",
                 _box, {
-                "id": "mindNetwork",
-                "style": {
-                    "width": "90%",
-                    "height": "90%",
-                    "overflow": 'hidden'
-                },
-                "onresize": function () { }
-            }, {
-                closecallback: function () { }
-            }, {
-                "style": {
-                    "height": "36px"
-                }
-            }).form; //创建窗体
+                    "id": "mindNetwork",
+                    "style": {
+                        "width": "90%",
+                        "height": "90%",
+                        "overflow": 'hidden'
+                    },
+                    "onresize": function() {}
+                }, {
+                    closecallback: function() {}
+                }, {
+                    "style": {
+                        "height": "36px"
+                    }
+                }).form; //创建窗体
             _taskbar = {
                 "id": str + _formdiv.id,
                 "style": {
@@ -2496,7 +2505,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);
                 }
             }
@@ -2519,20 +2528,20 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
             _formdiv = new U.UF.UI.form(
                 "课程设计",
                 _box, {
-                "id": "courseDesign",
-                "style": {
-                    "width": "90%",
-                    "height": "90%",
-                    "overflow": 'hidden'
-                },
-                "onresize": function () { }
-            }, {
-                closecallback: function () { }
-            }, {
-                "style": {
-                    "height": "36px"
-                }
-            }).form; //创建窗体
+                    "id": "courseDesign",
+                    "style": {
+                        "width": "90%",
+                        "height": "90%",
+                        "overflow": 'hidden'
+                    },
+                    "onresize": function() {}
+                }, {
+                    closecallback: function() {}
+                }, {
+                    "style": {
+                        "height": "36px"
+                    }
+                }).form; //创建窗体
             _taskbar = {
                 "id": str + _formdiv.id,
                 "style": {
@@ -2540,7 +2549,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);
                 }
             }
@@ -2564,7 +2573,7 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
 
     if (_iframe) {
         if (str == 'doc') {
-            U.UF.DL.iframeLoad(_iframe, function () {
+            U.UF.DL.iframeLoad(_iframe, function() {
                 _iframe.contentWindow.U.MD.O.W.load();
                 _iframe.contentWindow.document.body.appendChild(script1);
                 _iframe.contentWindow.document.body.appendChild(script2);
@@ -2572,7 +2581,7 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
                 _iframe.contentWindow.document.body.appendChild(script4);
             })
         } else if (str == 'courseDesign') {
-            U.UF.DL.iframeLoad(_iframe, function () {
+            U.UF.DL.iframeLoad(_iframe, function() {
                 // _iframe.contentWindow.U.MD.O.W.load();
                 // _iframe.contentWindow.document.body.appendChild(script1);
                 _iframe.contentWindow.document.body.appendChild(script2);
@@ -2610,24 +2619,28 @@ U.MD.D.I.openApplicationJie = function (str, cid, stage, task, tool) {
                 "'" +
                 ", " +
                 "'" +
-                cid +
+                _cid +
                 "'" +
                 ", " +
                 "'" +
-                stage +
+                _stage +
                 "'" +
                 ", " +
                 "'" +
-                task +
+                _task +
                 "'" +
                 ", " +
                 "'" +
-                tool +
+                _tool +
                 "'" +
                 ", " +
                 "'" +
                 str + '_loadLi' +
                 "'" +
+                ", " +
+                "'" +
+                aTool +
+                "'" +
                 ")\n" +
                 " });\n" +
                 "}\n" +