Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -2187,6 +2187,27 @@ U.MD.D.I.PREPAIStudentDeskIcon = [
     { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
 ];
 
+//智理集团
+U.MD.D.I.zlteacherDeskIcon = [
+    { "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": "source", "style": { "cssText": "background-image:url(/img/icon/source.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": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
+    { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
+];
+
+//智理集团
+U.MD.D.I.zlstudentDeskIcon = [
+    { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+];
+
 
 //#region 桌面初始化a
 
@@ -2409,12 +2430,14 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _scnuaiAdminDeskIconInfo = U.MD.D.I.scnuaiAdminDeskIcon, //scnuai
         _scnuaiStudentDeskIconInfo = U.MD.D.I.scnuaiStudentDeskIcon, //scnuai
         _szscOrganizerDeskIconInfo = U.MD.D.I.szscOrganizerDeskIcon, //szsc
-        _PREPAITeacherDeskIcon = U.MD.D.I.PREPAITeacherDeskIcon, //szsc
-        _PREPAIStudentDeskIcon = U.MD.D.I.PREPAIStudentDeskIcon, //szsc
+        _PREPAITeacherDeskIcon = U.MD.D.I.PREPAITeacherDeskIcon, //PREPAI
+        _PREPAIStudentDeskIcon = U.MD.D.I.PREPAIStudentDeskIcon, //PREPAI
+        _zlteacherDeskIconInfo = U.MD.D.I.zlteacherDeskIcon, //zl
+        _zlstudentDeskIconInfo = U.MD.D.I.zlstudentDeskIcon, //zl
         _MOAITeacherDeskIcon = U.MD.D.I.MOAITeacherDeskIcon, //moai
         _MOAIStudentDeskIcon = U.MD.D.I.MOAIStudentDeskIcon; //moai
     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', '2f30fe58-a94f-11ee-b534-005056b86db5', 'eaba9110-d1eb-11ee-b534-005056b86db5', 'c7df0bd4-6e75-401a-a137-4e163aa62263', '9b46a3c9-7657-11ef-9b30-005056b86db5', '857af1c7-c8ee-4b04-85b5-fd182903adb7', '876030db-7a49-11ef-9b30-005056b86db5', 'b97fc213-86a9-11ef-9b30-005056b86db5', 'c636f63e-86f4-11ef-9b30-005056b86db5', '6c16df93-8849-11ef-9b30-005056b86db5', '72c16ee0-89fe-11ef-9b30-005056b86db5', '369222a8-cddd-11ed-9546-005056b86db5', '3fc7840d-a1c4-11ef-9b30-005056b86db5', '2c5d4971-ed9e-11ef-b508-005056924926', 'bc239322-ffb2-11ef-b508-005056924926', '91796dfb-8791-11ef-9b30-005056b86db5', '86fa8cd7-00c2-11f0-b508-005056924926', '8406b214-085f-11f0-b508-005056924926', '65ad80f0-16bb-11f0-a66a-005056924926', '9a8076a2-469a-11f0-b60f-005056924926'];
-    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', '884c5665-a453-46f3-b7b6-01d575290aa9', 'c9a6de59-8b4f-4be1-8565-a08081f649d3', '7f280060-665e-4868-b68f-1eec9e1b4a07', 'f3b243b2-75e2-4b00-8f66-7644946a2a25', '16ace517-b5c7-4168-a9bb-a9e0035df840', '2fe1a080-4425-4620-b7a0-be2f3750ffd4', 'a5efd078-20f6-4185-bef9-6d1c688bee70', '23bbe712-e35a-4888-9b4e-8d9e5a4fa2f6', 'ec84034b-8ea4-4d27-9cba-1adcb4720bb3', 'b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc', 'c8266c04-59e3-44de-bcf2-8f906e66e636', '7cc601a0-fafc-4116-a805-0adbacf7a38d', '62c166af-2f22-11f0-b60f-005056924926', 'eaee75a4-ff2e-11ef-b508-005056924926', "fa20a652-5f2a-11f0-bf32-005056924926", "eed08ac6-7269-11f0-9c7b-005056924926"];
+    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', '884c5665-a453-46f3-b7b6-01d575290aa9', 'c9a6de59-8b4f-4be1-8565-a08081f649d3', '7f280060-665e-4868-b68f-1eec9e1b4a07', 'f3b243b2-75e2-4b00-8f66-7644946a2a25', '16ace517-b5c7-4168-a9bb-a9e0035df840', '2fe1a080-4425-4620-b7a0-be2f3750ffd4', 'a5efd078-20f6-4185-bef9-6d1c688bee70', '23bbe712-e35a-4888-9b4e-8d9e5a4fa2f6', 'ec84034b-8ea4-4d27-9cba-1adcb4720bb3', 'b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc', 'c8266c04-59e3-44de-bcf2-8f906e66e636', '7cc601a0-fafc-4116-a805-0adbacf7a38d', '62c166af-2f22-11f0-b60f-005056924926', 'eaee75a4-ff2e-11ef-b508-005056924926', "fa20a652-5f2a-11f0-bf32-005056924926", "eed08ac6-7269-11f0-9c7b-005056924926",'cf30095b-87d5-11f0-9c7b-005056924926'];
     var liyuanOrg = ["3823a6a5-1b6e-11f0-a66a-005056924926", "3823a6a5-1b6e-11f0-a66a-005056924926", "292e34dc-1b6e-11f0-a66a-005056924926", "21d6b367-1b6e-11f0-a66a-005056924926", "1a1a172d-1b6e-11f0-a66a-005056924926", "1197f86b-1b6e-11f0-a66a-005056924926", "f235659b-1b6d-11f0-a66a-005056924926", "d87b62d3-1b6d-11f0-a66a-005056924926", "c25ea59b-1b6d-11f0-a66a-005056924926",]
     //清楚桌面图标
     el.innerHTML = "";
@@ -3142,6 +3165,23 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _PREPAIStudentDeskIcon[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _PREPAIStudentDeskIcon[i].Name }, _iconcontent);
             }
+        } else if (_type == 2 && (_org == "cf30095b-87d5-11f0-9c7b-005056924926")) {
+            for (i = 0; i < _zlstudentDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_zlstudentDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_zlstudentDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _zlstudentDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _zlstudentDeskIconInfo[i].Name }, _iconcontent);
+            }
         } else if (_type == 2 && (_org == "eaee75a4-ff2e-11ef-b508-005056924926")) {
             for (i = 0; i < _demoCocoStudentDeskIconInfo.length; i++) {
                 _content = $$("div", {
@@ -4946,7 +4986,27 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _PREPAITeacherDeskIcon[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _PREPAITeacherDeskIcon[i].Name }, _iconcontent);
             }
-        } else if ((_type == 1 || _type == 4) && _org == "eaee75a4-ff2e-11ef-b508-005056924926") {
+        } else if ((_type == 1 || _type == 4) && _org == "cf30095b-87d5-11f0-9c7b-005056924926") {
+            for (i = 0; i < _zlteacherDeskIconInfo.length; i++) {
+                if (_role === 0 && _zlteacherDeskIconInfo[i].Url == 'testTeacher') {
+                    continue
+                }
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_zlteacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_zlteacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _zlteacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _zlteacherDeskIconInfo[i].Name }, _iconcontent);
+            }
+        }  else if ((_type == 1 || _type == 4) && _org == "eaee75a4-ff2e-11ef-b508-005056924926") {
             for (i = 0; i < _demoCocoTeacherDeskIconInfo.length; i++) {
                 if (_role === 0 && _demoCocoTeacherDeskIconInfo[i].Url == 'testTeacher') {
                     continue