Explorar o código

1

Signed-off-by: lcw <1324309909@qq.com>
lcw %!s(int64=2) %!d(string=hai) anos
pai
achega
c1f52cd86b
Modificáronse 6 ficheiros con 34 adicións e 31 borrados
  1. 2 2
      css/Controls/index.min.css
  2. 18 15
      css/Desktop/Desktop.css
  3. 8 8
      js/Controls/Basic.js
  4. 4 4
      js/Desktop/DeskTop.js
  5. 1 1
      uform.js
  6. 1 1
      uformd.js

+ 2 - 2
css/Controls/index.min.css

@@ -862,7 +862,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
     border: 0;
     cursor: pointer;
     opacity: 0;
-    filter: alpha(opacity: 0);
+    filter: alpha(opacity 0);
     width: 100%;
     height: 100%;
     overflow: hidden
@@ -1042,7 +1042,7 @@ body div ::-webkit-scrollbar-resizer:vertical {
 .U_MD_D_RW_T {
     text-align: center;
     padding: 5px 0;
-    border-bottom: 1px solid # color: #069;
+    border-bottom: 1px solid #069;
     font-size: 13px;
     color: #FFF;
     margin-top: 16px

+ 18 - 15
css/Desktop/Desktop.css

@@ -310,11 +310,11 @@ body div ::-webkit-scrollbar-resizer:vertical {
 
 .U_MD_D_BD {
     padding: 5px 10px;
-    background-color: #5A5A5A;
-    border-radius: 0px 0px 10px 10px;
+    background-color: #5a5a5a;
+    border-radius: 5px;
     position: absolute;
     right: 5%;
-    top: 0px;
+    top: 4px;
 }
 
 .U_MD_D_BDA {
@@ -342,19 +342,23 @@ body div ::-webkit-scrollbar-resizer:vertical {
     float: left;
     color: #FFF;
     font-family: Arial;
-    margin-left: 1px;
     cursor: pointer;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    flex-direction: row;
+    width: 65px;
 }
 
 .U_MD_D_BDL div {
-    margin-left: 10px;
     float: left;
     font-size: 14px;
     height: 30px;
+    color: #d9d9d9;
 }
 
 .U_MD_D_BDL div:hover {
-    color: #34BCFF;
+    color: #fff;
 }
 
 .U_MD_D_BD_QRcode {
@@ -598,23 +602,22 @@ body div ::-webkit-scrollbar-resizer:vertical {
 
 .U_MD_D_KO {
     cursor: pointer;
-    width: 71px;
-    height: 83px;
+    width: 65px;
+    height: 90px;
     position: absolute;
     top: 0;
     left: 80px;
-    padding: 1px;
 }
 
 .U_MD_D_KO:hover {
-    background-color: #505457;
-    border: 1px solid #777;
-    padding: 0;
+    background-color: #8eaad1;
+    border-radius: 5px;
+    box-sizing: border-box;
 }
 
 .U_MD_D_KOA {
     margin: 5px auto 0 auto;
-    width: 71px;
+    width: 57px;
     border-radius: 5px;
     display: flex;
     flex-direction: column;
@@ -623,8 +626,8 @@ body div ::-webkit-scrollbar-resizer:vertical {
 }
 
 .U_MD_D_KOS {
-    width: 71px;
-    height: 71px;
+    width: 57px;
+    height: 57px;
 }
 
 .U_Img {

+ 8 - 8
js/Controls/Basic.js

@@ -1846,11 +1846,11 @@ U.UF.UI.form.prototype = {
         //窗体的统一属性设置,默认属性
         if (_formattr.style) {
             _formattr.style.cssText = _formattr.style.cssText || "";
-            _formattr.style.cssText = "width: 70%; position: fixed; background-color: #fff; z-index: 10; border-radius: 1px; overflow: hidden;  -moz-box-shadow:0 0 30px 5px #555; -webkit-box-shadow:0 0 30px 5px #555; box-shadow:0 0 30px 5px #555; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius:5px;" + _formattr.style.cssText;
+            _formattr.style.cssText = "width: 70%; position: fixed; background-color: #fff; z-index: 10; border-radius: 1px; overflow: hidden;  -moz-box-shadow:rgb(38 38 38) 0px 0px 12px 1px; -webkit-box-shadow:rgb(38 38 38) 0px 0px 12px 1px; box-shadow:rgb(38 38 38) 0px 0px 12px 1px; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius:5px;" + _formattr.style.cssText;
         }
         else {
             _formattr.style = {
-                cssText: "width: 70%; position: fixed; background-color: #fff; z-index: 10; border-radius: 1px; overflow: hidden;  -moz-box-shadow:0 0 30px 5px #555; -webkit-box-shadow:0 0 30px 5px #555; box-shadow:0 0 30px 5px #555; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius:5px;"
+                cssText: "width: 70%; position: fixed; background-color: #fff; z-index: 10; border-radius: 1px; overflow: hidden;  -moz-box-shadow:rgb(38 38 38) 0px 0px 12px 1px; -webkit-box-shadow:rgb(38 38 38) 0px 0px 12px 1px; box-shadow:rgb(38 38 38) 0px 0px 12px 1px; -moz-border-radius: 5px; -webkit-border-radius: 5px; border-radius:5px;"
             };
         }
         _formattr.close = U.UF.C.apply(this, function () { //关闭窗体;
@@ -1899,11 +1899,11 @@ U.UF.UI.form.prototype = {
             //窗体头部属性统一设置
             if (_headattr.style) {
                 _headattr.style.cssText = _headattr.style.cssText || "";
-                _headattr.style.cssText = "text-indent: 10px; color: White; line-height: inherit; font-size: 14px; height: 30px; line-height: 30px; background-color: #2967A7; overflow: hidden; color: White; font-size: 14px; overflow: hidden; " + _headattr.style.cssText;
+                _headattr.style.cssText = "text-indent: 10px; color: White; line-height: inherit; font-size: 14px; height: 30px; line-height: 36px; background-color: rgb(48 48 48); overflow: hidden; color: White; font-size: 14px; overflow: hidden; " + _headattr.style.cssText;
             }
             else {
                 _headattr.style = {
-                    cssText: "text-indent: 10px; color: White; line-height: inherit; font-size: 14px; height: 30px; line-height: 30px; background-color: #2967A7; overflow: hidden; color: White; font-size: 14px; overflow: hidden; "
+                    cssText: "text-indent: 10px; color: White; line-height: inherit; font-size: 14px; height: 30px; line-height: 36px; background-color: rgb(48 48 48); overflow: hidden; color: White; font-size: 14px; overflow: hidden; "
                 }
             }
             //设置头部有拖拽事件
@@ -1988,14 +1988,14 @@ U.UF.UI.form.prototype = {
         //头部功能区域
         if (this.title !== false) {
             _headbottom = $$("div", {
-                "style": { "cssText": "position: absolute; top: 3px; right: 0px; width: 80px; display: table-cell; vertical-align: middle;" }
+                "style": { "cssText": "position: absolute; top: 5px; right: 0px; width: 80px; display: table-cell; vertical-align: middle;" }
             }, _formel);
         }
         if (this.isclose !== false) {
             //关闭窗体的按钮
             $$("div", {
                 "style": {
-                    "cssText": "background-image:url(/img/close.png); _background-image:url(/img/close.png);width: 20px; height: 20px; background-position: -120px -61px; background-size: 100%; float: right; margin-right: 3px; cursor: pointer;"
+                    "cssText": "background-image:url(/img/close.png); _background-image:url(/img/close.png);width: 20px; height: 20px; background-position: -120px -61px; background-size: 100%; float: right; margin-right: 5px;margin-top:3px; cursor: pointer;"
                 },
                 "title": "点击关闭",
                 "onmousedown": U.UF.EV.stopBubble,
@@ -2023,7 +2023,7 @@ U.UF.UI.form.prototype = {
             //放大按钮
             _enlargeel = $$("div", {
                 "style": {
-                    "cssText": "background-image:url(/img/max.png); _background-image:url(/img/max.png);background-position: -598px -240px; background-size: 100%; float: right; margin-right: 7px; width: 20px; height: 20px; cursor: pointer;"
+                    "cssText": "background-image:url(/img/max.png); _background-image:url(/img/max.png);background-position: -598px -240px; background-size: 100%; float: right; margin-right: 7px; width: 20px; height: 20px; cursor: pointer;margin-top: 3px;"
                 },
                 "title": "最大化",
                 "onmousedown": U.UF.EV.stopBubble,
@@ -2050,7 +2050,7 @@ U.UF.UI.form.prototype = {
             //最小化的按钮处理
             $$("div", {
                 "style": {
-                    "cssText": "background-image:url(/img/min.png); _background-image:url(/img/min.png);background-position: -617px -240px; background-size: 100%; float: right; margin-right: 10px; width: 20px; height: 20px; cursor: pointer;"
+                    "cssText": "background-image:url(/img/min.png); _background-image:url(/img/min.png);background-position: -617px -240px; background-size: 100%; float: right; margin-right: 10px; width: 20px; height: 20px; cursor: pointer;margin-top: 3px;position: absolute;"
                 },
                 "title": "最小化",
                 "onmousedown": U.UF.EV.stopBubble,

+ 4 - 4
js/Desktop/DeskTop.js

@@ -26,6 +26,7 @@ U.MD.D.I.DeskIcon = [
     //    { "Name": "web编程", "Url": "frontEndProgramming", "Img": { "x": "-275", "y": "-297"} },
     //    { "Name": "后端编程", "Url": "backEndProgramming", "Img": { "x": "-275", "y": "-297"} },
     { "Name": "项目管理", "Url": "project", "style": { "cssText": "background-image:url(/img/icon/project.png)" } },
+    { "Name": "学习中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } },
     { "Name": "学生管理", "Url": "student", "style": { "cssText": "background-image:url(/img/icon/student.png)" } },
     { "Name": "评价管理", "Url": "evaluate", "style": { "cssText": "background-image:url(/img/icon/evaluation.png)" } },
     { "Name": "班级管理", "Url": "class", "style": { "cssText": "background-image:url(/img/icon/class.png)" } },
@@ -37,8 +38,7 @@ U.MD.D.I.DeskIcon = [
     { "Name": "便签分类", "Url": "note", "style": { "cssText": "background-image:url(/img/icon/note.png)" } },
     { "Name": "量规评分", "Url": "score", "style": { "cssText": "background-image:url(/img/icon/score.png)" } },
     { "Name": "思维导图", "Url": "mind", "style": { "cssText": "background-image:url(/img/icon/mindMapping.png)" } },
-    { "Name": "协同文档", "Url": "doc", "style": { "cssText": "background-image:url(/img/icon/doc.png)" } },
-    { "Name": "学习中心", "Url": "study", "style": { "cssText": "background-image:url(/img/icon/study.png)" } }
+    { "Name": "协同文档", "Url": "doc", "style": { "cssText": "background-image:url(/img/icon/doc.png)" } }
 ];
 
 //#region 桌面初始化a
@@ -320,7 +320,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
         case "project": //好友打开
             _formdiv = new U.UF.UI.form(
                 "项目管理",
-                $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "src": "https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/course?userid=71160a48-11e2-11ec-80ad-005056b86db5&oid=45facc0a-1211-11ec-80ad-005056b86db5" }), {
+                $$("iframe", { "frameborder": "no", "border": "0", "scrolling ": "no", "style": { "cssText": "border:0; width:100%; height:100%;" }, "src": "https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/course?userid=71160a48-11e2-11ec-80ad-005056b86db5&oid=45facc0a-1211-11ec-80ad-005056b86db5" }), {//https://pbl.cocorobo.cn/pbl-teacher-table/dist/#/course
                 "id": "project",
                 "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                 "onresize": function () { }
@@ -488,7 +488,7 @@ U.MD.D.I.openApplication = function (str, obj, info) {
         case "study":
             _formdiv = new U.UF.UI.form(
                 "学习中心",
-                $$("iframe", { "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=71160a48-11e2-11ec-80ad-005056b86db5&oid=45facc0a-1211-11ec-80ad-005056b86db5" }), {
+                $$("iframe", { "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=71160a48-11e2-11ec-80ad-005056b86db5&oid=45facc0a-1211-11ec-80ad-005056b86db5" }), {//https://pbl.cocorobo.cn/pbl-student-table/dist/#/index
                 "id": "study",
                 "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
                 "onresize": function () { }

+ 1 - 1
uform.js

@@ -11566,7 +11566,7 @@ U.MD.U.L.login = U.MD.U.L.DLTC = function (fun) {
         new U.UF.UI.form("", _iframe,
                  {
                      "id": "U_MD_HomeC_Pop",
-                     "style": { "width": "90%", "height": "90%", "overflow": 'hidden' },
+                     "style": { "width": "36%", "height": "90%", "overflow": 'hidden' },
                  },
                  {
                      isdrag: false,

+ 1 - 1
uformd.js

@@ -380,7 +380,7 @@ U.MD.D.I.initDesktopIcons = function(el) {
         }, _frag); // 
         _iconcontent = $$("div", { className: "U_MD_D_KOA" }, _content);
         $$("div", { className: "U_MD_D_KOS U_Img", "style": { "backgroundPosition": _DesktopIconInfo[i].Img.x + "px " + _DesktopIconInfo[i].Img.y + "px" } }, _iconcontent);
-        $$("div", { className: "U_MD_D_KOX", "style": { "cssText": "text-shadow: #000 2px 1px 3px,#666 0 1px 0,#555 -1px 0 0,#999 0 -1px 0; -webkit-text-shadow: #333 1px 0 0,#666 0 1px 0,#555 -1px 0 0,#999 0 -1px 0; -moz-text-shadow: #333 1px 0 0,#666 0 1px 0,#555 -1px 0 0,#999 0 -1px 0; filter: Glow(color=#777777, strength=1)\9;" }, "innerHTML": _DesktopIconInfo[i].Name }, _iconcontent);
+        $$("div", { className: "U_MD_D_KOX", "style": { "cssText": "text-shadow: rgb(0 0 0) 2px 1px 3px, rgb(165 165 165) 0px 1px 0px, rgb(85 85 85) -1px 0px 0px, rgb(153 153 153) 0px -1px 0px; filter: Glow(color=#777777, strength=1)\9;" }, "innerHTML": _DesktopIconInfo[i].Name }, _iconcontent);
     }
     //加载好后给图标定位
     U.MD.D.iconPostion($(_frag).Child());