|
|
@@ -1225,7 +1225,11 @@ U.MD.D.I.initDesktopIcons = function (el, type) {
|
|
|
_szscTeacherDeskIconInfo = U.MD.D.I.szscTeacherDeskIcon, //网络夏令营
|
|
|
_szscOrganizerDeskIconInfo = U.MD.D.I.szscOrganizerDeskIcon; //网络夏令营
|
|
|
var _oidA = ['69893dca-1d47-11ed-8c78-005056b86db5', "91305d49-01ba-11ed-8c78-005056b86db5", "d9db3320-503a-11ed-8c78-005056b86db5", "05b62310-8cda-11ed-b13d-005056b86db5", '1c3b9def-8fbe-11ed-b13d-005056b86db5', '91305d49-01ba-11ed-8c78-005056b86db4', 'ea2a8c65-f38c-11ed-91d8-005056b86db5', '4c686762-1d0a-11ed-8c78-005056b86db5', 'b1095a3c-1d06-4ac8-854f-7c0d97f4ab41', '206c38d2-0cbe-11ee-91d8-005056b86db5'];
|
|
|
+<<<<<<< HEAD
|
|
|
var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d", "383f207d-4ced-4eeb-a15a-7b0a2f3abe7b", "150e3120-9195-11ed-b13d-005056b86db5", "ee40e8e3-e36c-4872-8105-cf395481012s", '97c4ee8b-d010-4042-986d-e9d3c217264f', 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc', '4df1b570-f6ac-48fc-8d50-d0b157dae776', 'e632b86c-f89d-11ed-91d8-005056b86db5', 'b50cf65a-001c-11ee-91d8-005056b86db5', '578de748-05d2-11ee-91d8-005056b86db5', '54f09f1e-09f0-11ee-91d8-005056b86db5', '7b016f69-0f4f-11ee-91d8-005056b86db5', '1973f6c7-1561-11ee-91d8-005056b86db5', '2fa75e51-189a-11ee-91d8-005056b86db5', 'a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956','fbb00cc1-380b-4173-add4-59b3cf7682b5','63060b4a-89dc-4f0c-bf04-a1de22d479ff'];
|
|
|
+=======
|
|
|
+ var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d", "383f207d-4ced-4eeb-a15a-7b0a2f3abe7b", "150e3120-9195-11ed-b13d-005056b86db5", "ee40e8e3-e36c-4872-8105-cf395481012s", '97c4ee8b-d010-4042-986d-e9d3c217264f', 'ec0af97a-7c10-4259-a7eb-db9cc8174cdc', '4df1b570-f6ac-48fc-8d50-d0b157dae776', 'e632b86c-f89d-11ed-91d8-005056b86db5', 'b50cf65a-001c-11ee-91d8-005056b86db5', '578de748-05d2-11ee-91d8-005056b86db5', '54f09f1e-09f0-11ee-91d8-005056b86db5', '7b016f69-0f4f-11ee-91d8-005056b86db5', '1973f6c7-1561-11ee-91d8-005056b86db5', '2fa75e51-189a-11ee-91d8-005056b86db5', 'a0fc1c55-3c2f-4ece-8cd4-ac3e2c1e9956', 'fbb00cc1-380b-4173-add4-59b3cf7682b5'];
|
|
|
+>>>>>>> 58bcb0028a552f4c5b18c7a7d815a5f90c81fcee
|
|
|
//清楚桌面图标
|
|
|
el.innerHTML = "";
|
|
|
if (_org == 'c95e0a56-c205-11ed-8d51-005056b86db5' || _oid == "16d397f3-b192-11ed-9211-005056b86db5" || _org == "0fec3a8a-ad04-11ed-b13d-005056b86db5") {
|
|
|
@@ -2990,7 +2994,7 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
|
|
|
"style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
|
|
|
"onresize": function () { }
|
|
|
}, {
|
|
|
- closecallback: function () { }
|
|
|
+ closecallback: function () { $("iframe", _formdiv)[0].contentWindow.loginout(); }
|
|
|
}, { "style": { "height": "36px" } }).form; //创建窗体
|
|
|
_taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/futureClass.png)" }, "name": "协同建构", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
|
|
|
break;
|
|
|
@@ -4595,7 +4599,9 @@ U.MD.D.I.openApplication = function (str, obj, info) {
|
|
|
"style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
|
|
|
"onresize": function () { }
|
|
|
}, {
|
|
|
- closecallback: function () { }
|
|
|
+ closecallback: function () {
|
|
|
+ $("iframe", _formdiv)[0].contentWindow.loginout();
|
|
|
+ }
|
|
|
}, { "style": { "height": "36px" } }).form; //创建窗体
|
|
|
_taskbar = { "id": str + _formdiv.id, "style": { "backgroundImage": "url(/img/icon/futureClass.png)" }, "name": "协同建构", "forms": _formdiv, "click": function () { U.MD.D.I.openApplication(str, obj, info); } }
|
|
|
|
