Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -537,6 +537,22 @@ U.MD.D.I.longhuateacherDeskIcon = [
     { "Name": "课程进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
     { "Name": "教学资源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
 ];
+
+//教科院实小教师桌面图标的全局变量
+U.MD.D.I.siesteacherDeskIcon = [
+    { "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": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
+    // { "Name": "我的资料", "Url": "my", "style": { "cssText": "background-image:url(/img/icon/myMessage.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": "工作管理", "Url": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
+    { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.png)" } },
+];
 //#region 桌面初始化a
 
 /**
@@ -579,6 +595,9 @@ U.MD.D.I.ModeCheck = function (type) {
 
     //初始化桌面图标
     U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], type);
+    if(type == 2){
+        U.MD.D.I.openApplication("project")
+    }
 }
 
 
@@ -651,12 +670,13 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _futianTeacherDeskIconInfo = U.MD.D.I.futianTeacherDeskIcon,//福田
         _futianAdminDeskIconInfo = U.MD.D.I.futianAdminDeskIcon,//福田
         _lotechTeacherDeskIconInfo = U.MD.D.I.lotechTeacherDeskIcon,//lotech
-        _longhuaTeacherDeskIconInfo = U.MD.D.I.longhuateacherDeskIcon,//lotech
+        _longhuaTeacherDeskIconInfo = U.MD.D.I.longhuateacherDeskIcon,//龙华中心
+        _siesTeacherDeskIconInfo = U.MD.D.I.siesteacherDeskIcon,//龙华中心
         _tcOrganizerDeskIconInfo = U.MD.D.I.tcOrganizerDeskIcon,//腾讯学生
         _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'];
+    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'];
     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'];
     //清楚桌面图标
     el.innerHTML = "";
@@ -681,13 +701,8 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         })
 
     }
-    if (_oid == '4c686762-1d0a-11ed-8c78-005056b86db5') {
-        _teacherDesktopIconInfo.push(
-            { "Name": "工作管理", "Url": "studioCourse", "style": { "cssText": "background-image:url(/img/icon/studioCourse.png)" } },
-            { "Name": "工作中心", "Url": "studioIndex", "style": { "cssText": "background-image:url(/img/icon/studioIndex.png)" } },
-        )
-    }
-    if (_oid != '4c686762-1d0a-11ed-8c78-005056b86db5' && _oid != '45facc0a-1211-11ec-80ad-005056b86db5') {
+
+    if (_oid != '45facc0a-1211-11ec-80ad-005056b86db5') {
         _teacherDesktopIconInfo = _teacherDesktopIconInfo.filter((el) => {
             return el.Name != '魔盒识字' && el.Name != '24点'
         })
@@ -869,6 +884,23 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOS U_Img", "style": _lotechTeacherDeskIconInfo[i].style }, _iconcontent);
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _lotechTeacherDeskIconInfo[i].Name }, _iconcontent);
             }
+        }else if ((_type == 1 || _type == 4) && (_oid == "4c686762-1d0a-11ed-8c78-005056b86db5")) {
+            for (i = 0; i < _siesTeacherDeskIconInfo.length; i++) {
+                _content = $$("div", {
+                    className: "U_MD_D_KO",
+                    "onmousedown": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_siesTeacherDeskIconInfo[i]]),
+                    "onclick": U.UF.C.closure(function (obj) {
+                        //防止拖动图标即打开了桌面应用
+                        U.MD.D.click(this, obj);
+                    }, [_siesTeacherDeskIconInfo[i]])
+                }, _frag); // 
+                _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _siesTeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _siesTeacherDeskIconInfo[i].Name }, _iconcontent);
+            }
         }else if ((_type == 1 || _type == 4) && (_oid == "ea2a8c65-f38c-11ed-91d8-005056b86db5")) {
             for (i = 0; i < _longhuaTeacherDeskIconInfo.length; i++) {
                 _content = $$("div", {

js/Desktop/Onload.js

@@ -388,8 +388,15 @@ U.MD.D.getuser = function () {
                                     } else if (res.value[0][0].organizeid == '82fcb5c7-c13b-11ed-8d51-005056b86db5') {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qiaoxiangBg.png")'
                                         US.Config.background = 'url("/img/icon/qiaoxiangBg.png")'
+                                    } else if (res.value[0][0].organizeid == '4c686762-1d0a-11ed-8c78-005056b86db5') {
+                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")'
+                                        US.Config.background = 'url("/img/icon/sies.png")'
+                                    } else if (res.value[0][0].organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
+                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
+                                        US.Config.background = 'url("/img/icon/longhuaZXBg.png")'
                                     }
-                                   
+                                    
+                                    
 
                                     if (res.value[0][0].org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d') {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yantianOrgBg.png")'
@@ -416,7 +423,7 @@ U.MD.D.getuser = function () {
                                         $("#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];
                                     $(".avatar")[0].style.display = "block";
                                     if(res.value[0][0].type === 1 && $(".U_PBL_Check")[0] && res.value[0][0].org != '150e3120-9195-11ed-b13d-005056b86db5'){
@@ -483,6 +490,10 @@ U.MD.D.getuser = function () {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/wankeBg.png")'
             } else if (userInfo.organizeid == '82fcb5c7-c13b-11ed-8d51-005056b86db5') {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qiaoxiangBg.png")'
+            } else if (userInfo.organizeid == '4c686762-1d0a-11ed-8c78-005056b86db5') {
+                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")'
+            } else if (userInfo.organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
+                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
             }
     
             if (userInfo.org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d') {
@@ -582,6 +593,10 @@ U.MD.D.getuser2 = function (userid, cid) {
         } else if (res.value[0][0].organizeid == '82fcb5c7-c13b-11ed-8d51-005056b86db5') {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qiaoxiangBg.png")'
             US.Config.background = 'url("/img/icon/qiaoxiangBg.png")'
+        } else if (res.value[0][0].organizeid == '4c686762-1d0a-11ed-8c78-005056b86db5') {
+            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")'
+        } else if (res.value[0][0].organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
+            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
         }
 
         if (res.value[0][0].org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d') {