Merge branch 'beta'

js/Desktop/DeskTop.js

@@ -1532,7 +1532,7 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
         )
     }
 
-    if (_oid == "215340ee-8f22-11ee-b98c-005056b86db5") {
+    if (_oid == "215340ee-8f22-11ee-b98c-005056b86db5" || _oid == "1bc66f4e-8798-11ee-b98c-005056b86db5") {
         _teacherDesktopIconInfo.push(
             { "Name": "AI助手+", "Url": "aigpt", "style": { "cssText": "background-image:url(/img/icon/aigpt.png)" } },
         )
@@ -3478,6 +3478,40 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                 }, { "style": { "height": "36px" } }).form; //创建窗体
                 break;
             }
+        case "dataBoardSZArea":
+            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/#/sz/dataBoardArea?userid=" + _userid + "&oid=" + _oid + "&org=" + _org }), {
+                    "id": "dataBoardSZArea",
+                    "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
+                    "onresize": function () { }
+                }, {
+                    closecallback: function () { }
+                }, { "style": { "height": "36px" } }).form; //创建窗体
+                break;
+            }
+        case "dataBoardSZCity":
+            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/#/sz/dataBoardCity?userid=" + _userid + "&oid=" + _oid + "&org=" + _org }), {
+                    "id": "dataBoardSZCity",
+                    "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) {

js/Desktop/Onload.js

@@ -438,8 +438,8 @@ U.MD.D.getuser = function () {
                                         $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
                                         US.Config.background = 'url("/img/icon/chjyjBg.png")'
                                     } else if (res.value[0][0].org == '2a9f32ea-88df-49eb-aba1-0a286f691474') {
-                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.png")'
-                                        US.Config.background = 'url("/img/icon/qhBg.png")'
+                                        $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.jpg")'
+                                        US.Config.background = 'url("/img/icon/qhBg.jpg")'
                                     }
                             
                                     
@@ -557,7 +557,7 @@ U.MD.D.getuser = function () {
             } else if (userInfo.org == '2fa75e51-189a-11ee-91d8-005056b86db5') {
                 $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
             } else if (userInfo.org == '2a9f32ea-88df-49eb-aba1-0a286f691474') {
-                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.png")'
+                $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.jpg")'
             }
         }
     }
@@ -669,8 +669,8 @@ U.MD.D.getuser2 = function (userid, cid) {
             $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/chjyjBg.png")'
             US.Config.background = 'url("/img/icon/chjyjBg.png")'
         } else if (res.value[0][0].org == '2a9f32ea-88df-49eb-aba1-0a286f691474') {
-            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.png")'
-            US.Config.background = 'url("/img/icon/qhBg.png")'
+            $("#U_MD_D_BG")[0].style.backgroundImage = 'url("/img/icon/qhBg.jpg")'
+            US.Config.background = 'url("/img/icon/qhBg.jpg")'
         }
 
         US.userInfo = res.value[0][0];