Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -864,8 +864,8 @@ 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,//福田
-        _desiTeacherDeskIconInfo = U.MD.D.I.desiTeacherDeskIcon,//福田
-        _desiAdminDeskIconInfo = U.MD.D.I.desiAdminDeskIcon,//福田
+        _dseiTeacherDeskIconInfo = U.MD.D.I.dseiTeacherDeskIcon,//福田
+        _dseiAdminDeskIconInfo = U.MD.D.I.dseiAdminDeskIcon,//福田
         _heyuanTeacherDeskIconInfo = U.MD.D.I.heyuanTeacherDeskIcon,//福田
         _heyuannAdminDeskIconInfo = U.MD.D.I.heyuanAdminDeskIcon,//福田
         _szherTeacherDeskIconInfo = U.MD.D.I.szherTeacherDeskIcon,//szher
@@ -1307,38 +1307,38 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 $$("div", { className: "U_MD_D_KOX", "innerHTML": _heyuanTeacherDeskIconInfo[i].Name }, _iconcontent);
             }//
         }else if ((_type == 1 || _type == 4) && (_org == "7b016f69-0f4f-11ee-91d8-005056b86db5") && _role == 1) {
-            for (i = 0; i < _desiAdminDeskIconInfo.length; i++) {
+            for (i = 0; i < _dseiAdminDeskIconInfo.length; i++) {
                 _content = $$("div", {
                     className: "U_MD_D_KO",
                     "onmousedown": U.UF.C.closure(function (obj) {
                         //防止拖动图标即打开了桌面应用
                         U.MD.D.click(this, obj);
-                    }, [_desiAdminDeskIconInfo[i]]),
+                    }, [_dseiAdminDeskIconInfo[i]]),
                     "onclick": U.UF.C.closure(function (obj) {
                         //防止拖动图标即打开了桌面应用
                         U.MD.D.click(this, obj);
-                    }, [_desiAdminDeskIconInfo[i]])
+                    }, [_dseiAdminDeskIconInfo[i]])
                 }, _frag); // 
                 _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
-                $$("div", { className: "U_MD_D_KOS U_Img", "style": _desiAdminDeskIconInfo[i].style }, _iconcontent);
-                $$("div", { className: "U_MD_D_KOX", "innerHTML": _desiAdminDeskIconInfo[i].Name }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _dseiAdminDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _dseiAdminDeskIconInfo[i].Name }, _iconcontent);
             }
         }else if ((_type == 1 || _type == 4) && (_org == "7b016f69-0f4f-11ee-91d8-005056b86db5") && _role == 0) {
-            for (i = 0; i < _desiTeacherDeskIconInfo.length; i++) {
+            for (i = 0; i < _dseiTeacherDeskIconInfo.length; i++) {
                 _content = $$("div", {
                     className: "U_MD_D_KO",
                     "onmousedown": U.UF.C.closure(function (obj) {
                         //防止拖动图标即打开了桌面应用
                         U.MD.D.click(this, obj);
-                    }, [_desiTeacherDeskIconInfo[i]]),
+                    }, [_dseiTeacherDeskIconInfo[i]]),
                     "onclick": U.UF.C.closure(function (obj) {
                         //防止拖动图标即打开了桌面应用
                         U.MD.D.click(this, obj);
-                    }, [_desiTeacherDeskIconInfo[i]])
+                    }, [_dseiTeacherDeskIconInfo[i]])
                 }, _frag); // 
                 _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
-                $$("div", { className: "U_MD_D_KOS U_Img", "style": _desiTeacherDeskIconInfo[i].style }, _iconcontent);
-                $$("div", { className: "U_MD_D_KOX", "innerHTML": _desiTeacherDeskIconInfo[i].Name }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOS U_Img", "style": _dseiTeacherDeskIconInfo[i].style }, _iconcontent);
+                $$("div", { className: "U_MD_D_KOX", "innerHTML": _dseiTeacherDeskIconInfo[i].Name }, _iconcontent);
             }
         }else if ((_type == 1 || _type == 4) && (_org == "ec0af97a-7c10-4259-a7eb-db9cc8174cdc") && _role == 1) {
             for (i = 0; i < _futianAdminDeskIconInfo.length; i++) {