Skip to content

H
hp-smart
Commit 0150172e by liuyang
Options

2024-03-29 企业log优化

parent 4a80baf1
Showing with 132 additions and 131 deletions
src/main/resources/META-INF/resources/iPlatV7-index.js
...@@ -2443,20 +2443,33 @@ $(function () { ...@@ -2443,20 +2443,33 @@ $(function () {
} }
}); });
} }
if (loginName !== "admin"){ try {
var info = new EiInfo() if (loginName !== "admin"){
info.set("inqu_status-0-companyCode",loginName) var info = new EiInfo()
EiCommunicator.send("HPPZ009", "query", info, { info.set("inqu_status-0-companyCode",loginName)
onSuccess: function (ei) {//返回结果集 EiCommunicator.send("HPPZ009", "query", info, {
if (ei.blocks.result !== undefined){ onSuccess: function (ei) {//返回结果集
let results = ei.getBlock("result").getMappedRows() if (ei.blocks.result !== undefined){
let results = ei.getBlock("result").getMappedRows();
$("#sidebar img").attr("src",downloadHref(results[0].docIdPc,results[0].projectEnv)); if (results.length>0 && results[0].docIdPc.length>0){
let src = downloadHref(results[0].docIdPc,results[0].projectEnv)
let img=`<img src="${src}" style='width:200px;height:55px;background-image: none;'/>`;
$("#sidebar .sidebar-content .side-header").html(img);
//$("#sidebar .sidebar-content .side-header").attr("src",downloadHref(results[0].docIdPc,results[0].projectEnv));
}else {
$("#sidebar .sidebar-content .side-header").html("<span class=\"logo\"></span>");
}
}else {
$("#sidebar .sidebar-content .side-header").html("<span class=\"logo\"></span>");
}
}, onFail: function (ei) {
} }
}, {async: false});
}, onFail: function (ei) { }else {
} $("#sidebar .sidebar-content .side-header").html("<span class=\"logo\"></span>");
}, {async: false}); }
} catch (error) {
$("#sidebar .sidebar-content .side-header").html("<span class=\"logo\"></span>");
} }
}) })
......
src/main/resources/META-INF/resources/iPlatV7-index.jsp
...@@ -183,27 +183,27 @@ ...@@ -183,27 +183,27 @@
<div id="page-container" class="i-index-content sidebar-l sidebar-o side-scroll header-navbar-fixed"> <div id="page-container" class="i-index-content sidebar-l sidebar-o side-scroll header-navbar-fixed">
<input type="hidden" id="efSecurityToken" value="<%=efSecurityToken%>"/> <input type="hidden" id="efSecurityToken" value="<%=efSecurityToken%>"/>
<div id="sidebar"> <div id="sidebar">
<div class="sidebar-content"> <div class="sidebar-content">
<!-- Side Header --> <!-- Side Header -->
<div class="side-header"> <div class="side-header">
<img src="${ctx}/hpjx-logo.png" style="width:200px;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>
<!-- END Side Header --> <!-- END Side Header -->
<!-- Side Content --> <!-- Side Content -->
<div id="iplat-menu" class="side-content"> <div id="iplat-menu" class="side-content">
</div> </div>
<div id="side-toggle" class="side-content-toggle"> <div id="side-toggle" class="side-content-toggle">
<span class="hide-mini fa fa-thumb-tack"></span> <span class="hide-mini fa fa-thumb-tack"></span>
<span class="hide-normal fa fa-bars"></span> <span class="hide-normal fa fa-bars"></span>
</div>
<!-- END Side Content -->
</div> </div>
<!-- END Side Content -->
</div>
<!-- Sidebar Content --> <!-- Sidebar Content -->
</div> </div>
<div id="header-navbar"> <div id="header-navbar">
<ul class="nav-header pull-right"> <ul class="nav-header pull-right">
......
src/main/webapp/HP/PZ/HPPZ009.js
...@@ -10,17 +10,20 @@ $(function () { ...@@ -10,17 +10,20 @@ $(function () {
} }
}, },
onAdd: function (e) { onAdd: function (e) {
e.preventDefault() e.preventDefault();
$("#type").val("update") $("#type").val("insert")
$("#companyName").val(); $("#companyName").val("");
$("#loginPrefix").val(); $("#loginPrefix").val("");
$("#validFlag").val(); $("#validFlag").val(1);
$("#PCfileDocId").val(); $("#PCfileDocId").val("");
$("#APPfileDocId").val(); $("#APPfileDocId").val("");
$("#remark").val(); $("#remark").val("");
$("#id").val(); $("#id").val("");
$("#companyCode").val(); $("#companyCode").val("");
addCompany($("#insertGroup")) $("#insertGroup_wnd_title").text("新增企业管理");
clealImgLabel($("#app-img"));
clealImgLabel($("#pc-img"));
addCompany($("#insertGroup"));
}, },
onSave: function (e) { onSave: function (e) {
// 阻止后台保存请求，使用自定义保存 // 阻止后台保存请求，使用自定义保存
...@@ -41,6 +44,8 @@ $(function () { ...@@ -41,6 +44,8 @@ $(function () {
* e.tr tr, jquery * e.tr tr, jquery
*/ */
onRowClick: function (e) { onRowClick: function (e) {
let app = $("#app-img"),
pc = $("#pc-img");
$("#type").val("update"); $("#type").val("update");
$("#companyCode").val(e.model.companyCode); $("#companyCode").val(e.model.companyCode);
$("#companyName").val(e.model.companyName); $("#companyName").val(e.model.companyName);
...@@ -50,7 +55,10 @@ $(function () { ...@@ -50,7 +55,10 @@ $(function () {
$("#APPfileDocId").val(e.model.docIdApp); $("#APPfileDocId").val(e.model.docIdApp);
$("#remark").val(e.model.remark); $("#remark").val(e.model.remark);
$("#id").val(e.model.id); $("#id").val(e.model.id);
addCompany($("#insertGroup")) addImgLabel(app,e.model.docIdApp);
addImgLabel(pc,e.model.docIdPc);
$("#insertGroup_wnd_title").text("修改企业管理");
addCompany($("#insertGroup"));
/*WindowUtil({ /*WindowUtil({
"title": "", "title": "",
"content": "<div class='kendo-del-message'>" + e.row + "</div>" "content": "<div class='kendo-del-message'>" + e.row + "</div>"
...@@ -66,7 +74,6 @@ $(function () { ...@@ -66,7 +74,6 @@ $(function () {
// 删除 // 删除
$("#BTN_DELETE").on("click", deleteFunc); $("#BTN_DELETE").on("click", deleteFunc);
IPLATUI.EFUpload = { IPLATUI.EFUpload = {
docIdApp: { docIdApp: {
showFileList:false, showFileList:false,
...@@ -85,13 +92,9 @@ $(function () { ...@@ -85,13 +92,9 @@ $(function () {
return; return;
} }
$("#APPfileDocId").val(docId); $("#APPfileDocId").val(docId);
addImgLabel($("#app-img"),docId);
//$("#app-img").attr("src",downloadHref(docId));
NotificationUtil("附件上传成功"); NotificationUtil("附件上传成功");
//console.log($("#fileDocId").val())
//saveTemp(e);
/*try {
parent.JSColorbox.setValueCallback(e);
} catch (e){
}*/
}, },
}, },
docIdPc: { docIdPc: {
...@@ -111,13 +114,9 @@ $(function () { ...@@ -111,13 +114,9 @@ $(function () {
return; return;
} }
$("#PCfileDocId").val(docId); $("#PCfileDocId").val(docId);
addImgLabel($("#pc-img"),docId);
/*$("#pc-img").attr("src",downloadHref(docId));*/
NotificationUtil("附件上传成功"); NotificationUtil("附件上传成功");
//console.log($("#fileDocId").val())
//saveTemp(e);
/*try {
parent.JSColorbox.setValueCallback(e);
} catch (e){
}*/
}, },
} }
}; };
...@@ -269,36 +268,21 @@ $("#update").click(function () { ...@@ -269,36 +268,21 @@ $("#update").click(function () {
*/ */
function addCompanyCallback(e) { function addCompanyCallback(e) {
resultGrid.dataSource.page(1); resultGrid.dataSource.page(1);
/*let result = new EiInfo();
let docId = e.response.docId;
let docName = e.response.docName;
let docSize = e.response.docSize;
let docTag = e.response.docTag;
let docUrl = e.response.docUrl;
result.set("result-0-docId",docId);
result.set("result-0-docName",docName);
result.set("result-0-docSize",docSize);
result.set("result-0-docTag",docTag);
result.set("result-0-realPath",docUrl);
EiCommunicator.send("HPXS003", "insert", result, {
onSuccess: function (ei) {
if (ei.getStatus() >= 0) {
if (ei.getStatus() == 0) {
NotificationUtil(ei, 'warning');
} else {
NotificationUtil(ei);
}
} else {
NotificationUtil(ei, "error");
}
resultGrid.dataSource.page(1);
},
onFail: function (ei) {
// 发生异常
NotificationUtil("执行失败，原因[" + ei + "]", "error");
}
}, {
async: false
});*/
} }
function addImgLabel (id,docId) {
clealImgLabel(id);
if (isBlank(docId)){
return;
}
let src = downloadHref(docId)
let img=`<img src="${src}" style='width:200px;height:55px;background-image: none;'/>`;
id.html(img);
}
function clealImgLabel(id) {
id.html("");
}
src/main/webapp/HP/PZ/HPPZ009.jsp
...@@ -13,7 +13,7 @@ ...@@ -13,7 +13,7 @@
</EF:EFRegion> </EF:EFRegion>
<EF:EFRegion id="result" title="记录集"> <EF:EFRegion id="result" title="记录集">
<EF:EFGrid blockId="result" autoDraw="override" checkMode="row"> <EF:EFGrid blockId="result" autoDraw="override" checkMode="single">
<EF:EFColumn ename="id" cname="主键" hidden="true"/> <EF:EFColumn ename="id" cname="主键" hidden="true"/>
<EF:EFColumn ename="docIdPc" cname="主键" hidden="true"/> <EF:EFColumn ename="docIdPc" cname="主键" hidden="true"/>
<EF:EFColumn ename="docIdApp" cname="主键" hidden="true"/> <EF:EFColumn ename="docIdApp" cname="主键" hidden="true"/>
...@@ -35,58 +35,62 @@ ...@@ -35,58 +35,62 @@
<span style='color: red;font-size: 13px;'>说明：新增企业时会同步新增企业管理员账户，账号和密码与企业编码相同</span> <span style='color: red;font-size: 13px;'>说明：新增企业时会同步新增企业管理员账户，账号和密码与企业编码相同</span>
</EF:EFRegion> </EF:EFRegion>
<EF:EFWindow id="insertGroup" top="100px" left="280px" width="38%" height="70%"> <EF:EFWindow id="insertGroup" title="企业管理" top="100px" left="280px" width="40%" height="70%">
<form> <form>
<div class="form-group row"> <div class="form-group row">
<label for="companyName" class="col-sm-2 col-form-label col-form-label-sm">企业名称</label> <label for="companyName" class="col-sm-2 col-form-label col-form-label-sm">企业名称</label>
<div class="col-sm-6"> <div class="col-sm-6">
<input type="text" class="form-control" id="companyName" required="required"> <input type="text" class="form-control" id="companyName" placeholder="企业名称" aria-label="企业名称" required="required">
</div>
</div> </div>
<div class="form-group row"> </div>
<label for="loginPrefix" class="col-sm-2 col-form-label col-form-label-sm">登录前缀</label> <div class="form-group row">
<div class="col-sm-6"> <label for="loginPrefix" class="col-sm-2 col-form-label col-form-label-sm">登录前缀</label>
<input type="text" class="form-control" id="loginPrefix"> <div class="col-sm-6">
</div> <input type="text" class="form-control" id="loginPrefix" placeholder="登录前缀" aria-label="登录前缀">
</div> </div>
<div class="form-group row"> </div>
<label for="validFlag" class="col-sm-2 col-form-label col-form-label-sm">是否启用</label> <div class="form-group row">
<div class="col-sm-6"> <label for="validFlag" class="col-sm-2 col-form-label col-form-label-sm">是否启用</label>
<select class="form-control" id="validFlag"> <div class="col-sm-6">
<option value="1">是</option> <select class="form-control" id="validFlag">
<option value="0">否</option> <option value="1">是</option>
</select> <option value="0">否</option>
</div> </select>
</div>
<div class="form-group row">
<label for="docIdPc" class="col-sm-2 col-form-label">PC端log</label>
<div class="col-sm-6">
<EF:EFUpload ename="docIdPc" cname="PC上传" docTag="hk_filePc" path="A"/>
<%--<input type="file" class="form-control" id="docIdPc">--%>
</div>
<input type="hidden" id="PCfileDocId" value="">
</div> </div>
<div class="form-group row"> </div>
<label for="docIdApp" class="col-sm-2 col-form-label">APP端log</label> <div class="form-group row">
<div class="col-sm-6"> <label for="docIdPc" class="col-sm-2 col-form-label">PC端log</label>
<EF:EFUpload ename="docIdApp" cname="APP上传" docTag="hk_fileApp" path="A"/> <div class="col-sm-6">
<%--<input type="file" class="form-control" accept="image/*" id="docIdApp">--%> <EF:EFUpload ename="docIdPc" cname="PC上传" docTag="hk_filePc" path="A"/>
<div class="side-header" id="pc-img" style="background-color: whitesmoke">
<img src="${ctx}/hpjx-logo.png" style="width:200px;height:55px;background-image: none;" alt="pc端log"/>
</div> </div>
<input type="hidden" id="APPfileDocId" value="">
</div> </div>
<div class="form-group row"> <input type="hidden" id="PCfileDocId" value="">
<label for="remark" class="col-sm-2 col-form-label col-form-label-sm">备注</label> </div>
<div class="col-sm-6"> <div class="form-group row">
<input type="text" class="form-control" id="remark"> <label for="docIdApp" class="col-sm-2 col-form-label">APP端log</label>
<div class="col-sm-6">
<EF:EFUpload ename="docIdApp" cname="APP上传" docTag="hk_fileApp" path="A"/>
<div class="side-header" id="app-img" style="background-color: whitesmoke">
<img src="${ctx}/hpjx-logo.png" style="width:200px;height:55px;background-image: none;" alt="app端log"/>
</div> </div>
</div> </div>
<input type="hidden" id="type" value="insert"> <input type="hidden" id="APPfileDocId" value="">
<input type="hidden" id="id" value=""> </div>
<input type="hidden" id="companyCode" value=""> <div class="form-group row">
<div class="form-group col-md-6 col-sm-6 col-sm-offset-9"> <label for="remark" class="col-sm-2 col-form-label col-form-label-sm">备注</label>
<button type="button" onclick="save()" class="btn btn-info">确认</button> <div class="col-sm-6">
<textarea id="remark" class="form-control" placeholder="备注" aria-label="备注"></textarea>
</div> </div>
</form> </div>
<input type="hidden" id="type" value="insert">
<input type="hidden" id="id" value="">
<input type="hidden" id="companyCode" value="">
<div class="form-group col-md-6 col-sm-6 col-sm-offset-9">
<button type="button" onclick="save()" class="btn btn-primary">确认</button>
</div>
</form>
</EF:EFWindow> </EF:EFWindow>
<EF:EFWindow id="updateGroup" top="100px" left="280px" width="58%" height="80%"> <EF:EFWindow id="updateGroup" top="100px" left="280px" width="58%" height="80%">
......
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