diff --git a/power-admin/power-admin.iml b/power-admin/power-admin.iml
deleted file mode 100644
index e940f22..0000000
--- a/power-admin/power-admin.iml
+++ /dev/null
@@ -1,126 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
index ed0c18c..9a40198 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/gatewayDir/gatewayIndex.jsp
@@ -53,7 +53,7 @@
}
-
+
diff --git a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
index b1267f6..1e5e8a4 100644
--- a/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
+++ b/power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
@@ -31,11 +31,17 @@
.row-fluid{
overflow-y: hidden;
}
- .main-sidebar{
- padding-top: 40px!important;
+ .sidebar-mini.sidebar-collapse #indexTreeMenu li>a{
+ height: 44px;
+ }
+ .sidebar-mini.sidebar-collapse #indexTreeMenu .pull-right-container{
+ margin-top:0;
+ }
+ .sidebar-mini.sidebar-collapse #indexTreeMenu .modleSelected .pull-right-container{
+ margin-top: -7px;
}
-
+
@@ -59,7 +65,7 @@
-
+
--%>
-
-
-
@@ -289,7 +292,6 @@
var footerHeight = ($(".main-footer").height() || 0) + 31;
var windowHeight = $(window).height();
$("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 36);
- $("#indexTreeMenu").css("height",windowHeight - headerHeight);
})
diff --git a/power-admin/src/main/webapp/static/js/menu.js b/power-admin/src/main/webapp/static/js/menu.js
index 76f17b2..bd84146 100644
--- a/power-admin/src/main/webapp/static/js/menu.js
+++ b/power-admin/src/main/webapp/static/js/menu.js
@@ -3,11 +3,13 @@ var defaultUrl = '/user/pageUI';
//定义默认模块名
var defaultModle = '基本管理';
-function indexSelected(_this){
+function indexSelected(_this) {
+ $("#indexTreeMenu li").removeClass("active");
$("ul.treeview-menu").find("a").removeClass("indexSelected");
$("#indexTreeMenu .treeview").find("a").removeClass("modleSelected");
$(_this).addClass("indexSelected");
$(_this).parent().parent().siblings().addClass('modleSelected');
+ $(_this).parent().parent().parent().addClass("active");
}
//获取菜单接口
$(function () {
@@ -107,6 +109,9 @@ function menuRoleFun(menuArr) {
function liFun(liName,iconCss) {
var subLi = $("");
+ if (liName == defaultModle) {
+ subLi = $("");
+ }
subLi.append(aFun(liName, iconCss));
return subLi;
}
@@ -122,7 +127,7 @@ function aFun(aName, iconCss) {
subIcon.addClass(iconCss);
var subSpan = $("");
subA.append(subIcon);
- subA.append(aName);
+ subA.append("" + aName + "");
subA.append(subSpan);
return subA;
}
diff --git a/power-api/power-api.iml b/power-api/power-api.iml
deleted file mode 100644
index f409c0e..0000000
--- a/power-api/power-api.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/power-foundaton/power-foundaton.iml b/power-foundaton/power-foundaton.iml
deleted file mode 100644
index 11de9b7..0000000
--- a/power-foundaton/power-foundaton.iml
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/power-service/power-service.iml b/power-service/power-service.iml
deleted file mode 100644
index 7d397ff..0000000
--- a/power-service/power-service.iml
+++ /dev/null
@@ -1,49 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/power_web/power_web.iml b/power_web/power_web.iml
deleted file mode 100644
index 07ef481..0000000
--- a/power_web/power_web.iml
+++ /dev/null
@@ -1,24 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file