更新版本20201113

master
zengwh 5 years ago
parent 5f8800bdcc
commit efb644144c

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

@ -9,12 +9,12 @@ TOKEN_EXPIRE_TIME = 7200
##################################################\u670D\u52A1\u5668ip##########################################################
#\u901A\u7528\u670D\u52A1\u5668IP\u4E0E\u901A\u7528\u670D\u52A1\u5668\u7AEF\u53E3
#SERVER_IP = 192.168.1.3
#SERVER_PORT = 8081
SERVER_IP = 200.100.104.40
SERVER_IP = 192.168.1.3
SERVER_PORT = 8081
#SERVER_IP = 200.100.104.40
#SERVER_PORT = 8081
#power\u6743\u9650\u7CFB\u7EDFip
POWER_IP = ${SERVER_IP}
#\u6743\u9650\u7CFB\u7EDF\u7AEF\u53E3
@ -23,7 +23,7 @@ POWER_PORT = ${SERVER_PORT}
#\u75C5\u6848\u5F52\u6863\u7CFB\u7EDFip
EMRMEDICALRECORD_IP = ${SERVER_IP}
#\u75C5\u6848\u5F52\u6863\u7CFB\u7EDF\u7AEF\u53E3
EMRMEDICALRECORD_PORT = ${SERVER_PORT}
EMRMEDICALRECORD_PORT = 8082
#\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDFip
EMRRECORD_IP = ${SERVER_IP}
#\u75C5\u6848\u7BA1\u7406\u7CFB\u7EDF\u7AEF\u53E3

@ -1,16 +1,16 @@
#\u6570\u636E\u5E93IP
#dataBaseIp=localhost
##\u6570\u636E\u5E93\u540D\u79F0
#dataBaseName=gmpower
##\u6570\u636E\u5E93\u5BC6\u7801
#dataBasePassword=docus702
dataBaseIp=localhost
#\u6570\u636E\u5E93\u540D\u79F0
dataBaseName=gmpower
#\u6570\u636E\u5E93\u5BC6\u7801
dataBasePassword=docus702
#\u6570\u636E\u5E93IP
dataBaseIp=200.100.104.40
\u6570\u636E\u5E93\u540D\u79F0
dataBaseName=power
\u6570\u636E\u5E93\u5BC6\u7801
dataBasePassword=AbcXyz123
#dataBaseIp=200.100.104.40
##\u6570\u636E\u5E93\u540D\u79F0
#dataBaseName=power
##\u6570\u636E\u5E93\u5BC6\u7801
#dataBasePassword=AbcXyz123
jdbc.driver=com.mysql.jdbc.Driver
jdbc.username=root

@ -34,6 +34,7 @@
<script src="${path}/static/js/i18n/defaults-zh_CN.min.js"></script>
<script src="${path}/static/js/toastr.min.js"></script>
<script src="${path}/static/js/jquery.form.js"></script>
<script src="${path}/static/js/pinying.js"></script>
<script>
toastr.options.positionClass = 'toast-top-right';
</script>

@ -319,7 +319,7 @@
<!-- 底部版权-->
<footer class="main-footer">
<div class="pull-right hidden-xs">
<b>Version</b> 20201111
<b>Version</b> 20201113
</div>
<strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
reserved.

@ -274,7 +274,7 @@
<!-- 底部版权-->
<footer class="main-footer">
<div class="pull-right hidden-xs">
<b>Version</b> 20201111
<b>Version</b> 20201113
</div>
<strong>Copyright &copy; 2019-2090 厦门嘉时软件.</strong> All rights
reserved.

@ -86,6 +86,12 @@
.form-group {
padding-top: 5px;
}
.bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn) {
width: 132px!important;
}
.dropdown-menu open{
min-width: 197px!important;
}
</style>
</head>
<body>
@ -121,7 +127,7 @@
<div class="form-group">
<label for="dept_id">所属科室:</label>
<div class="form-group form-inline">
<select class="form-control input-sm" style="width:106px" id="dept_id">
<select class="selectpicker bla bla bli" data-live-search="true" style="width:106px" id="dept_id">
<option value="">全部</option>
</select>
</div>
@ -306,12 +312,12 @@
<script>
$(function () {
$(".modal-dialog").draggable();//为模态对话框添加拖拽
$("#dept_id").select2()
//$("#dept_id").select2()
})
</script>
<script src="${path}/static/zTree_v3-master/js/jquery.ztree.core.js"></script>
<script src="${path}/static/zTree_v3-master/js/jquery.ztree.excheck.js"></script>
<script src="${path}/static/js/user.js?t=2020-11-10"></script>
<script src="${path}/static/js/user.js?t=2020-11-13"></script>
<%@ include file="/WEB-INF/jspf/importExcelJsp.jspf" %>
</body>
</html>

File diff suppressed because one or more lines are too long

@ -2,6 +2,12 @@ var pageNumber=1;
var form = '';
//定义表格内容最大高度
var maxHeight = 0;
document.onkeydown = function (event) {
var e = event || window.event;
if (e && e.keyCode == 13) { //回车键的键值为13
$('#bootstrapTable').bootstrapTable('refresh'); //调用登录按钮的登录事件
}
};
$(function(){
$('#myModal').modal('hide');
loadDept();
@ -281,13 +287,18 @@ function loadDept(){
success: function(data){
var html = '';
for(var i = 0;i < data.extend.list.length;i++){
html += '<option value="'+data.extend.list[i].deptId+'">' + data.extend.list[i].deptName
var deptName = data.extend.list[i].deptName;
var py = makePy(deptName);
var pingyin = ConvertPinyin(deptName);
html += '<option value="'+data.extend.list[i].deptId+'" data-tokens="' + deptName + '|' + py[0] + '|' + pingyin + '">' + deptName
+ '</option>';
}
$('#dept_id').append(html);
$(".selectpicker").selectpicker('refresh');
}
});
}
//搜索
$('#queryBtn').click(function () {
$("#checks").val("");

Loading…
Cancel
Save