Merge branch 'master' of http://git_xt.jsxt.jsjtyxt.com/wenhongquan/VisualInspection

# Conflicts:
#	VisualInspection/css/main.css

VisualInspection/css/main.css

@@ -19,25 +19,38 @@ footer p {
 }
 
 .datatable {
-     margin-bottom: 0px; 
+    margin-bottom: 0px;
 }
 
 .panel-heading {
     border-bottom: 0px;
 }
-.navbar-header{
+
+.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;
+    padding: 10px;
+}
+
+#treeMenu li>a {
+    font-size: 13px;
 }
-#treeMenu li>a{
-    font-size: 14px;
+
+#treeMenu li>a>i {
+    font-size: 18px;
+    margin-right: 3px;
 }
-#treeMenu li>ul li>a{
+
+#treeMenu li>ul li>a {
     font-size: 12px;
 }
-#mum_left{
-  overflow: auto;
+
+#mum_left {
+    overflow: auto;
 }
-#main_panel{overflow: auto;}
+
+#main_panel {
+    overflow: auto;
+}

VisualInspection/js/main.js

@@ -1,10 +1,10 @@
 var MENU;
 
 //计算左面的
-$(document).ready(function() {    
+$(document).ready(function() {
     // $('#mum_left').perfectScrollbar();
-    $('#mum_left').height($(document).height()-60);
-    $('#main_panel').height($(document).height()-100);
+    $('#mum_left').height($(document).height() - 60);
+    $('#main_panel').height($(document).height() - 100);
     // $('#mum_right .panel').height($(document).height()-100);
     initUserinfo();
     setletftime();
@@ -196,7 +196,7 @@ function setletftime() {
     //     $("#mum_left").css("min-height", $("#main").height() - 80);
     // }
 
-    
+
     setTimeout(setletftime, 100);
 }
 
@@ -322,9 +322,9 @@ function addBreadMenu(url, name, flag) {
         }
     } else {
         if (flag)
-            $("#breadcrumb_menu").html('<li murl="' + url + '" mname="' + name + '"><a href="javascript:void(0)" onclick="changePage(\'' + url + '\')">' + name + '</a></li>');
+            $("#breadcrumb_menu").html('<li murl="' + url + '" mname="' + name + '"><a href="javascript:void(0)" onclick="changePage(\'' + url + '\')"><span>' + name + '</span></a></li>');
         else
-            $("#breadcrumb_menu").append('<li murl="' + url + '" mname="' + name + '"><a href="javascript:void(0)" onclick="changePage(\'' + url + '\')">' + name + '</a></li>');
+            $("#breadcrumb_menu").append('<li murl="' + url + '" mname="' + name + '"><a href="javascript:void(0)" onclick="changePage(\'' + url + '\')"><span>' + name + '</span></a></li>');
     }
 }