Commit 2bd632c8 by wancheng

Merge remote-tracking branch 'origin/dev' into dev

parents d20d0011 7b2dbe38
...@@ -2444,7 +2444,7 @@ $(function () { ...@@ -2444,7 +2444,7 @@ $(function () {
}); });
} }
var info = new EiInfo() /*var info = new EiInfo()
EiCommunicator.send("HPXS003", "queryMaxLog", info, { EiCommunicator.send("HPXS003", "queryMaxLog", info, {
onSuccess: function (ei) {//返回结果集 onSuccess: function (ei) {//返回结果集
let results = ei.getBlock("result").getMappedRows() let results = ei.getBlock("result").getMappedRows()
...@@ -2454,7 +2454,7 @@ $(function () { ...@@ -2454,7 +2454,7 @@ $(function () {
}, onFail: function (ei) { }, onFail: function (ei) {
} }
}, {async: false}); }, {async: false});*/
}) })
function timedisplay() { function timedisplay() {
......
...@@ -185,8 +185,8 @@ ...@@ -185,8 +185,8 @@
<div id="sidebar"> <div id="sidebar">
<div class="sidebar-content"> <div class="sidebar-content">
<!-- Side Header --> <!-- Side Header -->
<div class="side-header" style="text-align: center;"> <div class="side-header">
<img src="${ctx}/hpjx-logo.png" style="height:55px;background-image: none;"/> <img src="${ctx}/hpjx-logo.png" style="width:200px;height:55px;background-image: none;"/>
<%-- <span class="logo"></span>--%> <%-- <span class="logo"></span>--%>
<%--<span class="projectType">[<%=projectTypeDesc%>]</span>--%> <%--<span class="projectType">[<%=projectTypeDesc%>]</span>--%>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment