Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -659,7 +659,9 @@ U.MD.D.I.siesteacherDeskIcon = [
     // { "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": "gpt4 turbo", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.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)" } },
 ];
 
 //教科院实小教师桌面图标的全局变量
@@ -1353,7 +1355,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             // { "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": "gpt4 turbo", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
+            { "Name": "AI助手", "Url": "gpt4", "style": { "cssText": "background-image:url(/img/icon/gpt4.png)" } },
         )
     }
     // if (_oid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
@@ -4736,7 +4738,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             break;
         case "gpt4": //gpt4
             _formdiv = new U.UF.UI.form(
-                "gpt4 turbo",
+                "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/" }), {
                 "id": "ainew",
                 "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
@@ -4744,7 +4746,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             }, {
                 closecallback: function () { }
             }, { "style": { "height": "36px" } }).form; //创建窗体
-            _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/gpt4.png)" }, "name": "gpt4 turbo", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
+            _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 "futureClass": //AI共创
@@ -4892,6 +4894,33 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             _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;
+            
     }