power2.0
/
power
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

解决归属管理左侧树无滚动条,调整各列表样式

Browse Source
nanfang_branch
zengwh 5 years ago
parent 5060ec9ef8
commit 9162d17b75
12 changed files with 120 additions and 151 deletions
Show Stats Download Patch File Download Diff File

4
power-admin/src/main/java/com/manage/controller/FontController.java
Unescape Escape View File

@ -559,7 +559,9 @@ public class FontController {
String menuUrl = "/approve/updateApprove";
List<Power_User> users = userMapper.selectUserIdsWithApprove(menuUrl);
for(Power_User user : users){
WsPool.sendMessageToAll("emr_record_"+user.getUserId(),title+STR_SPLIT+content+STR_SPLIT+"emr_record");
if(null != user) {
WsPool.sendMessageToAll("emr_record_" + user.getUserId(), title + STR_SPLIT + content + STR_SPLIT + "emr_record");
}
}
}catch (Exception e){
e.printStackTrace();

14
power-admin/src/main/webapp/WEB-INF/views/dictDir/dict.jsp
Unescape Escape View File

@ -47,8 +47,11 @@
background-color: #fff!important;
overflow: auto!important;
font-size: 14rem!important;
height: 600px!important;
width: 300px!important;
height:75%!important;
width: 100%!important;
}
.zTreeDemo{
margin-left:10%;
}
.treeBtn{
margin-top:-3%;
@ -81,7 +84,6 @@
.contentDiv{
float:left;
width:69%;
height:100%;
margin-left: 1%;
background-color: #fff;
overflow: auto;
@ -107,10 +109,8 @@
<button type="button" class="btn btn-primary btn-sm treeOperBtn" onclick="expandAll();">全部展开</button>
<button type="button" class="btn btn-primary btn-sm treeOperBtn" onclick="collapseAll();">全部折叠</button>
</div>
<div class="content_wrap">
<div class="" style="margin-left:60px">
<ul id="treeDemo" class="ztree"></ul>
</div>
<div id="zTreeDemo" class="zTreeDemo">
<ul id="treeDemo" class="ztree"></ul>
</div>
<div id="rMenu">
<ul>

2
power-admin/src/main/webapp/WEB-INF/views/loginDir/index.jsp
Unescape Escape View File

@ -270,7 +270,7 @@
<div class="page-content-wrapper">
<div class="page-content">
<div class="container-fluid">
<iframe class="row-fluid" style="height:85%;width:100%;" id="iFrame1" name="iFrame1" scrolling="no" frameborder="0"></iframe>
<iframe class="row-fluid" style="height:78%;width:100%;" id="iFrame1" name="iFrame1" scrolling="no" frameborder="0"></iframe>
</div>
</div>
</div>

18
power-admin/src/main/webapp/WEB-INF/views/menu/menuList.jsp
Unescape Escape View File

@ -58,8 +58,15 @@
background-color: #fff!important;
overflow: auto!important;
font-size: 14rem!important;
height: 600px!important;
width: 300px!important;
height:75%!important;
width: 100%!important;
}
.zTreeDemo{
margin-left:10%;
}
.treeBtn{
margin-top:-3%;
padding-left:19%;
}
.iconSpan{
font-size:40px;
@ -87,12 +94,9 @@
<button type="button" class="btn btn-primary btn-sm treeOperBtn" onclick="expandAll();">全部展开</button>
<button type="button" class="btn btn-primary btn-sm treeOperBtn" onclick="collapseAll();">全部折叠</button>
</div>
<div class="content_wrap">
<div class="" style="margin-left:60px">
<ul id="treeDemo" class="ztree"></ul>
</div>
<div id="zTreeDemo" class="zTreeDemo">
<ul id="treeDemo" class="ztree"></ul>
</div>
<div id="rMenu">
<ul>
<pm:myPermissions permissions="/menu/add">

2
power-admin/src/main/webapp/WEB-INF/views/menu/rolePowerList.jsp
Unescape Escape View File

@ -41,7 +41,7 @@
background-color: #fff!important;
overflow: auto!important;
font-size: 14rem!important;
height:80%!important;
height:75%!important;
width: 100%!important;
}
.zTreeDemo{

2
power-admin/src/main/webapp/WEB-INF/views/menu/userPowerList.jsp
Unescape Escape View File

@ -41,7 +41,7 @@
background-color: #fff!important;
overflow: auto!important;
font-size: 14rem!important;
height:70%!important;
height:75%!important;
width: 100%!important;
}
.zTreeDemo{

206
power-admin/src/main/webapp/WEB-INF/views/otherManage/backupDatabase.jsp
Unescape Escape View File

@ -5,7 +5,7 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8" />
<meta charset="utf-8"/>
<title>其他管理</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no"/>
<meta http-equiv="X-UA-Compatible" content="IE=edge">
@ -23,158 +23,132 @@
margin-right: -15px;
margin-bottom: -15px;
}
.panel-heading{
.panel-heading {
padding: 0 16px;
}
hr{
margin:0;
hr {
margin: 0;
}
/**搜索区*/
.searchDiv {
margin-top: 5px;
width:100%;
width: 100%;
height: 30px;
}
.dateSearchDiv{
width:29%;
.dateSearchDiv {
width: 29%;
}
.dateSearchInput{
width:30%;
margin-left:2%;
.dateSearchInput {
width: 30%;
margin-left: 2%;
}
.dateLabelDiv{
.dateLabelDiv {
width: 30%;
text-align: right;
}
.searchInput{
width:19%;
.searchInput {
width: 19%;
margin-left: 2%;
}
.searchElement{
.searchElement {
width: 42%;
}
.searchInputElement{
.searchInputElement {
width: 58%;
}
.labelDiv{
padding-top:3px;
.labelDiv {
padding-top: 3px;
margin-left: 2%;
}
/**查询按钮组*/
.btnsDiv{
.btnsDiv {
width: 100%;
height:32px;
height: 32px;
text-align: right;
padding-top:5px;
}
.pagination{
margin:0!important;
padding-top: 5px;
}
/**表格div*/
.tableDiv{
margin-left:14px;
margin-top: -9px!important;
.tableDiv {
margin-left: 14px;
margin-top: -9px !important;
}
</style>
</head>
<body>
<div class="main">
<%--<div class="headDiv">--%>
<%--<div class="headSpanDiv">--%>
<%--<span class="headspan">--%>
<%--日志管理--%>
<%--</span>--%>
<%--</div>--%>
<%--</div>--%>
<div class="">
<div class="panel-heading"><h4>其他管理/日志管理</h4></div>
<hr>
<!-- tab标签 -->
<%--<ul id="tab" class="nav nav-tabs">
<li class="active">
<a href="#tab1" data-toggle="tab">
数据库备份
</a>
</li>
<li>
<a href="#tab2" data-toggle="tab">
日志管理
</a>
</li>
<li>
<a href="#tab3" data-toggle="tab">
通知管理
</a>
</li>
</ul>
<!-- 每个tab页对应的内容 -->
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade in active" id="tab1">
<p>数据库备份</p>
<div class="main">
<div class="">
<div class="panel-heading"><h4>其他管理/日志管理</h4></div>
<hr>
<div class="searchDiv">
<div class="searchInput left" style="margin-left: 14px">
<div class="searchElement left">
<label class="labelDiv">日志主题：</label>
</div>
<div class="searchInputElement left">
<input type="text" class="form-control input-sm" id="logTitle">
</div>
<div class="tab-pane fade" id="tab2">--%>
<div class="searchDiv">
<div class="searchInput left" style="margin-left: 14px">
<div class="searchElement left">
<label class="labelDiv">日志主题：</label>
</div>
<div class="searchInputElement left">
<input type="text" class="form-control input-sm" id="logTitle">
</div>
</div>
<div class="searchInput left">
<div class="searchElement left">
<label class="labelDiv">日志内容：</label>
</div>
<div class="searchInputElement left">
<input type="text" class="form-control input-sm" id="logContent">
</div>
</div>
<div class="searchInput left">
<div class="searchElement left">
<label class="labelDiv">操作人：</label>
</div>
<div class="searchInputElement left">
<input type="text" class="form-control input-sm" id="creater">
</div>
</div>
<div class="dateSearchDiv left">
<div class="dateLabelDiv left">
<label class="labelDiv">操作时间：</label>
</div>
<div class="dateSearchInput left">
<input type="text" class="form-control input-sm" id="startTime1" placeholder="开始时间">
</div>
<div class="dateSearchInput left">
<input type="text" class="form-control input-sm" id="endTime1" placeholder="结束时间">
</div>
</div>
<div class="left">
<button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
</div>
</div>
<div class="btnsDiv">
<pm:myPermissions permissions="/otherManage/exportExcel">
<button type="button" class="btn btn-sm btn-primary" onclick="exportExcel()"><i class="fa fa-reply"></i>导出</button>
</pm:myPermissions>
<pm:myPermissions permissions="/otherManage/deleteLogByIds">
<button type="button" class="btn btn-sm btn-danger" onclick="deleteLogByIds()">批量删除</button>
</pm:myPermissions>
</div>
<!--数据表格-->
<div class="tableDiv">
<input type="hidden" id="checks">
<table id="bootstrapTable" class="table text-nowrap table-bordered"></table>
</div>
<div class="searchInput left">
<div class="searchElement left">
<label class="labelDiv">日志内容：</label>
</div>
<div class="searchInputElement left">
<input type="text" class="form-control input-sm" id="logContent">
</div>
<%-- <div class="tab-pane fade" id="tab3">
<p>通知管理</p>
</div>
<div class="searchInput left">
<div class="searchElement left">
<label class="labelDiv">操作人：</label>
</div>
</div>--%>
<div class="searchInputElement left">
<input type="text" class="form-control input-sm" id="creater">
</div>
</div>
<div class="dateSearchDiv left">
<div class="dateLabelDiv left">
<label class="labelDiv">操作时间：</label>
</div>
<div class="dateSearchInput left">
<input type="text" class="form-control input-sm" id="startTime1" placeholder="开始时间">
</div>
<div class="dateSearchInput left">
<input type="text" class="form-control input-sm" id="endTime1" placeholder="结束时间">
</div>
</div>
<div class="left">
<button type="button" class="btn btn-sm btn-primary" onclick="refreshTable()">查询</button>
</div>
</div>
<div class="btnsDiv">
<pm:myPermissions permissions="/otherManage/exportExcel">
<button type="button" class="btn btn-sm btn-primary" onclick="exportExcel()"><i class="fa fa-reply"></i>导出
</button>
</pm:myPermissions>
<pm:myPermissions permissions="/otherManage/deleteLogByIds">
<button type="button" class="btn btn-sm btn-danger" onclick="deleteLogByIds()">批量删除</button>
</pm:myPermissions>
</div>
<!--数据表格-->
<div class="tableDiv">
<input type="hidden" id="checks">
<table id="bootstrapTable" class="table text-nowrap table-bordered"></table>
</div>
</div>
</div>
</div>
<script type="text/javascript" src="${path}/static/js/otherManage/backupDatabase.js?t=2222"></script>
<script type="text/javascript" src="${path}/static/js/dateUtil.js"></script>
</body>

2
power-admin/src/main/webapp/WEB-INF/views/roleDir/role.jsp
Unescape Escape View File

@ -82,7 +82,7 @@
<div class="col-md-12">
<div class="panel-heading"><h4>基本管理/角色管理</h4></div>
<hr>
<form class="form-inline" style="margin-top: 5px;" role="form">
<form class="form-inline" style="margin-top: 5px;margin-bottom: 0px;" role="form">
<div class="">
<div class="form-group">
<label>角色名:</label>

15
power-admin/src/main/webapp/WEB-INF/views/userDir/user.jsp
Unescape Escape View File

@ -108,10 +108,10 @@
<label for="user_name">账号:</label>
<input type="text" class="form-control input-sm" id="user_name" maxlength="16"/>
</div>
<div class="form-group">
<%-- <div class="form-group">
<label for="user_email">邮箱地址:</label>
<input type="text" class="form-control input-sm" id="user_email" maxlength="25"/>
</div>
</div>--%>
<div class="form-group">
<label>所属角色:</label>
<div class=" form-group form-inline">
@ -217,19 +217,8 @@
<option value="${dept.deptId}" <c:if test="${deptId == dept.deptId}">selected</c:if>>${dept.deptName}</option>
</c:forEach>
</select>
<%-- <input id="txtTreeSelect1" type="text" onclick="showMenu1(); return false;"
class="form-control input-sm input" placeholder="所属科室"
name="parentId1"
data-id=""
readonly="readonly"
/>--%>
</div>
</div>
<%--<div id="menuContent1" class="menuContent" style="display:none;background: #f9f9f9;
position:static;z-index:10;width:288px;margin-left:170px">
<ul id="treeDemo" class="ztree" style="margin-top: 0; width: 178px;">
</ul>
</div>--%>
<div class="formDiv">
<label class="control-label left">所属角色：</label>
<select class="form-control input input-sm" id="re_roleId" name="roleId">

2
power-admin/src/main/webapp/static/js/dept.js
Unescape Escape View File

@ -389,7 +389,7 @@ $('#queryBtn').click(function () {
})
//获取table的高度
function getHeight() {
return $(window).height() * 0.7;
return $(window).height() * 0.8;
}
//刷新表格
function refresh() {

2
power-admin/src/main/webapp/static/js/role.js
Unescape Escape View File

@ -317,7 +317,7 @@ $('#queryBtn').click(function () {
})
//获取table的高度
function getHeight() {
return $(window).height() * 0.7;
return $(window).height() * 0.8;
}
//刷新表格
function refresh() {

2
power-admin/src/main/webapp/static/js/user.js
Unescape Escape View File

@ -472,7 +472,7 @@ function saveForm(){
}
//获取table的高度
function getHeight() {
return $(window).height() * 0.7;
return $(window).height() * 0.8;
}
//刷新表格
function refresh() {

Write Preview
Loading…
Cancel
Save