Merge branch 'beta' into HK

js/Desktop/DeskTop.js

@@ -767,7 +767,7 @@ U.MD.D.I.hkaceteacherDeskIcon = [
     // { "Name": "AI Agent", "Url": "aiagent", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.png)" } },
     { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
-    { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
+    { "Name": "課堂觀察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
 ];
 
 //hk
@@ -988,19 +988,19 @@ U.MD.D.I.szjkyTeacherDeskIcon = [
     { "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": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.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": "class", "style": { "cssText": "background-image:url(/img/icon/class.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": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
-    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
-    // { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
-    { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
-    { "Name": "教师管理", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
-    { "Name": "教师中心", "Url": "testStudent", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
+    { "Name": "教師管理", "Url": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.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": "class", "style": { "cssText": "background-image:url(/img/icon/class.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": "AI協同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "協同建構", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    // { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "教師管理", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
+    { "Name": "教師中心", "Url": "testStudent", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
     // { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
@@ -1013,19 +1013,19 @@ U.MD.D.I.szjkyAdminDeskIcon = [
     { "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": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.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": "class", "style": { "cssText": "background-image:url(/img/icon/class.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": "AI协同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
-    { "Name": "协同建构", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
-    // { "Name": "数据看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
-    { "Name": "综合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
-    { "Name": "教师管理", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
-    { "Name": "教师中心", "Url": "testStudent", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
+    { "Name": "教師管理", "Url": "tcTeacher", "style": { "cssText": "background-image:url(/img/icon/teacher.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": "class", "style": { "cssText": "background-image:url(/img/icon/class.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": "AI協同", "Url": "ainew", "style": { "cssText": "background-image:url(/img/icon/AIChat.png)" } },
+    { "Name": "協同建構", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    // { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "教師管理", "Url": "testTeacher", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
+    { "Name": "教師中心", "Url": "testStudent", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
     // { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
     { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
@@ -1484,8 +1484,8 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "教師中心", "Url": "testStudent", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
             { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
             { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
-            { "Name": "观察记录", "Url": "Record", "style": { "cssText": "background-image:url(/img/icon/Record.png)" } },
-            { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
+            { "Name": "觀察記錄", "Url": "Record", "style": { "cssText": "background-image:url(/img/icon/Record.png)" } },
+            { "Name": "課堂觀察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
         )
     }
     // if (_oid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
@@ -3454,14 +3454,14 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                     }, 2000);
                 } else {
                     _formdiv = new U.UF.UI.form(
-                        "课程管理",
+                        "課程管理",
                         $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/newAddCourse?cid=" + data + "&userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
                         "id": "openCourseNewUpdate",
                         "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                         "onresize": function () { }
                     }, {
                         closecallback: function () { }
-                    }, { "style": { "height": "36px" } }).form; //创建窗体
+                    }, { "style": { "height": "36px" } }).form; //創建窗體
                     break;
                 }
         case "openCourseEUpdate":
@@ -3488,14 +3488,14 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                     }, 2000);
                 } else {
                     _formdiv = new U.UF.UI.form(
-                        "课程管理",
+                        "課程管理",
                         $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/newAddCourse?cid=" + data + "&userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
                         "id": "openCourseUpdate",
                         "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                         "onresize": function () { }
                     }, {
                         closecallback: function () { }
-                    }, { "style": { "height": "36px" } }).form; //创建窗体
+                    }, { "style": { "height": "36px" } }).form; //創建窗體
                     break;
                 }
         case "inviteLoginSz":
@@ -3507,11 +3507,11 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 "onresize": function () { }
             }, {
                 closecallback: function () { }
-            }, { "style": { "height": "36px" } }).form; //创建窗体
+            }, { "style": { "height": "36px" } }).form; //創建窗體
             break;
         case "loginSz":
             _formdiv = new U.UF.UI.form(
-                "教师登录",
+                "教師登錄",
                 $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://edu.cocorobo.cn/ResourcesLogin" }), {
                 "id": "loginSz",
                 "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
@@ -3578,14 +3578,14 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 }, 2000);
             } else {
                 _formdiv = new U.UF.UI.form(
-                    "课堂观察",
+                    "課堂觀察",
                     $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://beta.cloud.cocorobo.cn/aigpt/#/classroom_observation_board?tid="+data }), {
                     "id": "classroom_observation_board",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                     "onresize": function () { }
                 }, {
                     closecallback: function () { }
-                }, { "style": { "height": "36px" } }).form; //创建窗体
+                }, { "style": { "height": "36px" } }).form; //創建窗體
                 break;
             }
     }
@@ -5434,7 +5434,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             break;
         case "szdjgPython": //python編程
             _formdiv = new U.UF.UI.form(
-                "Python编程",
+                "Python編程",
                 $$("iframe", { "allow": "camera *; microphone *;display-capture;midi;encrypted-media;", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://cloud.cocorobo.cn/course_resource/cocoblockly-x/python/index.html" }), {
                 "id": "szdjgPython",
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
@@ -5453,32 +5453,32 @@ U.MD.D.I.openApplication = function (str, obj, info) {
                 "onresize": function () { }
             }, {
                 closecallback: function () { }
-            }, { "style": { "height": "36px" } }).form; //创建窗体
-            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/Record.png)" }, "name": "观察记录", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+            }, { "style": { "height": "36px" } }).form; //創建窗體
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/Record.png)" }, "name": "觀察記錄", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
             break;
         case "aigptCourse":
                 _formdiv = new U.UF.UI.form(
-                    "AI智能体",
+                    "AI智能體",
                     $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://cloud.cocorobo.cn/aigpt/?userid" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role + '#/AgentVue' }), {
                     "id": "aigptCourse",
                     "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                     "onresize": function () { }
                 }, {
                     closecallback: function () { }
-                }, { "style": { "height": "36px" } }).form; //创建窗体
-                _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/aigptCourse.png)" }, "name": "AI智能体", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+                }, { "style": { "height": "36px" } }).form; //創建窗體
+                _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/aigptCourse.png)" }, "name": "AI智能體", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
                 break;
         case "classroomObservation":
             _formdiv = new U.UF.UI.form(
-                "课堂观察",
+                "課堂觀察",
                 $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/classroomObservation?userid=" + _userid + "&oid=" + _oid + "&org=" + _org }), {
                 "id": "classroomObservation",
                 "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                 "onresize": function () { }
             }, {
                 closecallback: function () { }
-            }, { "style": { "height": "36px" } }).form; //创建窗体
-            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/aigptCourse.png)" }, "name": "课堂观察", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+            }, { "style": { "height": "36px" } }).form; //創建窗體
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/aigptCourse.png)" }, "name": "課堂觀察", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
             break;
     }