lsc 2 years ago
parent
commit
84112c588e
2 changed files with 15 additions and 27 deletions
  1. 8 20
      js/Desktop/DeskTop.js
  2. 7 7
      js/gm/DeskTop.js

+ 8 - 20
js/Desktop/DeskTop.js

@@ -912,7 +912,7 @@ U.MD.D.I.openInApplication = function(str, data, screenType, tType) {
             } else {
                 _formdiv = new U.UF.UI.form(
                     "项目详情",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetail?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetail?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
                     "id": "studyDetail",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                     "onresize": function () { }
@@ -930,7 +930,7 @@ U.MD.D.I.openInApplication = function(str, data, screenType, tType) {
                 } else {
                     _formdiv = new U.UF.UI.form(
                         "项目详情",
-                        $$("iframe", { "allow": "camera *; microphone *,display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetailGM?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
+                        $$("iframe", { "allow": "camera *; microphone *;display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetailGM?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
                         "id": "studyDetail",
                         "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                         "onresize": function () { }
@@ -948,7 +948,7 @@ U.MD.D.I.openInApplication = function(str, data, screenType, tType) {
             } else {
                 _formdiv = new U.UF.UI.form(
                     "汉字宫",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//school.hanzigon.cn/?appid=734714090237947#/material/video?grade_id=62&lesson_code=621&id=2432" }), {
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//school.hanzigon.cn/?appid=734714090237947#/material/video?grade_id=62&lesson_code=621&id=2432" }), {
                     "id": "hanUrl",
                     "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                     "onresize": function () { }
@@ -1123,7 +1123,7 @@ U.MD.D.I.openApplication = function(str, obj, info) {
             case "studentStudy":
                 _formdiv = new U.UF.UI.form(
                     "学习中心",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _SscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _SscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
                         "id": "studentStudy",
                         "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                         "onresize": function() {}
@@ -1337,7 +1337,7 @@ U.MD.D.I.openApplication = function(str, obj, info) {
             case "studentStudy":
                 _formdiv = new U.UF.UI.form(
                     "学习中心",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _SscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _SscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
                         "id": "studentStudy",
                         "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                         "onresize": function() {}
@@ -1600,7 +1600,7 @@ U.MD.D.I.openApplication = function(str, obj, info) {
 
                 _formdiv = new U.UF.UI.form(
                     "学习中心",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _TscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _TscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
                         "id": "study",
                         "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                         "onresize": function() {}
@@ -1784,7 +1784,7 @@ U.MD.D.I.openApplication = function(str, obj, info) {
 
                 _formdiv = new U.UF.UI.form(
                     "学习中心",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _TscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _TscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
                         "id": "study",
                         "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                         "onresize": function() {}
@@ -1956,7 +1956,7 @@ U.MD.D.I.openApplication = function(str, obj, info) {
         case "GeoGebra": //GeoGebra
             _formdiv = new U.UF.UI.form(
                 "GeoGebra",
-                $$("iframe", { "allow": "camera *; microphone *,display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "","frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//www.geogebra.org/calculator" }), {
+                $$("iframe", { "allow": "camera *; microphone *;display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "","frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//www.geogebra.org/calculator" }), {
                     "id": "GeoGebra",
                     "style": { "width": "80%", "height": "90%", "overflow": 'hidden' },
                     "onresize": function() {}
@@ -2232,18 +2232,6 @@ U.MD.D.I.openApplication = function(str, obj, info) {
                 _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/number.png)" }, "name": "数字实验室", "forms": _formdiv, "click": function() { U.MD.D.I.openApplication(str, obj, info); } }
 
                 break;  
-            case "demoIndex":
-                    _formdiv = new U.UF.UI.form(
-                        "学习中心",
-                        $$("iframe", { "allow": "camera *; microphone *;display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "","frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _SscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
-                        "id": "studentStudy",
-                        "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
-                        "onresize": function () { }
-                    }, {
-                        closecallback: function () { }
-                    }, { "style": { "height": "36px" } }).form; //创建窗体
-                    _taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/study.png)" }, "name": "学习中心", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
-                    break;
     }
 
 

+ 7 - 7
js/gm/DeskTop.js

@@ -755,7 +755,7 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
             } else {
                 _formdiv = new U.UF.UI.form(
                     "项目详情",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetail?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetail?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
                     "id": "studyDetail",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                     "onresize": function () { }
@@ -773,7 +773,7 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
             } else {
                 _formdiv = new U.UF.UI.form(
                     "项目详情",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetailGM?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/courseDetailGM?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
                     "id": "studyDetail",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                     "onresize": function () { }
@@ -791,7 +791,7 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
             } else {
                 _formdiv = new U.UF.UI.form(
                     "汉字宫",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//school.hanzigon.cn/?appid=734714090237947#/material/video?grade_id=62&lesson_code=621&id=2432" }), {
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture", "webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "//school.hanzigon.cn/?appid=734714090237947#/material/video?grade_id=62&lesson_code=621&id=2432" }), {
                     "id": "hanUrl",
                     "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                     "onresize": function () { }
@@ -966,7 +966,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             case "studentStudy":
                 _formdiv = new U.UF.UI.form(
                     "学习中心",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _SscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _SscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
                     "id": "studentStudy",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                     "onresize": function () { }
@@ -1180,7 +1180,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
             case "studentStudy":
                 _formdiv = new U.UF.UI.form(
                     "学习中心",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _SscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _SscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
                     "id": "studentStudy",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                     "onresize": function () { }
@@ -1443,7 +1443,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
 
                 _formdiv = new U.UF.UI.form(
                     "学习中心",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _TscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _TscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
                     "id": "study",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                     "onresize": function () { }
@@ -1627,7 +1627,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
 
                 _formdiv = new U.UF.UI.form(
                     "学习中心",
-                    $$("iframe", { "allow": "camera *; microphone *,display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _TscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
+                    $$("iframe", { "allow": "camera *; microphone *;display-capture","webkitallowfullscreen": "", "mozallowfullscreen": "", "allowfullscreen": "", "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0;width:100%;height:100%" }, "src": "https://pbl.cocorobo.cn/pbl-student-table/dist/#/index?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&tType=" + _type + "&cid=" + _classId + "&screenType=" + _TscreenType }), { //https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
                     "id": "study",
                     "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
                     "onresize": function () { }