Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -615,6 +615,34 @@ U.MD.D.I.yunhaiTeacherDeskIcon = [
     { "Name": "项目设计", "Url": "courseDesign", "style": { "cssText": "background-image:url(/img/icon/courseDesign.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
 ];
+
+//福田
+U.MD.D.I.heyuanTeacherDeskIcon = [
+    { "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": "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": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
+    // { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.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)" } },
+];
+
+//福田
+U.MD.D.I.heyuanAdminDeskIcon = [
+    { "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": "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": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
+    { "Name": "课程进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
+    { "Name": "AI共创", "Url": "AIChat", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+];
+
 //#region 桌面初始化a
 
 /**
@@ -731,8 +759,10 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _tcTeacherDeskIconInfo = U.MD.D.I.tcTeacherDeskIcon,//腾讯学生
         _futianTeacherDeskIconInfo = U.MD.D.I.futianTeacherDeskIcon,//福田
         _futianAdminDeskIconInfo = U.MD.D.I.futianAdminDeskIcon,//福田
-        _gdjgTeacherDeskIconInfo = U.MD.D.I.gdjgTeacherDeskIcon,//福田
-        _gdjgAdminDeskIconInfo = U.MD.D.I.gdjgAdminDeskIcon,//福田
+        _heyuanTeacherDeskIconInfo = U.MD.D.I.heyuanTeacherDeskIcon,//福田
+        _heyuannAdminDeskIconInfo = U.MD.D.I.heyuanAdminDeskIcon,//福田
+        _gdjgTeacherDeskIconInfo = U.MD.D.I.gdjgTeacherDeskIcon,//
+        _gdjgAdminDeskIconInfo = U.MD.D.I.gdjgAdminDeskIcon,//
         _lotechTeacherDeskIconInfo = U.MD.D.I.lotechTeacherDeskIcon,//lotech
         _longhuaTeacherDeskIconInfo = U.MD.D.I.longhuateacherDeskIcon,//龙华中心
         _siesTeacherDeskIconInfo = U.MD.D.I.siesteacherDeskIcon,//龙华中心
@@ -743,7 +773,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _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'];
-    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'];
+    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'];
     //清楚桌面图标
     el.innerHTML = "";
     if (_org == 'c95e0a56-c205-11ed-8d51-005056b86db5' || _oid == '45facc0a-1211-11ec-80ad-005056b86db5' || _oid == "16d397f3-b192-11ed-9211-005056b86db5" || _org == "0fec3a8a-ad04-11ed-b13d-005056b86db5") {
@@ -1052,6 +1082,40 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _gdjgTeacherDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _gdjgTeacherDeskIconInfo[i].Name }, _iconcontent);
             }
+        }else if ((_type == 1 || _type == 4) && (_org == "578de748-05d2-11ee-91d8-005056b86db5") && _role == 1) {
+            for (i = 0; i < _heyuannAdminDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_heyuannAdminDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_heyuannAdminDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _heyuannAdminDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _heyuannAdminDeskIconInfo[i].Name }, _iconcontent);
+            }
+        }else if ((_type == 1 || _type == 4) && (_org == "578de748-05d2-11ee-91d8-005056b86db5") && _role == 0) {
+            for (i = 0; i < _heyuanTeacherDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_heyuanTeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_heyuanTeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _heyuanTeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _heyuanTeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
         }else if ((_type == 1 || _type == 4) && (_org == "ec0af97a-7c10-4259-a7eb-db9cc8174cdc") && _role == 1) {
             for (i = 0; i < _futianAdminDeskIconInfo.length; i++) {
                 _content = $$("div", {

js/Desktop/Onload.js

@@ -425,9 +425,6 @@ U.MD.D.getuser = function () {
                                     } else if (res.value[0][0].org == 'e632b86c-f89d-11ed-91d8-005056b86db5') {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gdjgBg.png")'
                                         US.Config.background = 'url("/img/icon/gdjgBg.png")'
-                                    } else if (res.value[0][0].org == '578de748-05d2-11ee-91d8-005056b86db5') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/futianBg.png")'
-                                        US.Config.background = 'url("/img/icon/futianBg.png")'
                                     }
                                     
                                     US.userInfo = res.value[0][0];
@@ -535,8 +532,6 @@ U.MD.D.getuser = function () {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/futianBg.png")'
             } else if (userInfo.org == 'e632b86c-f89d-11ed-91d8-005056b86db5') {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gdjgBg.png")'
-            } else if (userInfo.org == '578de748-05d2-11ee-91d8-005056b86db5') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/futianBg.png")'
             }
         }
     }
@@ -635,9 +630,6 @@ U.MD.D.getuser2 = function (userid, cid) {
         } else if (res.value[0][0].org == 'e632b86c-f89d-11ed-91d8-005056b86db5') {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/gdjgBg.png")'
             US.Config.background = 'url("/img/icon/gdjgBg.png")'
-        } else if (value[0][0].org == '578de748-05d2-11ee-91d8-005056b86db5') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/futianBg.png")'
-            US.Config.background = 'url("/img/icon/futianBg.png")'
         }
 
         US.userInfo = res.value[0][0];