Merge remote-tracking branch 'origin/master'

src/main/webapp/static/common/css/style.css

@@ -8634,7 +8634,7 @@ th .layui-table-cell{
 }
 .bord-more{
     position: absolute;
-    bottom: 16px;
+    bottom: 10px;
     right: 10px;
 }
 .bord-pic{
@@ -8668,18 +8668,18 @@ th .layui-table-cell{
 .bord-title{
     letter-spacing: 2px;
     font-weight: bold;
-    height:60px;
+    /*height:60px;*/
     line-height: 40px;
     /*padding: 20px 0 10px 0;*/
     font-size: 20px;
 }
 .bord-left-content{
-    position: absolute;
-    height:220px;
-    width:120px;
-    top:50%;
-    left:50%;
-    margin: -110px 0 0 -60px;
+    /*position: absolute;*/
+    /*height:220px;*/
+    /*width:120px;*/
+    /*top:50%;*/
+    /*left:50%;*/
+    /*margin: -110px 0 0 -60px;*/
 }
 .bord-num{
     height:120px;
@@ -8695,7 +8695,7 @@ th .layui-table-cell{
     /*width:200px;*/
     color: #ffffff;
     height:100%;
-    border-radius: 10px 0 0 10px;
+    border-radius: 10px 10px 0 0;
     position: relative;
     float: left;
     z-index:10;
@@ -8713,19 +8713,22 @@ th .layui-table-cell{
 }
 @media (min-width: 1200px) {
     .bord-left{
-        width:200px;
+        width: 100%;
+        height: 40px;
     }
     .bord-contents{
-        margin-left: 200px;
+        /*margin-left: 200px;*/
+        padding-top: 35px;
     }
 }
 
 @media (max-width: 1200px) {
     .bord-left{
-        width:160px;
+        width:100%;
+        height:40px;
     }
     .bord-contents{
-        margin-left: 160px;
+        /*margin-left: 160px;*/
     }
 }
 .bord-right > .bord-contents > .slimScrollDiv > ul,

src/main/webapp/static/common/js/common.js

@@ -8,7 +8,7 @@ var localhostPaht=curWwwPath.substring(0,pos);
 //获取带"/"的项目名，如：/myproj
 var projectName=pathName.substring(0,pathName.substr(1).indexOf('/')+1);
 //得到了 http://localhost:8083/myproj
-var realPath=localhostPaht;
+var realPath=localhostPaht+projectName;
 
 //获取url参数
 function GetQueryString(name){

src/main/webapp/webpage/modules/sys/sysHome.jsp

@@ -602,9 +602,9 @@
             <div id="schedule-bord" class="call-bord-content contentShadow">
                 <div class="bord-left">
                     <div class="bord-left-content">
-                        <div class="bord-title">待办事项</div>
-                        <div class="bord-pic"><img src="${ctxStatic}/common/img/icon01.png" height="100%" /></div>
-                        <div class="bord-num">${notifyCount1}</div>
+                        <div class="bord-title">待办事项(${notifyCount1})</div>
+                        <%--<div class="bord-pic"><img src="${ctxStatic}/common/img/icon01.png" height="100%" /></div>--%>
+                        <%--<div class="bord-num">${notifyCount1}</div>--%>
                     </div>
                     <div class="bord-more">
                         <a href="javascript:void(0)" onclick='top.openTab("${ctx }/workprojectnotify/workProjectNotify/list","待办事项", false);'><span>更多 </span><i class="fa fa-angle-right"></i></a>
@@ -623,9 +623,9 @@
             <div id="notify-bord" class="call-bord-content contentShadow">
                 <div class="bord-left">
                     <div class="bord-left-content">
-                        <div class="bord-title">通知消息</div>
-                        <div class="bord-pic"><img src="${ctxStatic}/common/img/icon02.png" height="100%" /></div>
-                        <div class="bord-num">${notifyShowCount1}</div>
+                        <div class="bord-title">通知消息(${notifyShowCount1})</div>
+                        <%--<div class="bord-pic"><img src="${ctxStatic}/common/img/icon02.png" height="100%" /></div>--%>
+                        <%--<div class="bord-num">${notifyShowCount1}</div>--%>
                     </div>
                     <div class="bord-more">
                         <a href="javascript:void(0)" onclick='top.openTab("${ctx }/workprojectnotify/workProjectNotify/listShow","通知消息", false)'><span>更多 </span><i class="fa fa-angle-right"></i></a>
@@ -644,9 +644,9 @@
             <div id="msg-bord" class="call-bord-content contentShadow">
                 <div class="bord-left">
                     <div class="bord-left-content">
-                        <div class="bord-title">公告信息</div>
-                        <div class="bord-pic"><img src="${ctxStatic}/common/img/icon03.png" height="100%" /></div>
-                        <div class="bord-num">${count1}</div>
+                        <div class="bord-title">公告信息(${count1})</div>
+                        <%--<div class="bord-pic"><img src="${ctxStatic}/common/img/icon03.png" height="100%" /></div>--%>
+                        <%--<div class="bord-num">${count1}</div>--%>
                     </div>
                     <div class="bord-more">
                         <a href="javascript:void(0)" onclick='top.openTab("${ctx }/oa/oaNotify/self","公告信息", false)'><span>更多 </span><i class="fa fa-angle-right"></i></a>
@@ -665,9 +665,9 @@
             <div id="email-bord" class="call-bord-content contentShadow">
                 <div class="bord-left">
                     <div class="bord-left-content">
-                        <div class="bord-title">我的日程</div>
-                        <div class="bord-pic"><img src="${ctxStatic}/common/img/icon05.png" height="100%" /></div>
-                        <div class="bord-num">${calendarSize}</div>
+                        <div class="bord-title">我的日程(${calendarSize})</div>
+                        <%--<div class="bord-pic"><img src="${ctxStatic}/common/img/icon05.png" height="100%" /></div>--%>
+                        <%--<div class="bord-num">${calendarSize}</div>--%>
                     </div>
                     <div class="bord-more">
                         <a href="javascript:void(0)" onclick='top.openTab("${ctx}/workcalendar/workCalendar","我的日程", false)'><span>更多 </span><i class="fa fa-angle-right"></i></a>
@@ -1023,7 +1023,9 @@
         else
         {
             $("#" + div + " .bord-right .bord-contents .slimScrollDiv .slimScrollBar").css('height', (h * h / conHeight) + "px");
-            $("#" + div + " .bord-right .bord-contents .slimScrollDiv .slimScrollBar").css('display', 'block');
+            // $("#" + div + ".bord-contents ").css('height',(h * h / conHeight)-20 + "px");
+            $("#" + div + "  .bord-contents  ").css('padding-top', "40px");
+            $("#" + div + " .bord-right .bord-contents .slimScrollDiv ").css('display', 'block');
         }
     }
     function setScroll(){

src/main/webapp/webpage/modules/sys/sysIndex.jsp

@@ -214,10 +214,10 @@
                 </div>
                 <script>
                     var marqueeContent=new Array();   //滚动新闻
-                    marqueeContent[0]='<a class="news" href="javascript:void(0);">匞匞办公平台正式发布</a><br>';
-                    marqueeContent[1]='<a class="news" href="javascript:void(0);">匞匞办公平台正式发布</a><br>';
-                    marqueeContent[2]='<a class="news" href="javascript:void(0);">匞匞办公平台正式发布</a><br>';
-                    marqueeContent[3]='<a class="news" href="javascript:void(0);">匞匞办公平台正式发布</a><br>';
+                    marqueeContent[0]='<a class="news" href="javascript:void(0);">兴光项目全过程审计系统</a><br>';
+                    marqueeContent[1]='<a class="news" href="javascript:void(0);">兴光项目全过程审计系统</a><br>';
+                    // marqueeContent[2]='<a class="news" href="javascript:void(0);">匞匞办公平台正式发布</a><br>';
+                    // marqueeContent[3]='<a class="news" href="javascript:void(0);">匞匞办公平台正式发布</a><br>';
                     var marqueeInterval=new Array();  //定义一些常用而且要经常用到的变量
                     var marqueeId=0;
                     var marqueeDelay=3000;