From a4c74f7e076c5d509dcdc73f0d8b12e3243a4dba Mon Sep 17 00:00:00 2001
From: wangxh <java888888ly@163.com>
Date: Fri, 10 Apr 2020 14:24:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=B3=BB=E7=BB=9F=E4=B8=8A?=
 =?UTF-8?q?=E4=BC=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/loginDir/index.jsp    |  2 +-
 .../datatables.net/js/jquery.dataTables.js     |  2 +-
 .../src/main/webapp/static/js/noticePage.js    | 18 +++++++++---------
 .../power/WEB-INF/views/loginDir/index.jsp     |  2 +-
 .../power/WEB-INF/views/loginDir/login.jsp     |  2 +-
 .../datatables.net/js/jquery.dataTables.js     |  2 +-
 .../target/power/static/js/noticePage.js       | 18 +++++++++---------
 power-admin/target/power/static/js/role.js     |  2 +-
 8 files changed, 24 insertions(+), 24 deletions(-)

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 6a4bc07..b9f07e0 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
@@ -267,7 +267,7 @@
             <div class="page-content-wrapper">
                 <div class="page-content">
                     <div class="container-fluid">
-                        <iframe class="row-fluid" style="height:100%;width:100%;" src="${path}/user/pageUI"
+                        <iframe class="row-fluid" style="height:90%;width:100%;" src="${path}/user/pageUI"
                                 id="iFrame1" name="iFrame1" scrolling="no" frameborder="0"></iframe>
                     </div>
                 </div>
diff --git a/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js b/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js
index 3db866f..e5aa9ea 100644
--- a/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js
+++ b/power-admin/src/main/webapp/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js
@@ -2010,7 +2010,7 @@
 			// Width attribute
 			oCol.sWidthOrig = th.attr('width') || null;
 	
-			// Style attribute
+			//
 			var t = (th.attr('style') || '').match(/width:\s*(\d+[pxem%]+)/);
 			if ( t ) {
 				oCol.sWidthOrig = t[1];
diff --git a/power-admin/src/main/webapp/static/js/noticePage.js b/power-admin/src/main/webapp/static/js/noticePage.js
index 8214942..a0eef72 100644
--- a/power-admin/src/main/webapp/static/js/noticePage.js
+++ b/power-admin/src/main/webapp/static/js/noticePage.js
@@ -381,14 +381,14 @@ $(function() {
 					}
 				}
 			},
-			{ field: 'noticeTypeName',  title: '类型名称' },
-			{ field: 'noticeTitle',  title: '通知主题' },
-			{ field: 'noticeContent',  title: '通知内容' },
-			{ field: 'noticeSend',  title: '通知人' },
-			{ field: 'noticeReceive',  title: '接收人' },
-			{ field: 'noticeDate',  title: '通知时间' },
-			{ field: 'readFlag',  title: '已读否' ,formatter: 'formatReadFlag'},
-			{ field: 'effective',  title: '有效否' ,formatter: 'formatEffective'},
+			{ field: 'noticeTypeName',  title: '类型名称', align: 'left'},
+			{ field: 'noticeTitle',  title: '通知主题', align: 'center' },
+			{ field: 'noticeContent',  title: '通知内容', align: 'center'},
+			{ field: 'noticeSend',  title: '通知人', align: 'center' },
+			{ field: 'noticeReceive',  title: '接收人', align: 'center' },
+			{ field: 'noticeDate',  title: '通知时间', align: 'center' },
+			{ field: 'readFlag',  title: '已读否' ,formatter: 'formatReadFlag', align: 'center'},
+			{ field: 'effective',  title: '有效否' ,formatter: 'formatEffective', align: 'center'},
 			{ field: 'operate', title: '操作', align: 'center', events : operateEvents, formatter: 'formatOperBtn' },
 		],
 		//在哪一列展开树形
@@ -412,7 +412,7 @@ $(function() {
 		onLoadSuccess: function(){  //加载成功时执行
 			$(".page-list").show();
 			$("th").css({'text-align':'center','vertical-align':'middle'})
-			$("td").css({'text-align':'center','vertical-align':'middle'})
+			/*$("td").css({'text-align':'center','vertical-align':'middle'})*/
 		},
 		onCheck:function(row){
 			var datas = $table.bootstrapTable('getData');
diff --git a/power-admin/target/power/WEB-INF/views/loginDir/index.jsp b/power-admin/target/power/WEB-INF/views/loginDir/index.jsp
index 6a4bc07..b9f07e0 100644
--- a/power-admin/target/power/WEB-INF/views/loginDir/index.jsp
+++ b/power-admin/target/power/WEB-INF/views/loginDir/index.jsp
@@ -267,7 +267,7 @@
             <div class="page-content-wrapper">
                 <div class="page-content">
                     <div class="container-fluid">
-                        <iframe class="row-fluid" style="height:100%;width:100%;" src="${path}/user/pageUI"
+                        <iframe class="row-fluid" style="height:90%;width:100%;" src="${path}/user/pageUI"
                                 id="iFrame1" name="iFrame1" scrolling="no" frameborder="0"></iframe>
                     </div>
                 </div>
diff --git a/power-admin/target/power/WEB-INF/views/loginDir/login.jsp b/power-admin/target/power/WEB-INF/views/loginDir/login.jsp
index e74e4b2..97043bd 100644
--- a/power-admin/target/power/WEB-INF/views/loginDir/login.jsp
+++ b/power-admin/target/power/WEB-INF/views/loginDir/login.jsp
@@ -77,6 +77,6 @@
     <div class="login_foot">
         <div class="span_div"><span>技术支持：厦门嘉时软件科技有限公司</span></div>
     </div>
-<script type="text/javascript" src="${path}/static/js/lokeydowngin.js"></script>
+<script type="text/javascript" src="${path}/static/js/login.js"></script>
 </body>
 </html>
diff --git a/power-admin/target/power/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js b/power-admin/target/power/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js
index 3db866f..e5aa9ea 100644
--- a/power-admin/target/power/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js
+++ b/power-admin/target/power/static/bootstrap-3.3.7/bower_components/datatables.net/js/jquery.dataTables.js
@@ -2010,7 +2010,7 @@
 			// Width attribute
 			oCol.sWidthOrig = th.attr('width') || null;
 	
-			// Style attribute
+			//
 			var t = (th.attr('style') || '').match(/width:\s*(\d+[pxem%]+)/);
 			if ( t ) {
 				oCol.sWidthOrig = t[1];
diff --git a/power-admin/target/power/static/js/noticePage.js b/power-admin/target/power/static/js/noticePage.js
index 8214942..a0eef72 100644
--- a/power-admin/target/power/static/js/noticePage.js
+++ b/power-admin/target/power/static/js/noticePage.js
@@ -381,14 +381,14 @@ $(function() {
 					}
 				}
 			},
-			{ field: 'noticeTypeName',  title: '类型名称' },
-			{ field: 'noticeTitle',  title: '通知主题' },
-			{ field: 'noticeContent',  title: '通知内容' },
-			{ field: 'noticeSend',  title: '通知人' },
-			{ field: 'noticeReceive',  title: '接收人' },
-			{ field: 'noticeDate',  title: '通知时间' },
-			{ field: 'readFlag',  title: '已读否' ,formatter: 'formatReadFlag'},
-			{ field: 'effective',  title: '有效否' ,formatter: 'formatEffective'},
+			{ field: 'noticeTypeName',  title: '类型名称', align: 'left'},
+			{ field: 'noticeTitle',  title: '通知主题', align: 'center' },
+			{ field: 'noticeContent',  title: '通知内容', align: 'center'},
+			{ field: 'noticeSend',  title: '通知人', align: 'center' },
+			{ field: 'noticeReceive',  title: '接收人', align: 'center' },
+			{ field: 'noticeDate',  title: '通知时间', align: 'center' },
+			{ field: 'readFlag',  title: '已读否' ,formatter: 'formatReadFlag', align: 'center'},
+			{ field: 'effective',  title: '有效否' ,formatter: 'formatEffective', align: 'center'},
 			{ field: 'operate', title: '操作', align: 'center', events : operateEvents, formatter: 'formatOperBtn' },
 		],
 		//在哪一列展开树形
@@ -412,7 +412,7 @@ $(function() {
 		onLoadSuccess: function(){  //加载成功时执行
 			$(".page-list").show();
 			$("th").css({'text-align':'center','vertical-align':'middle'})
-			$("td").css({'text-align':'center','vertical-align':'middle'})
+			/*$("td").css({'text-align':'center','vertical-align':'middle'})*/
 		},
 		onCheck:function(row){
 			var datas = $table.bootstrapTable('getData');
diff --git a/power-admin/target/power/static/js/role.js b/power-admin/target/power/static/js/role.js
index 8699ac7..4c02d01 100644
--- a/power-admin/target/power/static/js/role.js
+++ b/power-admin/target/power/static/js/role.js
@@ -120,7 +120,7 @@ $(function(){
                 }
             }
         ],
-        onLoadSuccess: function(){  //加载成功时执行
+        ess: function(){  //加载成功时执行
             $(".page-list").show();
             $("th").css({'text-align':'center','vertical-align':'middle'})
             $("td").css({'text-align':'center','vertical-align':'middle'})