Merge branch 'beta' into HK

js/Desktop/DeskTop.js

@@ -735,15 +735,15 @@ U.MD.D.I.hkteacherDeskIcon = [
 
 //ricoh
 U.MD.D.I.ricohteacherDeskIcon = [
-    { "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": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.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": "課程管理", "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": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.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": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
 ];
 
@@ -1980,25 +1980,25 @@ U.MD.D.I.szsyStudentDeskIcon = [
 
 //010404
 U.MD.D.I.x010404TeacherDeskIcon = [
-    { "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": "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": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
-    { "Name": "智能表单", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
-    { "Name": "教师中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
+    { "Name": "協同建構", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "智能表單", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
+    { "Name": "教師中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
     { "Name": "CocoFlow", "Url": "appStore", "style": { "cssText": "background-image:url(/img/icon/appStore.png)" } },
 ];
 
 //010404
 U.MD.D.I.x010404StudentDeskIcon = [
-    { "Name": "项目管理", "Url": "studentCourse", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
-    { "Name": "项目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
-    { "Name": "课程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
-    // { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "項目管理", "Url": "studentCourse", "style": { "cssText": "background-image:url(/img/icon/studentCourse.png)" } },
+    { "Name": "項目中心", "Url": "studentIndex", "style": { "cssText": "background-image:url(/img/icon/studentIndex.png)" } },
+    { "Name": "課程中心", "Url": "studentStudy", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
+    // { "Name": "協同建構", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
 ];
 
 
@@ -2213,7 +2213,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _szscOrganizerDeskIconInfo = U.MD.D.I.szscOrganizerDeskIcon; //szsc
     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'];
     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'];
-    //清楚桌面图标
+    //清楚桌面圖標
     el.innerHTML = "";
     if (_org == 'c95e0a56-c205-11ed-8d51-005056b86db5' || _oid == "16d397f3-b192-11ed-9211-005056b86db5" || _org == "0fec3a8a-ad04-11ed-b13d-005056b86db5") {
         _teacherDesktopIconInfo.push(
@@ -2769,11 +2769,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);
                     }, [_x010404StudentDeskIconInfo[i]]),
                     "onclick": U.UF.C.closure(function (obj) {
-                        //防止拖动图标即打开了桌面应用
+                        //防止拖動圖標即打開了桌面應用
                         U.MD.D.click(this, obj);
                     }, [_x010404StudentDeskIconInfo[i]])
                 }, _frag); // 
@@ -3500,11 +3500,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);
                     }, [_ricohTeacherDeskIconInfo[i]]),
                     "onclick": U.UF.C.closure(function (obj) {
-                        //防止拖动图标即打开了桌面应用
+                        //防止拖動圖標即打開了桌面應用
                         U.MD.D.click(this, obj);
                     }, [_ricohTeacherDeskIconInfo[i]])
                 }, _frag); // 
@@ -4390,11 +4390,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);
                     }, [_x010404TeacherDeskIconInfo[i]]),
                     "onclick": U.UF.C.closure(function (obj) {
-                        //防止拖动图标即打开了桌面应用
+                        //防止拖動圖標即打開了桌面應用
                         U.MD.D.click(this, obj);
                     }, [_x010404TeacherDeskIconInfo[i]])
                 }, _frag); // 
@@ -7554,7 +7554,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
     if(iframeBool){
         U.UF.DL.loading($("iframe", _formdiv)[0].parentElement.parentElement)
         // let onloadListener = $("iframe", _formdiv)[0].onload = () => {
-        //     console.log("iframe进入");
+        //     console.log("iframe進入");
         //     U.UF.DL.uploading($("iframe", _formdiv)[0].parentElement.parentElement)
         // };
         setTimeout(() => {