修改主页面ui

VisualInspection/css/common/header.css

@@ -7,14 +7,15 @@ html body {
 .header_font {
     color: white;
     font-size: 18px;
-    line-height: 80px;
+    line-height: 60px; 
+    /* line-height: 80px; */
     padding-right: 10px;
     margin-bottom: 0px;
 }
 
 .navbar-left img {
     height: 32px;
-    margin-top: 24px;
+    margin-top: 14px;
     margin-right: 10px
 }
 
@@ -27,4 +28,7 @@ html body {
     background: rgba(0,0,0,0);
     border: none;
     outline:none;
+}
+.tree-menu li>ul {
+    background-color: #13558a;
 }

VisualInspection/css/main.css

@@ -1,5 +1,5 @@
 .main {
-    background: white;
+    background: #ddd;
     padding-left: 0;
 }
 
@@ -8,11 +8,36 @@ footer p {
 }
 
 .mum_left {
-    background: #328dc7;
+    background: #366ca5;
     padding-top: 15px;
+    /* margin-top: 1px; */
 }
 
 .mum_right {
     padding-top: 10px;
     padding-bottom: 20px;
-}
+}
+
+.datatable {
+     margin-bottom: 0px; 
+}
+
+.panel-heading {
+    border-bottom: 0px;
+}
+.navbar-header{
+    box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.16), 0 2px 10px 0 rgba(0, 0, 0, 0.12);
+}
+.tree-menu li>a {
+    padding:10px;
+}
+#treeMenu li>a{
+    font-size: 14px;
+}
+#treeMenu li>ul li>a{
+    font-size: 12px;
+}
+#mum_left{
+  overflow: auto;
+}
+#main_panel{overflow: auto;}

VisualInspection/js/main.js

@@ -1,9 +1,12 @@
 var MENU;
 
 //计算左面的
-$(document).ready(function() {
+$(document).ready(function() {    
+    // $('#mum_left').perfectScrollbar();
+    $('#mum_left').height($(document).height()-60);
+    $('#main_panel').height($(document).height()-100);
+    // $('#mum_right .panel').height($(document).height()-100);
     initUserinfo();
-
     setletftime();
     getServerTime();
 
@@ -73,7 +76,7 @@ $(document).ready(function() {
                 for (var j = 0; j < menu.childs.length; j++) {
                     var datactemp = {}
                     var mtemp = menu.childs[j];
-                    datactemp["html"] = "<a id=\"" + mtemp.id + "\" href=\"#\"><i class=\"icon\">·</i>" + mtemp.menuname + "</a>";
+                    datactemp["html"] = "<a id=\"" + mtemp.id + "\" href=\"#\"><i class=\"icon\"></i>" + mtemp.menuname + "</a>";
                     secondMenus.push(mtemp.id);
                     datac.push(datactemp);
 
@@ -168,7 +171,7 @@ function addobj_child(data) {
             zdataItem["icon"] = "";
             zdataItem["open"] = true;
             zdataItem["name"] = m.organname;
-            zdataItem["children"] = addobj(m);
+            zdataItem["children"] = addobj_child(m);
             zdata.push(zdataItem);
         }
         return zdata;
@@ -187,12 +190,13 @@ function chageToPageUI(menu) {
 
 
 function setletftime() {
-    var height = window.innerHeight;
-    $("#mum_left").css("min-height", height - 90);
-    if ($("#main").height() > height) {
-        $("#mum_left").css("min-height", $("#main").height() - 80);
-    }
+    // var height = window.innerHeight;
+    // $("#mum_left").css("min-height", height - 90);
+    // if ($("#main").height() > height) {
+    //     $("#mum_left").css("min-height", $("#main").height() - 80);
+    // }
 
+    
     setTimeout(setletftime, 100);
 }
 

VisualInspection/js/role/permision.js

@@ -64,7 +64,7 @@ $(document).ready(function () {
             return;
         }
 
-        deleteItem4Common(function(){
+        deleteItem4CallBack(function(){
             PermisionDelete(nodedata[0].id, function (data) {
                 layer.msg('删除成功！', {
                     time: 2000, //20s后自动关闭
@@ -114,7 +114,7 @@ $(document).ready(function () {
                 "role_id": this.id,
                 "permission_id": nodedata[0].id
             }
-            deleteItem4Common(function(){
+            deleteItem4CallBack(function(){
                 PermisionRoleDELETE(data, function (data) {
                     var nodedata = dept_tree.getSelectedNodes();
                     updateRole(nodedata[0].id)

VisualInspection/view/common/commonscriptlink.html

@@ -24,6 +24,7 @@
 <script type="text/javascript" src="/js/lib/combotree/comboTreePlugin.js"></script>
 <script src="/js/lib/tags/jquery.tagsinput.js"></script>
 <script src="/js/lib/jedate/jedate.js"></script>
+<script src="/js/lib/scrollbar/perfect-scrollbar.min.js"></script>
 <script src="/js/util/util.js"></script>
 <script src="/js/util/service.js"></script>
 <script src="/js/constant/constant.js"></script>

VisualInspection/view/main.html

@@ -15,11 +15,18 @@
         html{overflow:auto;}
         img.lightbox-img{width:600px;}
         .navbar-inverse {
-            background-color: #1253A9;
+            background-color: #366ca5;
         }
         .file-list,.uploader-files {
             border:0px;
         }
+        html{
+           overflow:hidden
+        }
+        body{
+           font-family:'Microsoft Yahei';
+           overflow:hidden
+        }
         /*.mum_left {
             background-color: #2B7EB3;
         }*/
@@ -39,7 +46,7 @@
 
     <div id="main" class="container-fluid main">
         <div class="row">
-            <div class="col-md-2" style="background: #328dc7;padding-right:0;z-index: 11;">
+            <div class="col-md-2" style="padding-right:0;z-index: 11;">
                 <div id="mum_left" class="mum_left">
                     <link rel="import" href="/view/mum.html?__inline">
                 </div>
@@ -47,7 +54,7 @@
             <div class="col-md-10">
                 <div id="mum_right" class="mum_right">
 
-                    <div class="panel">
+                    <div class="panel" id="main_panel">
                         <div class="panel-heading" id="main_content_title">
                             <ol class="breadcrumb" id="breadcrumb_menu" style="margin-bottom: 0;padding:0px;">
                                
@@ -58,6 +65,7 @@
                         </div>
                     </div>
 
+                    <link rel="import" href="/view/common/foot.html?__inline">  
                 </div>
 
             </div>
@@ -65,7 +73,6 @@
         </div>
     </div>
 
-    <link rel="import" href="/view/common/foot.html?__inline">
     <script src="/js/main.js"></script>
 </body>