Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -7187,7 +7187,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
                 "课堂观察",
                 $$("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' },
+                "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                 "onresize": function () { }
             }, {
                 closecallback: function () { }

js/Desktop/Onload.js

@@ -688,7 +688,7 @@ U.MD.D.getuser2 = function (userid, cid) {
             
                     US.userInfo = res.value[0][0];
                     $(".avatar")[0].style.display = "block";
-                    if (res.value[0][0].type === 1 && $(".U_PBL_Check")[0] && res.value[0][0].org != '150e3120-9195-11ed-b13d-005056b86db5') {
+                    if (res.value[0][0].type === 1 && $(".U_PBL_Check")[0] && res.value[0][0].org != '150e3120-9195-11ed-b13d-005056b86db5' && res.value[0][0].org != 'b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc') {
                         $(".U_PBL_Check")[0].style.display = "block";
                     }
                     $(".login")[0].style.display = "none";
@@ -1094,7 +1094,7 @@ function loginPan(userInfo, userId) {
   if (
     userInfo.type === 1 &&
     $(".U_PBL_Check")[0] &&
-    userInfo.org != "150e3120-9195-11ed-b13d-005056b86db5"
+    userInfo.org != "150e3120-9195-11ed-b13d-005056b86db5" && userInfo.org != 'b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc'
   ) {
     $(".U_PBL_Check")[0].style.display = "block";
   }

szdjg/Onload.js

@@ -446,7 +446,7 @@ U.MD.D.getuser = function () {
                                     
                                     US.userInfo = res.value[0][0];
                                     $(".avatar")[0].style.display = "block";
-                                    if(res.value[0][0].type === 1 && $(".U_PBL_Check")[0] && res.value[0][0].org != '150e3120-9195-11ed-b13d-005056b86db5'){
+                                    if(res.value[0][0].type === 1 && $(".U_PBL_Check")[0] && res.value[0][0].org != '150e3120-9195-11ed-b13d-005056b86db5' && res.value[0][0].org != 'b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc'){
                                         $(".U_PBL_Check")[0].style.display = "block";
                                     }
                                 }
@@ -676,7 +676,7 @@ U.MD.D.getuser2 = function (userid, cid) {
 
         US.userInfo = res.value[0][0];
         $(".avatar")[0].style.display = "block";
-        if (res.value[0][0].type === 1 && $(".U_PBL_Check")[0] && res.value[0][0].org != '150e3120-9195-11ed-b13d-005056b86db5') {
+        if (res.value[0][0].type === 1 && $(".U_PBL_Check")[0] && res.value[0][0].org != '150e3120-9195-11ed-b13d-005056b86db5' && res.value[0][0].org != 'b47d2ea8-7044-4810-9cb7-3aaf8b74cfbc') {
             $(".U_PBL_Check")[0].style.display = "block";
         }
         $(".login")[0].style.display = "none";