Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/CocoRoboDesktop

css/Office/Word/WordEditor.css

@@ -52,7 +52,8 @@
 
 .U_MD_O_H_wordEditor {
     height: 100%;
-    min-height: 297mm;
+    /* min-height: 297mm; */
+    min-height: 58vh;
     padding: 2.54cm 3.17cm 2.54cm 3.17cm;
     background-color: #fff;
     outline: 0;

js/Desktop/DeskTop.js

@@ -171,6 +171,19 @@ U.MD.D.I.orgStemDeskIcon = [
     // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
 ];
 
+U.MD.D.I.szulsDeskIcon = [
+    { "Name": "项目管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/orgIcon/orgProject.png)" } },
+    { "Name": "学习中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/orgIcon/orgStudy.png)" } },
+    { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
+    { "Name": "学生评价", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/orgIcon/orgEva.png)" } },
+    { "Name": "我的资料", "Url": "my", "style": { "cssText": "background-image:url(/img/icon/myMessage.png)" } },
+    { "Name": "目标管理", "Url": "sys", "style": { "cssText": "background-image:url(/img/icon/evalua.png)" } },
+    { "Name": "课程设计", "Url": "courseDesign", "style": { "cssText": "background-image:url(/img/icon/courseDesign.png)" } },
+    { "Name": "项目进展", "Url": "case", "style": { "cssText": "background-image:url(/img/icon/case.png)" } },
+    // { "Name": "jupyter", "Url": "jupyter", "style": { "cssText": "background-image:url(/img/icon/jupyter.png)" } },
+];
+
+
 U.MD.D.I.hanDeskIcon = [
     { "Name": "项目管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/orgIcon/orgProject.png)" } },
     { "Name": "学习中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/orgIcon/orgStudy.png)" } },
@@ -348,6 +361,7 @@ U.MD.D.I.initDesktopIcons = function (el) {
         _studentDesktopIconInfo2 = U.MD.D.I.studentDeskIcon2, //获取学生端桌面图标
         _orgDesktopIconInfo = U.MD.D.I.orgDeskIcon, //获取组织桌面图标
         _orgStemDeskIcon = U.MD.D.I.orgStemDeskIcon,
+        _szulsDeskIcon = U.MD.D.I.szulsDeskIcon,
         _hanDeskIcon = U.MD.D.I.hanDeskIcon,
         _schoolDesktopIconInfo = U.MD.D.I.schoolDeskIcon, //获取测试学校桌面图标
         _BSDNSteacherDesktopIconInfo = U.MD.D.I.BSDNSteacherDeskIcon,//获取北师大
@@ -355,7 +369,7 @@ U.MD.D.I.initDesktopIcons = function (el) {
         _GMteacherDesktopIconInfo = U.MD.D.I.GMteacherDeskIcon, //获取光明学校桌面图标
         _GMstudentDesktopIconInfo = U.MD.D.I.GMstudentDeskIcon; //获取光明学校桌面图标
     var _oidA = ['69893dca-1d47-11ed-8c78-005056b86db5', "91305d49-01ba-11ed-8c78-005056b86db5", "d9db3320-503a-11ed-8c78-005056b86db5"];
-    var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d"];
+    var _orgA = ["7ada499f-4ec7-11ed-8c78-005056b86db5", "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d","383f207d-4ced-4eeb-a15a-7b0a2f3abe7b"];
     //清楚桌面图标
     el.innerHTML = "";
     //循环创建桌面图标
@@ -444,6 +458,23 @@ U.MD.D.I.initDesktopIcons = function (el) {
             $$("div", { className: "U_MD_D_KOS U_Img", "style": _orgStemDeskIcon[i].style }, _iconcontent);
             $$("div", { className: "U_MD_D_KOX", "innerHTML": _orgStemDeskIcon[i].Name }, _iconcontent);
         }
+    }else if ((_type == 1 || _type == 4) && _org == "383f207d-4ced-4eeb-a15a-7b0a2f3abe7b") {
+        for (i = 0; i < _szulsDeskIcon.length; i++) {
+            _content = $$("div", {
+                className: "U_MD_D_KO",
+                "onmousedown": U.UF.C.closure(function (obj) {
+                    //防止拖动图标即打开了桌面应用
+                    U.MD.D.click(this, obj);
+                }, [_szulsDeskIcon[i]]),
+                "onclick": U.UF.C.closure(function (obj) {
+                    //防止拖动图标即打开了桌面应用
+                    U.MD.D.click(this, obj);
+                }, [_szulsDeskIcon[i]])
+            }, _frag); // 
+            _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
+            $$("div", { className: "U_MD_D_KOS U_Img", "style": _szulsDeskIcon[i].style }, _iconcontent);
+            $$("div", { className: "U_MD_D_KOX", "innerHTML": _szulsDeskIcon[i].Name }, _iconcontent);
+        }
     } else if ((_type == 1 || _type == 4) && _org == "eb2af5e9-ac3d-46b6-9fe3-3c1c364f018d") {
         for (i = 0; i < _orgDesktopIconInfo.length; i++) {
             _content = $$("div", {
@@ -950,7 +981,7 @@ U.MD.D.I.openInApplication = function (str, data, screenType, tType) {
                     "项目详情",
                     $$("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/#/courseDetailS?userid=" + _userid + "&oid=" + _oid + "&org=" + _org + "&courseId=" + data + "&tType=" + tType + "&cid=" + _classId + "&screenType=" + screenType }), {
                     "id": "studyDetailS",
-                    "style": { "width": "100%", "height": "100%", "overflow": 'hidden' },
+                    "style": { "width": "95%", "height": "95%", "overflow": 'hidden' },
                     "onresize": function () { }
                 }, {
                     closecallback: function () { }