微调样式

master
zengwh 6 years ago
parent bc3865bb9b
commit 5632fea50c

@ -170,6 +170,9 @@
height: 30px !important; height: 30px !important;
line-height: 30px !important; line-height: 30px !important;
} }
form{
margin-bottom: 0!important;
}
</style> </style>
</head> </head>
<body> <body>

@ -49,6 +49,7 @@
} }
.inputDiv{ .inputDiv{
padding:0!important; padding:0!important;
margin-left: -3%!important;
} }
.modal-header{ .modal-header{
height:6%; height:6%;

@ -29,13 +29,13 @@
} }
.content-left{ .content-left{
height:100%; height:100%;
width:24%; width:19%;
float:left; float:left;
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.content-right{ .content-right{
height:100%; height:100%;
width:75%; width:80%;
float:right; float:right;
padding-left:1%; padding-left:1%;
background-color: #FFFFFF; background-color: #FFFFFF;
@ -47,7 +47,7 @@
<input type="hidden" id="assortIds"> <input type="hidden" id="assortIds">
<div class="content-left"> <div class="content-left">
<div class="form-group"> <div class="form-group">
<div class="col-sm-8"> <div class="col-sm-7">
<select class="form-control input" id="typeId"> <select class="form-control input" id="typeId">
<c:forEach items="${emrTypes}" var="type"> <c:forEach items="${emrTypes}" var="type">
<option value="${type.id}">${type.typeName}</option> <option value="${type.id}">${type.typeName}</option>
@ -78,6 +78,6 @@
</shiro:hasPermission>--%> </shiro:hasPermission>--%>
<iframe width="100%" height="100%" src="" id="iframe1" frameborder="0" scrolling="yes"></iframe> <iframe width="100%" height="100%" src="" id="iframe1" frameborder="0" scrolling="yes"></iframe>
</div> </div>
<script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordIframe.js"></script> <script type="text/javascript" src="${path}/static/js/recordManage/commomSearch/showRecordIframe.js?t=2020-04-27"></script>
</body> </body>
</html> </html>

@ -30,13 +30,13 @@
} }
.content-left{ .content-left{
height:100%; height:100%;
width:24%; width:23%;
float:left; float:left;
background-color: #FFFFFF; background-color: #FFFFFF;
} }
.content-right{ .content-right{
height:100%; height:100%;
width:75%; width:76%;
float:right; float:right;
padding-left:1%; padding-left:1%;
background-color: #FFFFFF; background-color: #FFFFFF;
@ -53,7 +53,7 @@
<input type="hidden" id="filePath"> <input type="hidden" id="filePath">
<div class="content-left"> <div class="content-left">
<div class="form-group"> <div class="form-group">
<div class="col-sm-6"> <div class="col-sm-5">
<c:if test="${fn:length(emrTypes) != 0}"> <c:if test="${fn:length(emrTypes) != 0}">
<select class="form-control input" id="typeId"> <select class="form-control input" id="typeId">
<c:forEach items="${emrTypes}" var="type"> <c:forEach items="${emrTypes}" var="type">

@ -41,6 +41,13 @@
.indexSelected { .indexSelected {
background-color: #42515F; background-color: #42515F;
} }
#indexTreeMenu:hover{
overflow-y: auto;
overflow-x: hidden;
}
#indexTreeMenu::-webkit-scrollbar{
display: none;
}
</style> </style>
<% <%
String POWER_URLHEAD = (String) request.getParameter("POWER_URLHEAD"); String POWER_URLHEAD = (String) request.getParameter("POWER_URLHEAD");
@ -257,6 +264,7 @@
const footerHeight = ($(".main-footer").height() || 0) + 31; const footerHeight = ($(".main-footer").height() || 0) + 31;
const windowHeight = $(window).height(); const windowHeight = $(window).height();
$("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 37); $("#iFrame1").css("height", windowHeight - headerHeight - footerHeight - 37);
$("#indexTreeMenu").css("height",windowHeight - headerHeight);
}) })
</script> </script>
</body> </body>

@ -91,6 +91,7 @@ function onCheck(e, treeId, treeNode) {
} }
} }
$("#assortIds").val(assortIds); $("#assortIds").val(assortIds);
onloadPdf();
}; };
//打印分类变更事件 //打印分类变更事件
$("#typeId").change(function(){ $("#typeId").change(function(){

@ -237,7 +237,7 @@ function getSql() {
var sql = selectNames + fromTableNames + whereNames; var sql = selectNames + fromTableNames + whereNames;
$("#orderBys").val(orderBys); $("#orderBys").val(orderBys);
$("#sql").val(sql); $("#sql").val(sql);
console.log("sql = " + $("#sql").val()); //console.log("sql = " + $("#sql").val());
//console.log(sql); //console.log(sql);
$("#tableThNames").val(tableThNames); $("#tableThNames").val(tableThNames);
if (tableThNames != '') { if (tableThNames != '') {

@ -197,9 +197,9 @@ http://sourceforge.net/adobe/cmap/wiki/License/
<span id="numPages" class="toolbarLabel"></span> <span id="numPages" class="toolbarLabel"></span>
</div> </div>
<div id="toolbarViewerRight"> <div id="toolbarViewerRight">
<!-- <button id="presentationMode" class="toolbarButton presentationMode hiddenLargeView" title="Switch to Presentation Mode" tabindex="31" data-l10n-id="presentation_mode"> <button id="presentationMode" class="toolbarButton presentationMode hiddenLargeView" title="Switch to Presentation Mode" tabindex="31" data-l10n-id="presentation_mode">
<span data-l10n-id="presentation_mode_label">Presentation Mode</span> <span data-l10n-id="presentation_mode_label">Presentation Mode</span>
</button>--> </button>
<!--<button id="openFile" class="toolbarButton openFile hiddenLargeView" title="Open File" tabindex="32" data-l10n-id="open_file"> <!--<button id="openFile" class="toolbarButton openFile hiddenLargeView" title="Open File" tabindex="32" data-l10n-id="open_file">
<span data-l10n-id="open_file_label">Open</span> <span data-l10n-id="open_file_label">Open</span>
@ -450,7 +450,7 @@ http://sourceforge.net/adobe/cmap/wiki/License/
$('#myModal').modal('show'); $('#myModal').modal('show');
} else { } else {
clearInterval(interval); clearInterval(interval);
$('#myModal').modal('hide'); $('#myModal').remove();
} }
} }
//屏蔽鼠标右键 //屏蔽鼠标右键

@ -7035,8 +7035,8 @@ function webViewerInitialized() {
PDFViewerApplication.setScale(this.value, false); PDFViewerApplication.setScale(this.value, false);
}); });
/*document.getElementById('presentationMode').addEventListener('click', document.getElementById('presentationMode').addEventListener('click',
SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));*/ SecondaryToolbar.presentationModeClick.bind(SecondaryToolbar));
/**document.getElementById('openFile').addEventListener('click', /**document.getElementById('openFile').addEventListener('click',
SecondaryToolbar.openFileClick.bind(SecondaryToolbar));*/ SecondaryToolbar.openFileClick.bind(SecondaryToolbar));*/

Loading…
Cancel
Save