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 @@
-
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 @@
-
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 @@ - + 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'})