Merge branch 'beta' into HK

js/Desktop/DeskTop.js

@@ -556,29 +556,29 @@ U.MD.D.I.siesteacherDeskIcon = [
 
 //福田
 U.MD.D.I.gdjgTeacherDeskIcon = [
-    { "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": "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)" } },
+    { "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.gdjgAdminDeskIcon = [
-    { "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": "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)" } },
+    { "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
 
@@ -707,7 +707,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _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'];
     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'];
-    //清楚桌面图标
+    //清楚桌面圖標
     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") {
         _teacherDesktopIconInfo.push(
@@ -952,11 +952,11 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 _content = $$("div", {
                     className: "U_MD_D_KO",
                     "onmousedown": U.UF.C.closure(function (obj) {
-                        //防止拖动图标即打开了桌面应用
+                        //防止拖動圖標即打開了桌面應用
                         U.MD.D.click(this, obj);
                     }, [_gdjgAdminDeskIconInfo[i]]),
                     "onclick": U.UF.C.closure(function (obj) {
-                        //防止拖动图标即打开了桌面应用
+                        //防止拖動圖標即打開了桌面應用
                         U.MD.D.click(this, obj);
                     }, [_gdjgAdminDeskIconInfo[i]])
                 }, _frag); // 
@@ -969,11 +969,11 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
                 _content = $$("div", {
                     className: "U_MD_D_KO",
                     "onmousedown": U.UF.C.closure(function (obj) {
-                        //防止拖动图标即打开了桌面应用
+                        //防止拖動圖標即打開了桌面應用
                         U.MD.D.click(this, obj);
                     }, [_gdjgTeacherDeskIconInfo[i]]),
                     "onclick": U.UF.C.closure(function (obj) {
-                        //防止拖动图标即打开了桌面应用
+                        //防止拖動圖標即打開了桌面應用
                         U.MD.D.click(this, obj);
                     }, [_gdjgTeacherDeskIconInfo[i]])
                 }, _frag); // 
@@ -1375,7 +1375,7 @@ U.MD.D.iconPostion = function (childs, top, left) {
                 top -= 110;
                 left -= 90;
             }
-            //沒有超過範圍，那麽left+90添加到下一個豎排打印
+            //沒有超過範圍，那麼left+90添加到下一個豎排打印
             else {
                 left += 90;
                 top = 15;
@@ -1413,7 +1413,7 @@ U.MD.D.iconPostion2 = function (childs, top, left) {
                 top -= 150;
                 left -= 150;
             }
-            //沒有超過範圍，那麽left+90添加到下一個豎排打印
+            //沒有超過範圍，那麼left+90添加到下一個豎排打印
             else {
                 top += 150;
                 left = ol;
@@ -1492,16 +1492,16 @@ U.MD.D.iconUp = function (el) {
         _childs = U.selectEl("#U_MD_D_K").Child(), //桌面所有的圖標
         _positioninfo = U.UF.EL.getElementInfo(el); //獲取拖動結束的元素的位置
     if (_positioninfo["OT"] > 15) {
-        //網狀的形式定位，如果差超過了55，那麽向下定位，否則向上定位
+        //網狀的形式定位，如果差超過了55，那麼向下定位，否則向上定位
         _margin = ((_positioninfo["OT"] - 15) % 95 > 55 && _positioninfo["OT"] + 95 < US.height) ? 1 : 0;
         _top = (Math.floor((_positioninfo["OT"] - 15) / 95) + _margin) * 95 + 15;
     }
     if (_positioninfo["OL"] > 20) {
-        //網狀的形式定位，如果差超過了90，那麽向右定位，否則向左定位
+        //網狀的形式定位，如果差超過了90，那麼向右定位，否則向左定位
         _margin = ((_positioninfo["OL"] - 20) % 90 > 45 && _positioninfo["OL"] + 90 < US.width) ? 1 : 0;
         _left = (Math.floor((_positioninfo["OL"] - 20) / 90) + _margin) * 90 + 20
     }
-    //while循環判斷麽一個重疊的元素
+    //while循環判斷麼一個重疊的元素
     do {
         _positioninfo = U.MD.D.iconPostion([el], _top, _left); //給重疊的元素向下定位
         _top = _positioninfo[0] + 95; //得到定位後的top
@@ -1606,7 +1606,7 @@ window.addEventListener('message', function (e) { // 監聽 message 事件
         U.UF.F.windowZooming(_formel);
     } else if (e.data.allScreen && e.data.allScreen == "6") {
         // var _formel = document.getElementById("study");
-        //如果最大化了，那麽就把他縮小
+        //如果最大化了，那麼就把他縮小
         // if (_formel.ismaximize) {
         //     return;
         // }
@@ -1614,7 +1614,7 @@ window.addEventListener('message', function (e) { // 監聽 message 事件
         // U.UF.F.topWindow(_formel);
     } else if (e.data.allScreen && e.data.allScreen == "4") {
         // var _formel = document.getElementById("studyDetail");
-        //如果最大化了，那麽就把他縮小
+        //如果最大化了，那麼就把他縮小
         // if (_formel.ismaximize) {
         //     return;
         // }