Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -196,6 +196,7 @@ U.MD.D.I.orgDeskIcon = [
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "案例征集", "Url": "ytpbl", "style": { "cssText": "background-image:url(/img/icon/gpbl2.png)" } },
 ];
 
 U.MD.D.I.orgStemDeskIcon = [
@@ -725,11 +726,12 @@ U.MD.D.I.hkteacherDeskIcon = [
     { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
     // { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.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": "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": "AI Agent", "Url": "aiagent", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.png)" } },
+    // { "Name": "AI Agent", "Url": "aiagent", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
 
 //hk
@@ -757,11 +759,12 @@ U.MD.D.I.hkaceteacherDeskIcon = [
     { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
     // { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.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": "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": "AI Agent", "Url": "aiagent", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.png)" } },
+    // { "Name": "AI Agent", "Url": "aiagent", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
 
 //hk
@@ -993,6 +996,8 @@ U.MD.D.I.szjkyTeacherDeskIcon = [
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     // { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "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)" } },
 ];
@@ -1016,6 +1021,8 @@ U.MD.D.I.szjkyAdminDeskIcon = [
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
     // { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "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)" } },
 ];
@@ -1172,11 +1179,12 @@ U.MD.D.I.jccssylTeacherDeskIcon = [
     { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
     // { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
     { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.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": "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": "AI Agent", "Url": "aiagent", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.png)" } },
+    // { "Name": "AI Agent", "Url": "aiagent", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.png)" } },
     { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
 
 //jccssyl
@@ -1187,6 +1195,37 @@ U.MD.D.I.jccssylStudentDeskIcon = [
     { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
+//cale
+U.MD.D.I.caleTeacherDeskIcon = [
+    { "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": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
+    // { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.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": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
+    { "Name": "学习分析", "Url": "learnAna", "style": { "cssText": "background-image:url(/img/icon/learnAna.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": "AI Agent", "Url": "aiagent", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.png)" } },
+    { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
+];
+
+//cale
+U.MD.D.I.caleStudentDeskIcon = [
+    { "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)" } },
+    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+];
+
 //#region 桌面初始化a
 
 /**
@@ -1336,11 +1375,13 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _thuioeTeacherDeskIconInfo = U.MD.D.I.thuioeTeacherDeskIcon, // thu-ioe
         _jccssylStudentDeskIconInfo = U.MD.D.I.jccssylStudentDeskIcon, // jccssyl
         _jccssylTeacherDeskIconInfo = U.MD.D.I.jccssylTeacherDeskIcon, // jccssyl
+        _caleStudentDeskIconInfo = U.MD.D.I.caleStudentDeskIcon, // jccssyl
+        _caleTeacherDeskIconInfo = U.MD.D.I.caleTeacherDeskIcon, // jccssyl
         _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','fbb00cc1-380b-4173-add4-59b3cf7682b5','63060b4a-89dc-4f0c-bf04-a1de22d479ff','777559d2-7239-11ee-b98c-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','fbb00cc1-380b-4173-add4-59b3cf7682b5','63060b4a-89dc-4f0c-bf04-a1de22d479ff','777559d2-7239-11ee-b98c-005056b86db5','03d24cf9-4fbc-4aeb-bb02-6f84f66e6344'];
     //清楚桌面图标
     el.innerHTML = "";
     if (_org == 'c95e0a56-c205-11ed-8d51-005056b86db5' || _oid == "16d397f3-b192-11ed-9211-005056b86db5" || _org == "0fec3a8a-ad04-11ed-b13d-005056b86db5") {
@@ -1378,11 +1419,6 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         )
     }
 
-    if (_org == '03d24cf9-4fbc-4aeb-bb02-6f84f66e6344') {
-        _teacherDesktopIconInfo.push(
-        )
-    }
-
 
     if (_org == 'c95e0a56-c205-11ed-8d51-005056b86db5') {
         _teacherDesktopIconInfo.push(
@@ -1495,6 +1531,23 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _jccssylStudentDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _jccssylStudentDeskIconInfo[i].Name }, _iconcontent);
             }
+        } else if (_type == 2 && (_org == "03d24cf9-4fbc-4aeb-bb02-6f84f66e6344")) {
+            for (i = 0; i < _caleStudentDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_caleStudentDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_caleStudentDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _caleStudentDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _caleStudentDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if (_type == 2 && (_org == "fbb00cc1-380b-4173-add4-59b3cf7682b5")) {
             for (i = 0; i < _thuioeStudentDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -1767,6 +1820,23 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _jccssylTeacherDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _jccssylTeacherDeskIconInfo[i].Name }, _iconcontent);
             }
+        } else if ((_type == 1 || _type == 4) && _org == "03d24cf9-4fbc-4aeb-bb02-6f84f66e6344") {
+            for (i = 0; i < _caleTeacherDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_caleTeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_caleTeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _caleTeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _caleTeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if ((_type == 1 || _type == 4) && _org == "a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956" && _role == 1) {
             for (i = 0; i < _tpcOrganizerDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -2951,6 +3021,8 @@ window.addEventListener('message', function (e) { // 监听 message 事件
             gid: e.data.gid || '',
         }
         U.MD.D.I.openInApplication("opencCscl", _data)
+    } else if (e.data.tools && e.data.tools == "dataBoardTest") {
+        U.MD.D.I.openApplication("dataBoardTest")
     }
 });
 
@@ -4974,7 +5046,22 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/testStudent.png)" }, "name": "教师中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
 
             break;
-            
+        case "ytpbl": //消息通知
+            _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": "https://pblyt.cocorobo.cn/#/login?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                "id": "ytpbl",
+                "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/gpbl2.png)" }, "name": "案例征集", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
+
+            // window.open("https://gdpbl.cocorobo.cn/#/login", "案例征集", "height=" + US.height + ", width=" + US.width + ", top=100, left=100, toolbar=no, menubar=0,  resizable=0, location=0, status=no");
+
+            break;
     }
 
 

js/gm/DeskTop.js

@@ -2135,7 +2135,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
         case "gpbl": //消息通知
             _formdiv = new U.UF.UI.form(
                 "案例征集",
-                $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pblgm.cocorobo.cn/#/login?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                $$("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://pblgm.cocorobo.cn/#/login?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
                 "id": "gpbl",
                 "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                 "onresize": function () { }