Главная Обзор Помощь
Вход
chendeben
/
zheng
1
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

提取公共js和公共css到zheng-admin

shuzheng 9 лет назад
Родитель
2b7961d40e
Сommit
6662d1964d
9 измененных файлов с 21 добавлено и 175 удалено
Единый вид Показать статистику Diff
  1. 3 0
      zheng-admin/src/css/common.css
  2. 18 0
      zheng-admin/src/js/common.js
  3. 0 25
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp
  4. 0 25
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/button.jsp
  5. 0 25
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/index.jsp
  6. 0 25
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/menu.jsp
  7. 0 25
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
  8. 0 25
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp
  9. 0 25
      zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp

+ 3 - 0
zheng-admin/src/css/common.css
Просмотреть файл 

@@ -16,4 +16,7 @@ a i{font-size: 13px;}
 
 .pagination>li>a, .pagination>li>span{color: #29a176;}
 
 .pagination>li>a, .pagination>li>span{color: #29a176;}
 
 .dropdown-menu>.active>a, .dropdown-menu>.active>a:hover, .dropdown-menu>.active>a:focus{background-color: #29a176;}*/
 
 .dropdown-menu>.active>a, .dropdown-menu>.active>a:hover, .dropdown-menu>.active>a:focus{background-color: #29a176;}*/
 
 
 
+body{font-size: 12px;}
 
+.table i{font-size: 12px; color: #000;}
 
+.bootstrap-table .table>thead>tr>th{border-bottom: none;}
 
 .bootstrap-table .table:not(.table-condensed), .bootstrap-table .table:not(.table-condensed)>tbody>tr>td, .bootstrap-table .table:not(.table-condensed)>tbody>tr>th, .bootstrap-table .table:not(.table-condensed)>tfoot>tr>td, .bootstrap-table .table:not(.table-condensed)>tfoot>tr>th, .bootstrap-table .table:not(.table-condensed)>thead>tr>td{padding: 12px 8px;}
 
 .bootstrap-table .table:not(.table-condensed), .bootstrap-table .table:not(.table-condensed)>tbody>tr>td, .bootstrap-table .table:not(.table-condensed)>tbody>tr>th, .bootstrap-table .table:not(.table-condensed)>tfoot>tr>td, .bootstrap-table .table:not(.table-condensed)>tfoot>tr>th, .bootstrap-table .table:not(.table-condensed)>thead>tr>td{padding: 12px 8px;}

+ 18 - 0
zheng-admin/src/js/common.js
Просмотреть файл 

@@ -1,4 +1,22 @@
 
 $(function() {
 
 $(function() {
 
 	// Waves初始化
 
 	// Waves初始化
 
 	Waves.displayEffect();
 
 	Waves.displayEffect();
 
+	// 数据表格动态高度
 
+	$(window).resize(function () {
 
+		$('#table').bootstrapTable('resetView', {
 
+			height: getHeight()
 
+		});
 
+	});
 
 });
 
 });
 
+// 动态高度
 
+function getHeight() {
 
+	return $(window).height() - 20;
 
+}
 
+// 数据表格展开内容
 
+function detailFormatter(index, row) {
 
+	var html = [];
 
+	$.each(row, function (key, value) {
 
+		html.push('<p><b>' + key + ':</b> ' + value + '</p>');
 
+	});
 
+	return html.join('');
 
+}

+ 0 - 25
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/organization/index.jsp
Просмотреть файл 

@@ -13,12 +13,10 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>组织管理</title>
 
 	<title>组织管理</title>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -35,13 +33,7 @@
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
-
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
-<style>
 
-    body{font-size: 12px;}
 
-    .table i{font-size: 12px; color: #000;}
 
-    .bootstrap-table .table>thead>tr>th{border-bottom: none;}
 
-</style>
 
 <script>
 
 <script>
 
 $(function() {
 
 $(function() {
 
 	// bootstrap table初始化
 
 	// bootstrap table初始化
 
@@ -69,11 +61,6 @@ $(function() {
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="popover"]').popover();
 
 		$('[data-toggle="popover"]').popover();
 
 	});
 
 	});
 
-	$(window).resize(function () {
 
-		$('#table').bootstrapTable('resetView', {
 
-			height: getHeight()
 
-		});
 
-	});
 
 });
 
 });
 
 // 格式化操作按钮
 
 // 格式化操作按钮
 
 function actionFormatter(value, row, index) {
 
 function actionFormatter(value, row, index) {
 
@@ -93,18 +80,6 @@ window.actionEvents = {
 
         console.log(value, row, index);
 
         console.log(value, row, index);
 
     }
 
     }
 
 };
 
 };
 
-// 展开内容
 
-function detailFormatter(index, row) {
 
-	var html = [];
 
-	$.each(row, function (key, value) {
 
-		html.push('<p><b>' + key + ':</b> ' + value + '</p>');
 
-	});
 
-	return html.join('');
 
-}
 
-//　动态高度
 
-function getHeight() {
 
-	return $(window).height() - 20;
 
-}
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 0 - 25
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/button.jsp
Просмотреть файл 

@@ -13,12 +13,10 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>权限管理</title>
 
 	<title>权限管理</title>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -35,13 +33,7 @@
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
-
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
-<style>
 
-    body{font-size: 12px;}
 
-    .table i{font-size: 12px; color: #000;}
 
-    .bootstrap-table .table>thead>tr>th{border-bottom: none;}
 
-</style>
 
 <script>
 
 <script>
 
 $(function() {
 
 $(function() {
 
 	// bootstrap table初始化
 
 	// bootstrap table初始化
 
@@ -75,11 +67,6 @@ $(function() {
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="popover"]').popover();
 
 		$('[data-toggle="popover"]').popover();
 
 	});
 
 	});
 
-	$(window).resize(function () {
 
-		$('#table').bootstrapTable('resetView', {
 
-			height: getHeight()
 
-		});
 
-	});
 
 });
 
 });
 
 // 格式化操作按钮
 
 // 格式化操作按钮
 
 function actionFormatter(value, row, index) {
 
 function actionFormatter(value, row, index) {
 
@@ -121,18 +108,6 @@ window.actionEvents = {
 
         console.log(value, row, index);
 
         console.log(value, row, index);
 
     }
 
     }
 
 };
 
 };
 
-// 展开内容
 
-function detailFormatter(index, row) {
 
-	var html = [];
 
-	$.each(row, function (key, value) {
 
-		html.push('<p><b>' + key + ':</b> ' + value + '</p>');
 
-	});
 
-	return html.join('');
 
-}
 
-//　动态高度
 
-function getHeight() {
 
-	return $(window).height() - 20;
 
-}
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 0 - 25
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/index.jsp
Просмотреть файл 

@@ -13,12 +13,10 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>权限管理</title>
 
 	<title>权限管理</title>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -35,13 +33,7 @@
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
-
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
-<style>
 
-    body{font-size: 12px;}
 
-    .table i{font-size: 12px; color: #000;}
 
-    .bootstrap-table .table>thead>tr>th{border-bottom: none;}
 
-</style>
 
 <script>
 
 <script>
 
 $(function() {
 
 $(function() {
 
 	// bootstrap table初始化
 
 	// bootstrap table初始化
 
@@ -75,11 +67,6 @@ $(function() {
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="popover"]').popover();
 
 		$('[data-toggle="popover"]').popover();
 
 	});
 
 	});
 
-	$(window).resize(function () {
 
-		$('#table').bootstrapTable('resetView', {
 
-			height: getHeight()
 
-		});
 
-	});
 
 });
 
 });
 
 // 格式化操作按钮
 
 // 格式化操作按钮
 
 function actionFormatter(value, row, index) {
 
 function actionFormatter(value, row, index) {
 
@@ -121,18 +108,6 @@ window.actionEvents = {
 
         console.log(value, row, index);
 
         console.log(value, row, index);
 
     }
 
     }
 
 };
 
 };
 
-// 展开内容
 
-function detailFormatter(index, row) {
 
-	var html = [];
 
-	$.each(row, function (key, value) {
 
-		html.push('<p><b>' + key + ':</b> ' + value + '</p>');
 
-	});
 
-	return html.join('');
 
-}
 
-//　动态高度
 
-function getHeight() {
 
-	return $(window).height() - 20;
 
-}
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 0 - 25
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/permission/menu.jsp
Просмотреть файл 

@@ -13,12 +13,10 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>权限管理</title>
 
 	<title>权限管理</title>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -35,13 +33,7 @@
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
-
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
-<style>
 
-    body{font-size: 12px;}
 
-    .table i{font-size: 12px; color: #000;}
 
-    .bootstrap-table .table>thead>tr>th{border-bottom: none;}
 
-</style>
 
 <script>
 
 <script>
 
 $(function() {
 
 $(function() {
 
 	// bootstrap table初始化
 
 	// bootstrap table初始化
 
@@ -75,11 +67,6 @@ $(function() {
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="popover"]').popover();
 
 		$('[data-toggle="popover"]').popover();
 
 	});
 
 	});
 
-	$(window).resize(function () {
 
-		$('#table').bootstrapTable('resetView', {
 
-			height: getHeight()
 
-		});
 
-	});
 
 });
 
 });
 
 // 格式化操作按钮
 
 // 格式化操作按钮
 
 function actionFormatter(value, row, index) {
 
 function actionFormatter(value, row, index) {
 
@@ -121,18 +108,6 @@ window.actionEvents = {
 
         console.log(value, row, index);
 
         console.log(value, row, index);
 
     }
 
     }
 
 };
 
 };
 
-// 展开内容
 
-function detailFormatter(index, row) {
 
-	var html = [];
 
-	$.each(row, function (key, value) {
 
-		html.push('<p><b>' + key + ':</b> ' + value + '</p>');
 
-	});
 
-	return html.join('');
 
-}
 
-//　动态高度
 
-function getHeight() {
 
-	return $(window).height() - 20;
 
-}
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 0 - 25
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/role/index.jsp
Просмотреть файл 

@@ -13,12 +13,10 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>角色管理</title>
 
 	<title>角色管理</title>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -35,13 +33,7 @@
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
-
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
-<style>
 
-    body{font-size: 12px;}
 
-    .table i{font-size: 12px; color: #000;}
 
-    .bootstrap-table .table>thead>tr>th{border-bottom: none;}
 
-</style>
 
 <script>
 
 <script>
 
 $(function() {
 
 $(function() {
 
 	// bootstrap table初始化
 
 	// bootstrap table初始化
 
@@ -69,11 +61,6 @@ $(function() {
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="popover"]').popover();
 
 		$('[data-toggle="popover"]').popover();
 
 	});
 
 	});
 
-	$(window).resize(function () {
 
-		$('#table').bootstrapTable('resetView', {
 
-			height: getHeight()
 
-		});
 
-	});
 
 });
 
 });
 
 // 格式化操作按钮
 
 // 格式化操作按钮
 
 function actionFormatter(value, row, index) {
 
 function actionFormatter(value, row, index) {
 
@@ -93,18 +80,6 @@ window.actionEvents = {
 
         console.log(value, row, index);
 
         console.log(value, row, index);
 
     }
 
     }
 
 };
 
 };
 
-// 展开内容
 
-function detailFormatter(index, row) {
 
-	var html = [];
 
-	$.each(row, function (key, value) {
 
-		html.push('<p><b>' + key + ':</b> ' + value + '</p>');
 
-	});
 
-	return html.join('');
 
-}
 
-//　动态高度
 
-function getHeight() {
 
-	return $(window).height() - 20;
 
-}
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 0 - 25
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/system/index.jsp
Просмотреть файл 

@@ -13,12 +13,10 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>系统管理</title>
 
 	<title>系统管理</title>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -35,13 +33,7 @@
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
-
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
-<style>
 
-    body{font-size: 12px;}
 
-    .table i{font-size: 12px; color: #000;}
 
-    .bootstrap-table .table>thead>tr>th{border-bottom: none;}
 
-</style>
 
 <script>
 
 <script>
 
 $(function() {
 
 $(function() {
 
 	// bootstrap table初始化
 
 	// bootstrap table初始化
 
@@ -72,11 +64,6 @@ $(function() {
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="popover"]').popover();
 
 		$('[data-toggle="popover"]').popover();
 
 	});
 
 	});
 
-	$(window).resize(function () {
 
-		$('#table').bootstrapTable('resetView', {
 
-			height: getHeight()
 
-		});
 
-	});
 
 });
 
 });
 
 // 格式化操作按钮
 
 // 格式化操作按钮
 
 function actionFormatter(value, row, index) {
 
 function actionFormatter(value, row, index) {
 
@@ -108,18 +95,6 @@ window.actionEvents = {
 
         console.log(value, row, index);
 
         console.log(value, row, index);
 
     }
 
     }
 
 };
 
 };
 
-// 展开内容
 
-function detailFormatter(index, row) {
 
-	var html = [];
 
-	$.each(row, function (key, value) {
 
-		html.push('<p><b>' + key + ':</b> ' + value + '</p>');
 
-	});
 
-	return html.join('');
 
-}
 
-//　动态高度
 
-function getHeight() {
 
-	return $(window).height() - 20;
 
-}
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>

+ 0 - 25
zheng-upms/zheng-upms-server/src/main/webapp/WEB-INF/jsp/manage/user/index.jsp
Просмотреть файл 

@@ -13,12 +13,10 @@
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta http-equiv="X-UA-Compatible" content="IE=edge">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 
 	<title>用户管理</title>
 
 	<title>用户管理</title>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-3.3.0/css/bootstrap.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/material-design-iconic-font-2.2.0/css/material-design-iconic-font.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.css" rel="stylesheet"/>
 
-
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 	<link href="${basePath}/resources/zheng-admin/css/common.css" rel="stylesheet"/>
 
 </head>
 
 </head>
 
 <body>
 
 <body>
 
@@ -35,13 +33,7 @@
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/bootstrap-table.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/bootstrap-table-1.11.0/locale/bootstrap-table-zh-CN.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/plugins/waves-0.7.5/waves.min.js"></script>
 
-
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
 <script src="${basePath}/resources/zheng-admin/js/common.js"></script>
 
-<style>
 
-    body{font-size: 12px;}
 
-    .table i{font-size: 12px; color: #000;}
 
-    .bootstrap-table .table>thead>tr>th{border-bottom: none;}
 
-</style>
 
 <script>
 
 <script>
 
 $(function() {
 
 $(function() {
 
 	// bootstrap table初始化
 
 	// bootstrap table初始化
 
@@ -74,11 +66,6 @@ $(function() {
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="tooltip"]').tooltip();
 
 		$('[data-toggle="popover"]').popover();
 
 		$('[data-toggle="popover"]').popover();
 
 	});
 
 	});
 
-	$(window).resize(function () {
 
-		$('#table').bootstrapTable('resetView', {
 
-			height: getHeight()
 
-		});
 
-	});
 
 });
 
 });
 
 // 格式化操作按钮
 
 // 格式化操作按钮
 
 function actionFormatter(value, row, index) {
 
 function actionFormatter(value, row, index) {
 
@@ -120,18 +107,6 @@ window.actionEvents = {
 
         console.log(value, row, index);
 
         console.log(value, row, index);
 
     }
 
     }
 
 };
 
 };
 
-// 展开内容
 
-function detailFormatter(index, row) {
 
-	var html = [];
 
-	$.each(row, function (key, value) {
 
-		html.push('<p><b>' + key + ':</b> ' + value + '</p>');
 
-	});
 
-	return html.join('');
 
-}
 
-//　动态高度
 
-function getHeight() {
 
-	return $(window).height() - 20;
 
-}
 
 </script>
 
 </script>
 
 </body>
 
 </body>
 
 </html>
 
 </html>