Merge branch 'beta'

css/Desktop/Taskbar.css

@@ -1,35 +1,196 @@
 /*任务管理器*/
 
 /*任务栏*/
-.U_MD_D_RW      { z-index:99;width:100%; height:65px; position:absolute; left:0; bottom:-60px; background-color:#505050; border-radius:0 8px 0 8px; box-shadow:0 0 30px 5px #212121; -webkit-box-shadow:0 0 30px 5px #212121; }
-#U_MD_D_RW      { width:800px; color:#FFF; height:100%; /*overflow: hidden;*/ float:left; }
-#U_MD_D_RW  div { color:#111; }
-#U_MD_D_RW .U_MD_D_BZMOA:hover   { /*background-color:transparent;*/background-color:#6F6F6F; border:0; padding:6px; }
-#U_MD_D_RW .U_MD_D_BZMO    { margin-left:4px; position:relative; }
-#U_MD_D_RW .U_MD_D_BZMON   { margin-top:4px; color:#FFF; }
-.U_MD_D_RW_L     { float:left; width:21px; height:100%; background-color:#00A8FD; position:relative;}
-.U_MD_D_RW_R     { float:right; width:21px; height:100%;background-color:#6d6d6d; position:relative;}
+.U_MD_D_RW {
+    z-index: 99;
+    width: 100%;
+    height: 65px;
+    position: absolute;
+    left: 0;
+    bottom: -60px;
+    background-color: #505050;
+    border-radius: 0 8px 0 8px;
+}
+
+#U_MD_D_RW {
+    width: 800px;
+    color: #FFF;
+    height: 100%;
+    /*overflow: hidden;*/
+    float: left;
+}
+
+#U_MD_D_RW div {
+    color: #111;
+}
+
+#U_MD_D_RW .U_MD_D_BZMOA:hover {
+    /*background-color:transparent;*/
+    background-color: #6F6F6F;
+    border: 0;
+    padding: 6px;
+}
+
+#U_MD_D_RW .U_MD_D_BZMO {
+    margin-left: 4px;
+    position: relative;
+}
+
+#U_MD_D_RW .U_MD_D_BZMON {
+    margin-top: 4px;
+    color: #FFF;
+}
+
+.U_MD_D_RW_L {
+    float: left;
+    width: 21px;
+    height: 100%;
+    background-color: #00A8FD;
+    position: relative;
+}
+
+.U_MD_D_RW_R {
+    float: right;
+    width: 21px;
+    height: 100%;
+    background-color: #6d6d6d;
+    position: relative;
+}
+
 /*.U_MD_D_RW *        { zoom:1; -moz-transform:scale(1); -webkit-transform:scale(1); -o-transform:scale(1); transform:scale(1); -ms-transform:scale(1); color:#333; }*/
-.U_MD_D_RW_T     { text-align:center; padding:5px 0; border-bottom:1px solid # color:#006699; font-size:13px; color:#FFF; margin-top:16px; }
-.U_MD_D_RW_I     { width:21px; height:45px; float:left; margin-top:19px; }
+.U_MD_D_RW_T {
+    text-align: center;
+    padding: 5px 0;
+    border-bottom: 1px solid # color:#006699;
+    font-size: 13px;
+    color: #FFF;
+    margin-top: 16px;
+}
+
+.U_MD_D_RW_I {
+    width: 21px;
+    height: 45px;
+    float: left;
+    margin-top: 19px;
+}
+
 /*.U_MD_D_RW_IO    { width:47px; height:47px; background-position:-729px -337px; margin:auto; cursor:pointer; }
 .U_MD_D_RW_IO:hover      { background-position:-787px -339px; }*/
-*.U_MD_D_RW_IO   {  width:21px;height:100%;}
-.U_MD_D_RW_CD   { width:21px;margin-top:16%;}
-.U_MD_D_RW_GU    { width:21px;height:30%;/*background-color:gray;*/}
-.U_MD_D_RW_GU:hover{background-color:gray;}
-.U_MD_D_RW_GD    { width:21px;height:30%;/*background-color:gray;*/position:absolute;bottom:0;}
-.U_MD_D_RW_GD:hover{background-color:gray;}
-.U_MD_D_RW_GU_g  { width:21px;}
-.U_MD_D_RW_GD_g  { width:21px;}
-.U_MD_D_RW .U_MD_D_T_taskbar_Name{display:none;width:115px;height:31px;background:rgba(111,111,111,1);border-radius:1px;font-size:15px;}
-#U_MD_D_RW .U_MD_D_T_taskbar_Close { display:none; width: 15px; height: 14px; background-color: red;/*border-radius: 100%;*/color: White;text-align: center;font-size: 14px;position: absolute;right: 9px;top: 8px;line-height: 11px;cursor: pointer;}
-#U_MD_D_RW .U_MD_D_BZMO:hover .U_MD_D_T_taskbar_Close { display: block;}
-#U_MD_D_RW .U_MD_D_BZMO:hover .U_MD_D_T_taskbar_Name{ display: block;}
-
-.U_MD_D_T_taskbar_Bar { position: absolute; bottom: 0; width: 80%; background-color: #555; height: 56px; left: 10%; border-bottom: 0; box-shadow: 0 0 25px 3px #555; -webkit-box-shadow: 0 0 25px 3px #555; }
-.U_MD_D_T_taskbar_Bar_Main { float: left; margin: 0 auto; width: calc(100% - 18px); height: 100%; }
-.U_MD_D_T_taskbar { width: 50px; height: 100%; float: left; margin: 3px 0 3px 3px; position: relative; }
-.U_MD_D_T_taskbar_Main, .U_MD_D_T_taskbar_Icon { width: 100%; height: 100%; }
-.U_MD_D_T_taskbar_Bar_Operate { float: right; width: 18px; line-height: 28px; display: none; }
-.U_MD_D_T_taskbar_Bar_Operate_Button { font-size: 19px; cursor: pointer; text-align: center; }
+*.U_MD_D_RW_IO {
+    width: 21px;
+    height: 100%;
+}
+
+.U_MD_D_RW_CD {
+    width: 21px;
+    margin-top: 16%;
+}
+
+.U_MD_D_RW_GU {
+    width: 21px;
+    height: 30%;
+    /*background-color:gray;*/
+}
+
+.U_MD_D_RW_GU:hover {
+    background-color: gray;
+}
+
+.U_MD_D_RW_GD {
+    width: 21px;
+    height: 30%;
+    /*background-color:gray;*/
+    position: absolute;
+    bottom: 0;
+}
+
+.U_MD_D_RW_GD:hover {
+    background-color: gray;
+}
+
+.U_MD_D_RW_GU_g {
+    width: 21px;
+}
+
+.U_MD_D_RW_GD_g {
+    width: 21px;
+}
+
+.U_MD_D_RW .U_MD_D_T_taskbar_Name {
+    display: none;
+    width: 115px;
+    height: 31px;
+    background: rgba(111, 111, 111, 1);
+    border-radius: 1px;
+    font-size: 15px;
+}
+
+#U_MD_D_RW .U_MD_D_T_taskbar_Close {
+    display: none;
+    width: 15px;
+    height: 14px;
+    background-color: red;
+    /*border-radius: 100%;*/
+    color: White;
+    text-align: center;
+    font-size: 14px;
+    position: absolute;
+    right: 9px;
+    top: 8px;
+    line-height: 11px;
+    cursor: pointer;
+}
+
+#U_MD_D_RW .U_MD_D_BZMO:hover .U_MD_D_T_taskbar_Close {
+    display: block;
+}
+
+#U_MD_D_RW .U_MD_D_BZMO:hover .U_MD_D_T_taskbar_Name {
+    display: block;
+}
+
+.U_MD_D_T_taskbar_Bar {
+    position: absolute;
+    bottom: 0;
+    width: 80%;
+    background-color: #555;
+    height: 56px;
+    left: 10%;
+    border-bottom: 0;
+    box-shadow: 0 0 25px 3px #555;
+    -webkit-box-shadow: 0 0 25px 3px #555;
+}
+
+.U_MD_D_T_taskbar_Bar_Main {
+    float: left;
+    margin: 0 auto;
+    width: calc(100% - 18px);
+    height: 100%;
+}
+
+.U_MD_D_T_taskbar {
+    width: 50px;
+    height: 100%;
+    float: left;
+    margin: 3px 0 3px 3px;
+    position: relative;
+}
+
+.U_MD_D_T_taskbar_Main,
+.U_MD_D_T_taskbar_Icon {
+    width: 100%;
+    height: 100%;
+}
+
+.U_MD_D_T_taskbar_Bar_Operate {
+    float: right;
+    width: 18px;
+    line-height: 28px;
+    display: none;
+}
+
+.U_MD_D_T_taskbar_Bar_Operate_Button {
+    font-size: 19px;
+    cursor: pointer;
+    text-align: center;
+}

js/Desktop/DeskTop.js

@@ -1488,6 +1488,13 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
             { "Name": "课堂观察", "Url": "classroomObservation", "style": { "cssText": "background-image:url(/img/icon/classroomObservation.png)" } },
         )
     }
+
+    if (_oid == '5f6c97eb-4778-11ed-8c78-005056b86db5') {//松坪学校
+        _teacherDesktopIconInfo.push(
+            { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
+        )
+    }
+    
     // if (_oid == 'c7df0bd4-6e75-401a-a137-4e163aa62263') {
     //     _teacherDesktopIconInfo.push(
     //     )
@@ -5471,7 +5478,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
         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 }), {
+                $$("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/#/classroomObservation?userid=" + _userid + "&oid=" + _oid + "&org=" + _org }), {
                 "id": "classroomObservation",
                 "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                 "onresize": function () { }