Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -102,6 +102,7 @@ U.MD.D.I.teacherDeskIcon2 = [
     // { "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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
 ];
 
 U.MD.D.I.studentDeskIcon = [
@@ -420,6 +421,7 @@ U.MD.D.I.wankeTeacherDeskIcon = [ //1c3b9def-8fbe-11ed-b13d-005056b86db5
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     // { "Name": "课程进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } }
 ];
 
 U.MD.D.I.wankeAdminDeskIcon = [
@@ -439,6 +441,7 @@ U.MD.D.I.wankeAdminDeskIcon = [
     { "Name": "目标管理", "Url": "sys", "style": { "cssText": "background-image:url(/img/icon/evalua.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } }
 ];
 
 U.MD.D.I.lhsTeacherDeskIcon = [ //未来小学
@@ -454,6 +457,7 @@ U.MD.D.I.lhsTeacherDeskIcon = [ //未来小学
     { "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": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
+    { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
 ];
 
 U.MD.D.I.lhsAdminDeskIcon = [ //未来小学admin
@@ -469,6 +473,7 @@ U.MD.D.I.lhsAdminDeskIcon = [ //未来小学admin
     { "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": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
+    { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
 ];
 
 
@@ -599,7 +604,12 @@ U.MD.D.I.siesteacherDeskIcon = [
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "工作管理", "Url": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
     { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.png)" } },
+    { "Name": "项目进展", "Url": "CaseDesignS", "style": { "cssText": "background-image:url(/img/icon/CaseDesignS.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    { "Name": "数据看板", "Url": "dataBoardSies", "style": { "cssText": "background-image:url(/img/icon/dataBoardSies.png)" } },
 ];
 
 //教科院实小教师桌面图标的全局变量
@@ -966,6 +976,55 @@ U.MD.D.I.tpcAdminDeskIcon = [
 ];
 
 
+//THU-IOE
+U.MD.D.I.thuioeTeacherDeskIcon = [
+    { "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": "studentCourseS", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+    { "Name": "教研室", "Url": "teacherOffice", "style": { "cssText": "background-image:url(/img/icon/teacherOffice.png)" } },
+    { "Name": "年级管理", "Url": "Grade", "style": { "cssText": "background-image:url(/img/icon/Grade.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": "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": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
+    { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+];
+
+//THU-IOE
+U.MD.D.I.thuioeStudentDeskIcon = [
+    { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    { "Name": "项目管理", "Url": "studentCourse", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+];
+
 
 //#region 桌面初始化a
 
@@ -1107,14 +1166,16 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _hkZJLSTeacherDeskIconInfo = U.MD.D.I.hkZJLSteacherDeskIcon, //hk
         _hkZJLSStudentDeskIconInfo = U.MD.D.I.hkZJLSStudentDeskIcon, //hk
         _yunhaiTeacherDeskIconInfo = U.MD.D.I.yunhaiTeacherDeskIcon, //云海
-        _tpcStudentDeskIconInfo= U.MD.D.I.tpcStudentDeskIcon,
-        _tpcTeacherDeskIconInfo= U.MD.D.I.tpcTeacherDeskIcon,
-        _tpcOrganizerDeskIconInfo= U.MD.D.I.tpcAdminDeskIcon,
+        _tpcStudentDeskIconInfo = U.MD.D.I.tpcStudentDeskIcon,
+        _tpcTeacherDeskIconInfo = U.MD.D.I.tpcTeacherDeskIcon,
+        _tpcOrganizerDeskIconInfo = U.MD.D.I.tpcAdminDeskIcon,
+        _thuioeStudentDeskIconInfo = U.MD.D.I.thuioeStudentDeskIcon, // thu-ioe
+        _thuioeTeacherDeskIconInfo = U.MD.D.I.thuioeTeacherDeskIcon, // thu-ioe
         _szscStudentDeskIconInfo = U.MD.D.I.szscStudentDeskIcon, //网络夏令营
         _szscTeacherDeskIconInfo = U.MD.D.I.szscTeacherDeskIcon, //网络夏令营
         _szscOrganizerDeskIconInfo = U.MD.D.I.szscOrganizerDeskIcon; //网络夏令营
     var _oidA = ['69893dca-1d47-11ed-8c78-005056b86db5', "91305d49-01ba-11ed-8c78-005056b86db5", "d9db3320-503a-11ed-8c78-005056b86db5", "05b62310-8cda-11ed-b13d-005056b86db5", '1c3b9def-8fbe-11ed-b13d-005056b86db5', '91305d49-01ba-11ed-8c78-005056b86db4', 'ea2a8c65-f38c-11ed-91d8-005056b86db5', '4c686762-1d0a-11ed-8c78-005056b86db5', 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41', '206c38d2-0cbe-11ee-91d8-005056b86db5'];
-    var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d", "383f207d-4ced-4eeb-a15a-7b0a2f3abe7b", "150e3120-9195-11ed-b13d-005056b86db5", "ee40e8e3-e36c-4872-8105-cf395481012s", '97c4ee8b-d010-4042-986d-e9d3c217264f', 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc', '4df1b570-f6ac-48fc-8d50-d0b157dae776', 'e632b86c-f89d-11ed-91d8-005056b86db5', 'b50cf65a-001c-11ee-91d8-005056b86db5', '578de748-05d2-11ee-91d8-005056b86db5', '54f09f1e-09f0-11ee-91d8-005056b86db5', '7b016f69-0f4f-11ee-91d8-005056b86db5', '1973f6c7-1561-11ee-91d8-005056b86db5', '2fa75e51-189a-11ee-91d8-005056b86db5', 'a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956'];
+    var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d", "383f207d-4ced-4eeb-a15a-7b0a2f3abe7b", "150e3120-9195-11ed-b13d-005056b86db5", "ee40e8e3-e36c-4872-8105-cf395481012s", '97c4ee8b-d010-4042-986d-e9d3c217264f', 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc', '4df1b570-f6ac-48fc-8d50-d0b157dae776', 'e632b86c-f89d-11ed-91d8-005056b86db5', 'b50cf65a-001c-11ee-91d8-005056b86db5', '578de748-05d2-11ee-91d8-005056b86db5', '54f09f1e-09f0-11ee-91d8-005056b86db5', '7b016f69-0f4f-11ee-91d8-005056b86db5', '1973f6c7-1561-11ee-91d8-005056b86db5', '2fa75e51-189a-11ee-91d8-005056b86db5', 'a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956','fbb00cc1-380b-4173-add4-59b3cf7682b5'];
     //清楚桌面图标
     el.innerHTML = "";
     if (_org == 'c95e0a56-c205-11ed-8d51-005056b86db5' || _oid == "16d397f3-b192-11ed-9211-005056b86db5" || _org == "0fec3a8a-ad04-11ed-b13d-005056b86db5") {
@@ -1169,13 +1230,21 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
     if (_oid == 'cf8841e8-c7c0-11ed-9546-005056b86db5' || _oid == "d67940a5-510c-40ea-9c9a-2631ab03013a") {
         _teacherDesktopIconInfo.push(
             { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
-        )   
+        )
+    }
+
+    // 马峦小学 和 龙华区教育科学研究院附属学校 和 侨香学校
+    if (_oid == "602a1e3d-d031-11ed-9546-005056b86db5" || _oid == "f30a6615-5379-11ed-8c78-005056b86db5" || _oid == "82fcb5c7-c13b-11ed-8d51-005056b86db5") {
+        _teacherDesktopIconInfo.push(
+            { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+        )
     }
 
     //麒麟二中
     if (_oid == 'cf8841e8-c7c0-11ed-9546-005056b86db5') {
         _studentDesktopIconInfo.push(
             { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+            { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
         )
     }
 
@@ -1236,6 +1305,23 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _hkZJLSStudentDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _hkZJLSStudentDeskIconInfo[i].Name }, _iconcontent);
             } //
+        } else if (_type == 2 && (_org == "fbb00cc1-380b-4173-add4-59b3cf7682b5")) {
+            for (i = 0; i < _thuioeStudentDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_thuioeStudentDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_thuioeStudentDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _thuioeStudentDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _thuioeStudentDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if (_type == 2 && (_org == "a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956")) {
             for (i = 0; i < _tpcStudentDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -1508,6 +1594,23 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _teacherDesktopIconInfo2[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _teacherDesktopIconInfo2[i].Name }, _iconcontent);
             }
+        } else if ((_type == 1 || _type == 4) && (_org == "fbb00cc1-380b-4173-add4-59b3cf7682b5")) {
+            for (i = 0; i < _thuioeTeacherDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_thuioeTeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_thuioeTeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _thuioeTeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _thuioeTeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if ((_type == 1 || _type == 4) && (_org == "4df1b570-f6ac-48fc-8d50-d0b157dae776")) {
             for (i = 0; i < _lotechTeacherDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -4438,6 +4541,19 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             }, { "style": { "height": "36px" } }).form; //创建窗体
             _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/dataBoard.png)" }, "name": "数据看板", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
 
+            break;
+        case "dataBoardSies": //数据看板
+            _formdiv = new U.UF.UI.form(
+                "数据看板",
+                $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/dataBoardSies?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                "id": "dataBoardSies",
+                "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/dataBoardSies.png)" }, "name": "数据看板", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
             break;
         case "AIAnalyse": //AI共创
             _formdiv = new U.UF.UI.form(