Merge branch 'beta' into HK

js/Controls/Basic.js

@@ -2039,6 +2039,7 @@ U.UF.UI.form.prototype = {
                     "title": "点击关闭",
                     "onmousedown": U.UF.EV.stopBubble,
                     "onclick": U.UF.C.apply(this, function () {
+                        this.windowstate = "close";
                         U.UF.F.closeWindow(this.form); //调用窗体关闭函数
                         try {
                             //关闭任务栏处理
@@ -2066,6 +2067,7 @@ U.UF.UI.form.prototype = {
                     "onmousedown": U.UF.EV.stopBubble,
                     //最大化点击事件处理
                     "onclick": function () {
+                        this.windowstate = "max";
                         U.UF.F.windowZooming(_formel); //调用窗体最大化函数
                     }
                 }, _headbottom);
@@ -2093,6 +2095,7 @@ U.UF.UI.form.prototype = {
                     "title": "最小化",
                     "onmousedown": U.UF.EV.stopBubble,
                     "onclick": U.UF.C.apply(this, function () {
+                        this.windowstate = "min";
                         U.UF.F.windowMinimize(_formel); //窗体最小化处理
                         //回调处理
                         if (U.UF.C.isFunction(this.narrowcallback)) {
@@ -2114,7 +2117,7 @@ U.UF.UI.form.prototype = {
         }
         else {
             //有特殊关闭处理的，需要重新加载
-            if (this.closecallback) {
+            if (this.closecallback && this.windowstate == "close") {
                 try {
                     if (this.content.tagName == "IFRAME") {
                         this.content.src += '';

js/Desktop/DeskTop.js

@@ -104,7 +104,7 @@ U.MD.D.I.teacherDeskIcon2 = [
     // { "Name": "賽諾梵", "Url": "snf", "style": { "cssText": "background-image:url(/img/icon/snf.png)" } },
     // { "Name": "漢字宮", "Url": "han", "style": { "cssText": "background-image:url(/img/icon/han.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
-    { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    // { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.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)" } },
 ];
@@ -196,6 +196,7 @@ U.MD.D.I.orgDeskIcon = [
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.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": "ytpbl", "style": { "cssText": "background-image:url(/img/icon/gpbl2.png)" } },
 ];
 
 U.MD.D.I.orgStemDeskIcon = [
@@ -216,7 +217,7 @@ U.MD.D.I.orgStemDeskIcon = [
     { "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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
     { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
 ];
@@ -453,7 +454,7 @@ U.MD.D.I.wankeTeacherDeskIcon = [ //1c3b9def-8fbe-11ed-b13d-005056b86db5
     { "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": "協同建構", "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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
 ];
 
@@ -474,7 +475,7 @@ U.MD.D.I.wankeAdminDeskIcon = [
     { "Name": "目標管理", "Url": "sys", "style": { "cssText": "background-image:url(/img/icon/evalua.png)" } },
     { "Name": "教學資源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
 ];
 
@@ -491,7 +492,7 @@ U.MD.D.I.lhsTeacherDeskIcon = [ //未來小學
     { "Name": "目標管理", "Url": "sys", "style": { "cssText": "background-image:url(/img/icon/evalua.png)" } },
     { "Name": "項目設計", "Url": "courseDesign", "style": { "cssText": "background-image:url(/img/icon/courseDesign.png)" } },
     { "Name": "教學資源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
-    { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    // { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.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)" } },
 ];
@@ -509,7 +510,7 @@ U.MD.D.I.lhsAdminDeskIcon = [ //未來小學admin
     { "Name": "目標管理", "Url": "sys", "style": { "cssText": "background-image:url(/img/icon/evalua.png)" } },
     { "Name": "項目設計", "Url": "courseDesign", "style": { "cssText": "background-image:url(/img/icon/courseDesign.png)" } },
     { "Name": "教學資源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
-    { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    // { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.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)" } },
 ];
@@ -577,7 +578,7 @@ U.MD.D.I.futianTeacherDeskIcon = [
     { "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": "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": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
@@ -593,6 +594,7 @@ U.MD.D.I.futianAdminDeskIcon = [
     { "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": "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": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
@@ -656,9 +658,13 @@ U.MD.D.I.siesteacherDeskIcon = [
     { "Name": "協同建構", "Url": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    // { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     { "Name": "數據融合", "Url": "dataBoardSies", "style": { "cssText": "background-image:url(/img/icon/dataBoardSies.png)" } },
     { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
+    { "Name": "評測看板", "Url": "dataBoardTest", "style": { "cssText": "background-image:url(/img/icon/databoardTest.png)" } },
+    { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
+    { "Name": "教師管理", "Url": "testTeacherSies", "style": { "cssText": "background-image:url(/img/icon/testTeacher.png)" } },
+    { "Name": "教師中心", "Url": "testStudentSies", "style": { "cssText": "background-image:url(/img/icon/testStudent.png)" } },
 ];
 
 //教科院實小教師桌面圖標的全局變量
@@ -667,6 +673,7 @@ U.MD.D.I.siesStudentDeskIcon = [
     { "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": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
+    { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
 ];
 
 //福田
@@ -814,7 +821,7 @@ U.MD.D.I.yunhaiTeacherDeskIcon = [
     { "Name": "目標管理", "Url": "sys", "style": { "cssText": "background-image:url(/img/icon/evalua.png)" } },
     { "Name": "項目設計", "Url": "courseDesign", "style": { "cssText": "background-image:url(/img/icon/courseDesign.png)" } },
     { "Name": "教學資源", "Url": "source", "style": { "cssText": "background-image:url(/img/icon/source.png)" } },
-    { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+    // { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.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)" } },
 ];
@@ -907,7 +914,7 @@ U.MD.D.I.dseiTeacherDeskIcon = [
     { "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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
 ];
 
@@ -953,7 +960,7 @@ U.MD.D.I.dseiAdminDeskIcon = [
     { "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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
 ];
 
@@ -985,8 +992,12 @@ U.MD.D.I.szjkyTeacherDeskIcon = [
     { "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": "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)" } },
 ];
 
 //未來教育基地
@@ -1006,8 +1017,12 @@ U.MD.D.I.szjkyAdminDeskIcon = [
     { "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": "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)" } },
 ];
 
 //未來教育基地
@@ -1079,7 +1094,7 @@ U.MD.D.I.tpcTeacherDeskIcon = [
     { "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": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
-    { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.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)" } },
 ];
 
@@ -1090,7 +1105,7 @@ U.MD.D.I.tpcAdminDeskIcon = [
     { "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": "futureClass", "style": { "cssText": "background-image:url(/img/icon/futureClass.png)" } },
-    { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.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)" } },
 ];
 
@@ -1134,7 +1149,7 @@ U.MD.D.I.thuioeTeacherDeskIcon = [
     { "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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
     { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
 ];
 
@@ -1349,10 +1364,11 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "AI Agent", "Url": "aiagent", "style": { "cssText": "background-image:url(/img/icon/AIprogram2.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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+            // { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.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": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.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)" } },
         )
     }
     // if (_oid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
@@ -1377,7 +1393,8 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         _teacherDesktopIconInfo.push(
             { "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": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.png)" } },
+            { "Name": "綜合看板", "Url": "dataBoardNew", "style": { "cssText": "background-image:url(/img/icon/dataBoardNew.png)" } },
         )
         _studentDesktopIconInfo.push(
         )
@@ -1393,14 +1410,16 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
     // 馬巒小學 和 龍華區教育科學研究院附屬學校 和 僑香學校
     if (_oid == "602a1e3d-d031-11ed-9546-005056b86db5" || _oid == "f30a6615-5379-11ed-8c78-005056b86db5" || _oid == "82fcb5c7-c13b-11ed-8d51-005056b86db5") {
         _teacherDesktopIconInfo.push(
-            { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.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)" } },
         )
     }
 
     //麒麟二中
     if (_oid == 'cf8841e8-c7c0-11ed-9546-005056b86db5') {
         _studentDesktopIconInfo.push(
-            { "Name": "數據看板", "Url": "dataBoard", "style": { "cssText": "background-image:url(/img/icon/dataBoard.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)" } },
         )
     }
 
@@ -2723,6 +2742,8 @@ window.addEventListener('message', function (e) { // 監聽 message 事件
         //3是展示全部階段  2學生 1老師 4專家
     } else if (e.data.screenType && e.data.screenType == "3") { //課程管理傳入
         U.MD.D.I.openInApplication("studyDetail", e.data.cid, 2, 1)
+    } else if (e.data.screenType && e.data.screenType == "3train") { //培訓管理傳入
+        U.MD.D.I.openInApplication("studyDetailTrain", e.data.cid, 2, 1)
     } else if (e.data.screenType && e.data.screenType == "3NT") { //課程管理傳入
         U.MD.D.I.openInApplication("studyDetailNT", e.data.cid, 2, 1)
     } else if (e.data.screenType && e.data.screenType == "3s") { //課程管理傳入
@@ -2935,6 +2956,8 @@ window.addEventListener('message', function (e) { // 監聽 message 事件
             gid: e.data.gid || '',
         }
         U.MD.D.I.openInApplication("opencCscl", _data)
+    } else if (e.data.tools && e.data.tools == "dataBoardTest") {
+        U.MD.D.I.openApplication("dataBoardTest")
     }
 });
 
@@ -2994,6 +3017,24 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/study.png)" }, "name": "課程中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
                 break;
             }
+        case "studyDetailTrain":
+                if (!_userinfo || Object.keys(_userinfo).length === 0) {
+                    setTimeout(() => {
+                        U.MD.U.L.login();
+                    }, 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-student-table/dist/#/courseDetailTrain?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
+                        "id": "studyDetailTrain",
+                        "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
+                        "onresize": function () { }
+                    }, {
+                        closecallback: function () { }
+                    }, { "style": { "height": "36px" } }).form; //創建窗體
+                    _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/study.png)" }, "name": "課程中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+                    break;
+                }
         case "studyDetailS":
             if (!_userinfo || Object.keys(_userinfo).length === 0) {
                 setTimeout(() => {
@@ -4729,6 +4770,32 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             }, { "style": { "height": "36px" } }).form; //創建窗體
             _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/AIChat.png)" }, "name": "AI協同", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
 
+            break;
+        case "gpt4": //gpt4
+            _formdiv = new U.UF.UI.form(
+                "AI助手",
+                $$("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/gpt4/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                "id": "gpt4",
+                "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
+                "onresize": function () { }
+            }, {
+                closecallback: function () { }
+            }, { "style": { "height": "36px" } }).form; //創建窗體
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/gpt4.png)" }, "name": "AI助手", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
+            break;
+        case "aigpt": //gpt4
+            _formdiv = new U.UF.UI.form(
+                "AI助手+",
+                $$("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/aigpt/?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                "id": "aigpt",
+                "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
+                "onresize": function () { }
+            }, {
+                closecallback: function () { }
+            }, { "style": { "height": "36px" } }).form; //創建窗體
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/aigpt.png)" }, "name": "AI助手+", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
             break;
         case "futureClass": //AI共創
             _formdiv = new U.UF.UI.form(
@@ -4796,6 +4863,19 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             }, { "style": { "height": "36px" } }).form; //創建窗體
             _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/dataBoardNew.png)" }, "name": "綜合看板", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
 
+            break;
+        case "dataBoardTest": //數據看板
+            _formdiv = new U.UF.UI.form(
+                "評測看板",
+                $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": US.Config.bpbl + "/pbl-teacher-table/dist/#/dataBoardTest?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                "id": "dataBoardTest",
+                "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
+                "onresize": function () { }
+            }, {
+                closecallback: function () { }
+            }, { "style": { "height": "36px" } }).form; //創建窗體
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/dataBoardTest.png)" }, "name": "評測看板", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
             break;
         case "AIAnalyse": //AI共創
             _formdiv = new U.UF.UI.form(
@@ -4874,6 +4954,48 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             }, { "style": { "height": "36px" } }).form; //創建窗體
             _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/testStudent.png)" }, "name": "評測管理", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
 
+            break;
+        case "testTeacherSies":
+            _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/#/test?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                "id": "testTeacherSies",
+                "style": { "width": "80%", "height": "80%", "overflow": 'hidden' },
+                "onresize": function () { }
+            }, {
+                closecallback: function () { }
+            }, { "style": { "height": "36px" } }).form; //創建窗體
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/testTeacher.png)" }, "name": "教師管理", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
+            break;
+        case "testStudentSies":
+            _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/#/testPerson?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&classid=" + _classId + "&role=" + _role }), {
+                "id": "testStudentSies",
+                "style": { "width": "80%", "height": "80%", "overflow": 'hidden' },
+                "onresize": function () { }
+            }, {
+                closecallback: function () { }
+            }, { "style": { "height": "36px" } }).form; //創建窗體
+            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/testStudent.png)" }, "name": "教師中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
+            break;
+        case "ytpbl": //消息通知
+            _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://pblyt.cocorobo.cn/#/login?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                "id": "ytpbl",
+                "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/gpbl2.png)" }, "name": "案例征集", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+
+
+            // window.open("https://gdpbl.cocorobo.cn/#/login", "案例征集", "height=" + US.height + ", width=" + US.width + ", top=100, left=100, toolbar=no, menubar=0,  resizable=0, location=0, status=no");
+
             break;
     }
 

js/gm/DeskTop.js

@@ -2135,7 +2135,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
         case "gpbl": //消息通知
             _formdiv = new U.UF.UI.form(
                 "案例征集",
-                $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pblgm.cocorobo.cn/#/login?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
+                $$("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://pblgm.cocorobo.cn/#/login?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&role=" + _role }), {
                 "id": "gpbl",
                 "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                 "onresize": function () { }