Merge branch 'beta' into HK

ai.html

@@ -8,8 +8,8 @@
     <meta http-equiv="Cache-Control" content="no-transform" />
     <meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1" />
     <meta name="renderer" content="webkit" />
-    <meta name="application-name" content="智慧课堂平台" />
-    <meta name="msapplication-tooltip" content="智慧课堂平台" />
+    <meta name="application-name" content="人工智能平台5" />
+    <meta name="msapplication-tooltip" content="人工智能平台5" />
     <meta http-equiv="pragma" content="no-cache" />
     <meta http-equiv="Cache-Control" content="no-cache, must-revalidate" />
     <meta http-equiv="expires" content="Wed, 26 Feb 1997 08:21:57 GMT" />
@@ -33,7 +33,7 @@
     <link rel="apple-touch-icon-precomposed" sizes="72x72" href="" />
     <link rel="apple-touch-icon-precomposed" sizes="144x144" href="" />
     <link href="img/favicon.ico" rel="Shortcut Icon" />
-    <title>智慧平台</title>
+    <title>人工智能平台5</title>
     <link href="css/Desktop/Desktop.css" rel="stylesheet" type="text/css" />
     <link href="./css/Desktop/Desktop.css" rel="stylesheet" type="text/css" />
     <link href="css/Desktop/Taskbar.css" rel="stylesheet" type="text/css" />

js/Controls/Basic.js

@@ -2045,7 +2045,7 @@ U.UF.UI.form.prototype = {
                             //关闭任务栏处理
                             if (U.MD.D.T.taskbar.close) {
                                 U.MD.D.T.taskbar.close({ "forms": _formel });
-                                U.MD.N.urlWrite("", "智慧课堂平台");
+                                //U.MD.N.urlWrite("", "智慧课堂平台");
                             }
                         } catch (e) { }
                         //回调处理

js/Controls/Basic/Form.js

@@ -20,7 +20,7 @@ Namespace.register("U.UF.UI") //窗体的命名空间
  * @param	object	关闭、放大、缩小按钮区域的属性设置 { "style":{"left":"100px"}} 选填，有默认属性，原函数有注释
  * @param	element	窗体追加到制定的元素 选填 有默认的属性，原函数有注释
  */
-U.UF.UI.form = function(title, content, formattr, formfun, headattr, contentattr, headbottomattr, parentel) {
+U.UF.UI.form = function (title, content, formattr, formfun, headattr, contentattr, headbottomattr, parentel) {
     var _this = this;
     //所有的窗体中找到是否已经创建的窗体
     if (formattr && U.UF.UI.form.allForm[formattr.id]) {
@@ -89,7 +89,7 @@ U.UF.UI.form.allForm = {};
 U.UF.UI.form.prototype = {
     /** 初始化uform窗体
      */
-    create: function() {
+    create: function () {
         var i, //用于循环 
             _resizefun,
             _formel, //窗体元素
@@ -105,7 +105,7 @@ U.UF.UI.form.prototype = {
             _headattr = this.headattr || {}, //头部属性
             _contentattr = this.contentattr || {}, //内容的属性
             _replaceel = U.UF.UI.form.allForm[_formattr.id] ? U.UF.UI.form.allForm[_formattr.id].form : null //得到之前创建的窗体，如果窗体存在，那么下面创建后直接替换
-        ;
+            ;
         //窗体的统一属性设置，默认属性
         if (_formattr.style) {
             _formattr.style.cssText = _formattr.style.cssText || "";
@@ -115,7 +115,7 @@ U.UF.UI.form.prototype = {
                 cssText: "width: 70%; position: fixed; border: 1px solid #444; background-color: #fff; z-index: 10; border-radius: 1px; overflow: hidden;  -moz-box-shadow:0 0 30px 5px #555; -webkit-box-shadow:0 0 30px 5px #555; box-shadow:0 0 30px 5px #555; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius:5px;"
             };
         }
-        _formattr.close = U.UF.C.apply(this, function() { //关闭窗体;
+        _formattr.close = U.UF.C.apply(this, function () { //关闭窗体;
             U.UF.F.closeWindow(this.form); //关闭窗体
         });
         _formattr.usform = "true"; //设置窗体的属性，作为窗体的识别，有助于调用的用户通过js找到所有的窗体
@@ -124,13 +124,13 @@ U.UF.UI.form.prototype = {
         if (_formattr.onresize) {
             _resizefun = _formattr.onresize;
             _mousedown = _formattr.onmousedown;
-            _formattr.onresize = U.UF.C.apply(this, function() { //当窗体大小发生变化的处理
+            _formattr.onresize = U.UF.C.apply(this, function () { //当窗体大小发生变化的处理
                 this.size(); //大小变化处理
                 if (_resizefun) {
                     _resizefun(); //大小变化回调
                 }
             });
-            _formattr.onmousedown = U.UF.C.apply(this, function() {
+            _formattr.onmousedown = U.UF.C.apply(this, function () {
                 //窗体点击置顶的处理
                 if (this.istop !== false) {
                     this.top(); //大小变化处理
@@ -140,7 +140,7 @@ U.UF.UI.form.prototype = {
                 }
             });
         } else if (_formattr.onresize !== false) {
-            _formattr.onresize = U.UF.C.apply(this, function() { //当窗体大小发生变化的处理
+            _formattr.onresize = U.UF.C.apply(this, function () { //当窗体大小发生变化的处理
                 this.size(); //大小变化处理
             });
         }
@@ -167,7 +167,7 @@ U.UF.UI.form.prototype = {
             }
             //设置头部有拖拽事件
             if (this.isdrag) { //判断是否允许拖动窗体
-                _headattr.onmousedown = function() {
+                _headattr.onmousedown = function () {
                     U.UF.F.drag(_formel); //拖动事件调用
                 };
             }
@@ -210,7 +210,7 @@ U.UF.UI.form.prototype = {
         this.middle = _contentchildel; //中间的内容
         //在头部不存在的情况下，设置中间内容可以拖动
         if (this.title === false && this.isdrag) {
-            _contentel.onmousedown = function() {
+            _contentel.onmousedown = function () {
                 U.UF.F.drag(_formel); //拖动事件调用
             };
         }
@@ -220,22 +220,22 @@ U.UF.UI.form.prototype = {
             _stretchingel = $$("div", { style: { "cssText": "display: block;" } }, _formel);
             //拉伸的信息 key代表样式的结尾,value代表拉伸的方向
             _stretchinginfo = {
-                    "top": "cursor: n-resize; left: 0px; top: 0px; width: 100%; height: 5px;",
-                    "rightTop": "cursor: ne-resize; right: -2px; top: -2px; width: 12px; height: 12px;",
-                    "leftTop": "cursor: nw-resize; top: 0px; left: 0px; width: 12px; height: 12px;",
-                    "left": "cursor: w-resize; left: 0px; top: 0px; width: 5px; height: 100%;",
-                    "right": "cursor: e-resize; right: 0px; top: 0px; width: 5px; height: 100%;",
-                    "bottom": "cursor: s-resize; left: 0px; bottom: 0px; width: 100%; height: 5px;",
-                    "leftBottom": "cursor: sw-resize; left: -2px; bottom: -2px; width: 12px; height: 12px;",
-                    "rightBottom": "cursor: se-resize; right: -2px; bottom: -2px; width: 12px; height: 12px;"
-                }
-                //循环创建拉伸条，包含上、下、左、右、上左、下左、上右、下右
+                "top": "cursor: n-resize; left: 0px; top: 0px; width: 100%; height: 5px;",
+                "rightTop": "cursor: ne-resize; right: -2px; top: -2px; width: 12px; height: 12px;",
+                "leftTop": "cursor: nw-resize; top: 0px; left: 0px; width: 12px; height: 12px;",
+                "left": "cursor: w-resize; left: 0px; top: 0px; width: 5px; height: 100%;",
+                "right": "cursor: e-resize; right: 0px; top: 0px; width: 5px; height: 100%;",
+                "bottom": "cursor: s-resize; left: 0px; bottom: 0px; width: 100%; height: 5px;",
+                "leftBottom": "cursor: sw-resize; left: -2px; bottom: -2px; width: 12px; height: 12px;",
+                "rightBottom": "cursor: se-resize; right: -2px; bottom: -2px; width: 12px; height: 12px;"
+            }
+            //循环创建拉伸条，包含上、下、左、右、上左、下左、上右、下右
             for (i in _stretchinginfo) {
                 $$("div", {
                     "style": {
                         "cssText": "position: absolute; overflow: hidden; display: block; z-index: 10;" + _stretchinginfo[i]
                     },
-                    "onmousedown": U.UF.C.closure(function(scope, typename) {
+                    "onmousedown": U.UF.C.closure(function (scope, typename) {
                         //拉伸函数的调用
                         U.UF.F.stretching(_formel, typename, U.UF.C.apply(scope, scope.size));
                     }, [this, i])
@@ -257,15 +257,15 @@ U.UF.UI.form.prototype = {
                 },
                 "title": "点击关闭",
                 "onmousedown": U.UF.EV.stopBubble,
-                "onclick": U.UF.C.apply(this, function() {
+                "onclick": U.UF.C.apply(this, function () {
                     U.UF.F.closeWindow(this.form); //调用窗体关闭函数
                     try {
                         //关闭任务栏处理
                         if (U.MD.D.T.taskbar.close) {
                             U.MD.D.T.taskbar.close({ "forms": _formel });
-                            U.MD.N.urlWrite("", "智慧课堂平台");
+                            //U.MD.N.urlWrite("", "智慧课堂平台");
                         }
-                    } catch (e) {}
+                    } catch (e) { }
                     //回调处理
                     if (U.UF.C.isFunction(this.closecallback)) {
                         this.closecallback();
@@ -284,7 +284,7 @@ U.UF.UI.form.prototype = {
                 "title": "最大化",
                 "onmousedown": U.UF.EV.stopBubble,
                 //最大化点击事件处理
-                "onclick": function() {
+                "onclick": function () {
                     U.UF.F.windowZooming(_formel); //调用窗体最大化函数
                 }
             }, _headbottom);
@@ -292,7 +292,7 @@ U.UF.UI.form.prototype = {
             //如果有head头部的处理
             if (_headel) {
                 //头部双击放大缩小处理处理
-                _headel.ondblclick = U.UF.C.apply(_headel, function() {
+                _headel.ondblclick = U.UF.C.apply(_headel, function () {
                     //判断双击的元素是否在头部导航上，否则如果头部上有其他的按钮什么的双击了，也会触发放大方法
                     if (event.srcElement == this || U.UF.EL.isChild(this, event.srcElement)) {
                         _enlargeel.onclick(); //放大的处理
@@ -310,7 +310,7 @@ U.UF.UI.form.prototype = {
                 },
                 "title": "最小化",
                 "onmousedown": U.UF.EV.stopBubble,
-                "onclick": function() {
+                "onclick": function () {
                     U.UF.F.windowMinimize(_formel); //窗体最小化处理
                 }
             }, _headbottom);
@@ -338,12 +338,12 @@ U.UF.UI.form.prototype = {
     },
     /** 窗体每一次点击置顶
      */
-    top: function() {
+    top: function () {
         U.UF.F.topWindow(this.form); //点击置顶的处理
     },
     /** 窗体大小处理
      */
-    size: function() {
+    size: function () {
         var _headheight = 0; //head头部的高度
         //如果存在head头部，那么获取head头部处理
         if (this.header) {
@@ -360,7 +360,7 @@ U.UF.UI.form.prototype = {
 
 /** 窗体大小处理
  */
-U.UF.UI.form.windowResize = function() {
+U.UF.UI.form.windowResize = function () {
     var i,
         _style,
         _bodywidth = US.width, //获取原本在窗体大小没有变化前的width
@@ -370,7 +370,7 @@ U.UF.UI.form.windowResize = function() {
         _height, //高度
         _formel, //窗体元素
         _forms = U.UF.UI.form.allForm //获取所有的窗体
-    ;
+        ;
     //循环所有的窗体
     for (i in _forms) {
         _formel = _forms[i].form; //获取窗体的处理
@@ -399,7 +399,7 @@ U.UF.UI.form.windowResize = function() {
 
 /** 关闭所有的窗体
  */
-U.UF.UI.form.closeWindows = function() {
+U.UF.UI.form.closeWindows = function () {
     var i;
     for (i in U.UF.UI.form.allForm) {
         if (U.UF.UI.form.allForm[i].isclose) {

js/Controls/index.js

@@ -2031,7 +2031,7 @@ U.UF.UI.form.prototype = {
                         //关闭任务栏处理
                         if (U.MD.D.T.taskbar.close) {
                             U.MD.D.T.taskbar.close({ "forms": _formel });
-                            U.MD.N.urlWrite("", "智慧课堂平台");
+                            //U.MD.N.urlWrite("", "智慧课堂平台");
                         }
                     } catch (e) { }
                     //回调处理

js/Desktop/DeskTop.js

@@ -767,6 +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)" } },
 ];
 
 //hk
@@ -987,21 +988,21 @@ 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)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
 
 //未來教育基地
@@ -1012,21 +1013,21 @@ 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)" } },
+    { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
 ];
 
 //未來教育基地
@@ -1483,7 +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": "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') {
@@ -3123,6 +3125,8 @@ window.addEventListener('message', function (e) { // 監聽 message 事件
         U.MD.D.I.openInApplication("hanUrl", '', '', '')
     } else if (e.data.tools && e.data.tools == "46") {
         U.MD.D.I.openApplication("project")
+    } else if (e.data.tools && e.data.tools == "71") {
+        U.MD.D.I.openApplication("aigptCourse")
     } else if (e.data.tools && e.data.tools == "1s") {
         U.MD.D.I.openApplicationJieS("whiteboard", e.data.cid, e.data.stage, e.data.task, e.data.tool)
     } else if (e.data.tools && e.data.tools == "3s") {
@@ -3195,7 +3199,17 @@ window.addEventListener('message', function (e) { // 監聽 message 事件
         U.MD.D.I.openInApplication("openCourseUpdate", e.data.cid)
     }else if (e.data.tools && e.data.tools == "openCourseEUpdate") {
         U.MD.D.I.openInApplication("openCourseEUpdate", e.data.cid)
+    }else if (e.data.tools && e.data.tools == "openNewCourseUpdate") {
+        U.MD.D.I.openInApplication("openNewCourseUpdate", e.data.cid)
+    }else if (e.data.tools && e.data.tools == "inviteLoginSz") {
+        U.MD.D.I.openInApplication("inviteLoginSz", e.data.cid)
+    }else if (e.data.tools && e.data.tools == "loginSz") {
+        U.MD.D.I.openInApplication("loginSz")
+    }else if (e.data.tools && e.data.tools == "classroom_observation_board"){
+        U.MD.D.I.openInApplication("classroom_observation_board", e.data.type)
     }
+    
+
 });
 
 U.MD.D.I.selectUser = function () {
@@ -3433,6 +3447,23 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 }, { "style": { "height": "36px" } }).form; //創建窗體
                 break;
             }
+        case "openNewCourseUpdate":
+                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-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; //创建窗体
+                    break;
+                }
         case "openCourseEUpdate":
             if (!_userinfo || Object.keys(_userinfo).length === 0) {
                 setTimeout(() => {
@@ -3450,11 +3481,39 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 }, { "style": { "height": "36px" } }).form; //創建窗體
                 break;
             }
+        case "openCourseNewUpdate":
+                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-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; //创建窗体
+                    break;
+                }
         case "inviteLoginSz":
             _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/#/inviteLoginSZ?code=" + data }), {
-                "id": "inviteLoginSz",
+                "id": "loginSz",
+                "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
+                "onresize": function () { }
+            }, {
+                closecallback: function () { }
+            }, { "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' },
                 "onresize": function () { }
             }, {
@@ -3512,6 +3571,23 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 }, { "style": { "height": "36px" } }).form; //創建窗體
                 break;
             }
+        case "classroom_observation_board":
+            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": "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; //创建窗体
+                break;
+            }
     }
 }
 U.MD.D.I.openApplication = function (str, obj, info) {
@@ -5358,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' },
@@ -5377,11 +5453,35 @@ 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智能体",
+                    $$("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); } }
+                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); } }
             break;
     }
-
+    
 
     //U.MD.D.I.openClick(str);
     //如果有任務欄信息

js/Desktop/Onload.js

@@ -342,6 +342,10 @@ U.MD.D.getuser = function () {
                                         window.location.reload();
                                     }, [], { "type": "POST", "withCredentials": true });
                                 } else {
+                                    if(res.value[0][0].isLogin1 == 2 || res.value[0][0].isLogin2 == 2){
+                                        U.MD.U.LO.logoutSystem2();
+                                        return;
+                                    }
                                     U.A.Request(US.Config.pbl + "addLoginOperation", [_user.userid], function (res) {
                                     }, [], { "type": "POST", "withCredentials": true });
 
@@ -395,6 +399,9 @@ U.MD.D.getuser = function () {
                                     } else if (res.value[0][0].organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
                                         US.Config.background = 'url("/img/icon/longhuaZXBg.png")'
+                                    } else if (res.value[0][0].organizeid == 'f297fbdc-f0a0-11ee-b534-005056b86db5') {
+                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/010606.png")'
+                                        US.Config.background = 'url("/img/icon/010606.png")'
                                     }
                                     
                                     
@@ -460,7 +467,12 @@ U.MD.D.getuser = function () {
                                 }else{
                                     U.MD.D.I.initDesktopIcons($("#U_MD_D_K")[0], 1);
                                 }
-                                U.MD.O.P.connect(); //登錄成功後連接socket服務同步協同編輯
+                                let shareCourseId = window.location.href.indexOf("?shareCourseId=")!=-1?window.location.href.split("?shareCourseId=")[1].toString():''
+                                if(shareCourseId){
+                                    console.log(shareCourseId);
+                                    U.MD.D.I.openInApplication("studyDetail", shareCourseId, 5, 1)
+                                }
+                                U.MD.O.P.connect(); //登录成功后连接socket服务同步协同编辑
                             }, [], { "type": "GET", "withCredentials": true });
                         }
 
@@ -514,8 +526,10 @@ U.MD.D.getuser = function () {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")'
             } else if (userInfo.organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
+            } else if (userInfo.organizeid == 'f297fbdc-f0a0-11ee-b534-005056b86db5') {
+                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/010606.png")'
             }
-    
+            
             if (userInfo.org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d') {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/yantianOrgBg.png")'
             } else if (userInfo.org == '7ada499f-4ec7-11ed-8c78-005056b86db5') {
@@ -577,6 +591,10 @@ U.MD.D.getuser2 = function (userid, cid) {
         if ($("#U_MD_HomeC_Pop")[0]) {
             $("#U_MD_HomeC_Pop")[0].close(); //關閉登陸
         }
+        if(res.value[0][0].isLogin1 == 2 || res.value[0][0].isLogin2 == 2){
+            U.MD.U.LO.logoutSystem2();
+            return;
+        }
         U.A.Request(US.Config.pbl + "addLoginOperation", [userid], function (res) {
         }, [], { "type": "POST", "withCredentials": true });
 
@@ -628,6 +646,8 @@ U.MD.D.getuser2 = function (userid, cid) {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/sies.png")'
         } else if (res.value[0][0].organizeid == 'ea2a8c65-f38c-11ed-91d8-005056b86db5') {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/longhuaZXBg.png")'
+        } else if (res.value[0][0].organizeid == 'f297fbdc-f0a0-11ee-b534-005056b86db5') {
+            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/010606.png")'
         }
 
         if (res.value[0][0].org == 'eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d') {

uform.js

@@ -11970,6 +11970,29 @@ U.MD.U.LO.logoutSystem = function (callback) {
     }
 }
 
+/**
+* 禁止登录 执行推出
+*
+* @param callback {function} 登出回调函数
+*/
+U.MD.U.LO.logoutSystem2 = function (callback) {
+    //如果用户登录的情况
+    if (US.userInfo.userid) {
+        //弹出退出登录的提示
+        // U.UF.UI.confirm("是否退出" + US.userInfo.username + "账号", function () {
+        U.alert("您的账号已禁止登陆!")
+        U.A.Request(US.Config.server + "logout", [], function (res) {
+            U.A.Request(US.SCOKET, ["logout", US.userInfo.userid, US.pageId], function () {
+                setTimeout(() => {
+                    window.location.reload();
+                }, 2000);
+            }, [], { "type": "POST", "withCredentials": true }); //在状态服务退出
+        }, [], { "type": "POST", "withCredentials": true });
+        // });
+    }
+}
+
+
 //确定注销
 //b为是否清除cookie的参数。如果传递false，则清除cookie。