Skip to content

H
hp-smart
Commit 3f2de241 by wancheng
Options

生产日报页面优化

parent 46c4433b
Showing with 50 additions and 47 deletions
src/main/java/com/baosight/hpjx/hp/bi/domain/HPBI001.java
......@@ -392,7 +392,7 @@ public class HPBI001 extends DaoEPBase {
* @param novValue
*/
public void setnovValue(String novValue) {
this.octValue = novValue;
this.novValue = novValue;
}
/**
......@@ -409,7 +409,7 @@ public class HPBI001 extends DaoEPBase {
* @param decValue
*/
public void setdecValue(String decValue) {
this.octValue = decValue;
this.decValue = decValue;
}
/**
......
src/main/java/com/baosight/hpjx/hp/bi/service/ServiceHPBI001.java
......@@ -7,6 +7,7 @@ import com.baosight.hpjx.core.dao.DaoUtils;
import com.baosight.hpjx.hp.bi.domain.HPBI001;
import com.baosight.hpjx.hp.constant.HPConstant;
import com.baosight.hpjx.hp.kc.domain.HPKC001;
import com.baosight.hpjx.hp.kc.domain.HPKC007;
import com.baosight.hpjx.hp.kc.tools.HPKCTools;
import com.baosight.hpjx.hp.pz.tools.HPPZTools;
import com.baosight.hpjx.util.*;
......@@ -40,9 +41,18 @@ public class ServiceHPBI001 extends ServiceBase {
* @param inInfo
* @return
*/
/* public EiInfo initLoad(EiInfo inInfo) {
return query(inInfo);
}*/
public EiInfo initLoad(EiInfo inInfo) {
try {
Map queryMap = new HashMap();
queryMap.put("inventTypes", DEFAULT_INVENT_CODE);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.WH_RECORD_BLOCK_ID), queryMap);
CommonMethod.initBlock(inInfo, Arrays.asList(DdynamicEnum.FACTORY_RECORD_BLOCK_ID), queryMap);
//inInfo.addBlock(EiConstant.resultBlock).addBlockMeta(new HPKC007().eiMetadata);
} catch (PlatException e) {
LogUtils.setDetailMsg(inInfo, e, "初始化失败");
}
return inInfo;
}
/**
* 查询操作
......
src/main/java/com/baosight/hpjx/hp/bi/sql/HPBI001.xml
......@@ -59,7 +59,7 @@
'' AS DATE
FROM DUAL
UNION ALL
SELECT '人均产量（kg）' AS INDNAME,'' AS DAYVALUE,
SELECT '人均产量（kg）' AS INDNAME,111 AS DAYVALUE,
14 AS MONVALUE, 14 AS YEARVALUE,
14 AS JANVALUE, 14 AS FEBVALUE,
14 AS MARVLAUE, 14 AS APRVALUE,
......@@ -72,12 +72,12 @@
FROM DUAL
) A
WHERE 1=1
<isNotEmpty prepend=" AND " property="factory">
<!-- <isNotEmpty prepend=" AND " property="factory">
FACTORY LIKE CONCAT('%',CONCAT( #factory#,'%'))
</isNotEmpty>
<isNotEmpty prepend=" AND " property="date">
</isNotEmpty>-->
<!-- <isNotEmpty prepend=" AND " property="date">
DATE = #date#
</isNotEmpty>
</isNotEmpty>-->
<dynamic prepend="ORDER BY">
<isEmpty property="orderBy">
INDNAME desc
......@@ -102,12 +102,12 @@
SELECT '人均日产' AS SERIES,'585kg' AS VALUE,NULL AS FACTORY,NULL AS DATE, 5 AS SORT FROM DUAL
) A
WHERE 1=1
<isNotEmpty prepend=" AND " property="factory">
<!-- <isNotEmpty prepend=" AND " property="factory">
FACTORY LIKE CONCAT('%',CONCAT( #factory#,'%'))
</isNotEmpty>
<isNotEmpty prepend=" AND " property="date">
DATE = #date#
</isNotEmpty>
</isNotEmpty>-->
<dynamic prepend="ORDER BY">
<isEmpty property="orderBy">
SORT asc
......
src/main/webapp/HP/BI/HPBI001.js
$(function () {
$(document).ready(function() {
$("#inqu_status-0-date").data("kendoDatePicker").value(new Date());
});
//$("#inqu_status-date").data("kendoDatePicker").value(new Date());
//$(element) .data("kendoDatePicker").value(Date)
$("#QUERY").click();
/* $("#QUERY").on("click", function () {
resultGrid.dataSource.page(1);
buildOption("scrb");
......@@ -21,6 +26,7 @@ $(function () {
$('#mrsj').append(str);
})
buildOption("scrb");
resultGrid.dataSource.page(1);
},
// 服务调用失败后的回调函数 onFail
onFail: function(errorMsg, status, e) {
......@@ -28,8 +34,8 @@ $(function () {
console.log(errorMsg)
}
}, {async: true});
resultGrid.dataSource.page(1);
buildOption("scrb");
//resultGrid.dataSource.page(1);
//buildOption("scrb");
});
// 导出
$("#EXPORT").on("click", function () {
......@@ -39,30 +45,7 @@ $(function () {
$(".k-menu-link").click();
});
IPLATUI.EFGrid.result = {
pageable: {
pageSize: 20,
pageSizes: [10, 20, 50, 70, 100],
},
columns: [
{
field: "operator",
template: function (item) {
let auditStatus = item.status;
let template = '';
if (auditStatus == 0) {
template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
'onclick="check(' + item.id + ',1)" >提交</a>';
}
// else if (auditStatus == 1) {
// template += '<a style="cursor: pointer;display: inline-flex;justify-content: center;" ' +
// 'onclick="check(' + item.id + ',0)" >撤回</a>';
// }
return template;
}
}
],
}
});
function check(id, auditStatus) {
......@@ -89,7 +72,8 @@ function buildOption(vid){
var colors = ['#5470C6', '#91CC75', '#EE6666'];
var option = {
title: {
text: '柱状图与折线图'
text: '生产月报',
left: 'center'
},
tooltip: {
trigger: 'axis',
......@@ -106,7 +90,7 @@ function buildOption(vid){
xAxis: {
type: 'category',
//boundaryGap: false,
data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
data: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月']
},
yAxis: [
{
......@@ -127,7 +111,7 @@ function buildOption(vid){
color: '#4874CB',
yAxisIndex: 0,
barWidth: 15,
data: [120, 200, 150, 80, 70, 110, 130]
data: [120, 200, 150, 80, 70, 110, 130,120, 200, 150, 80, 70]
},
{
name: '生产人数（吨）',
......@@ -135,14 +119,14 @@ function buildOption(vid){
color: '#EE822F',
yAxisIndex: 0,
barWidth: 15,
data: [130, 120, 200, 160, 80, 70, 140]
data: [130, 120, 200, 160, 80, 70, 140,130, 120, 200, 160, 80]
},
{
name: '人均产量（kg）',
type: 'line',
color:'#F2BA03',
yAxisIndex: 1, // 指定该系列在y轴上的位置，默认是0，可选为：0 | 1 | 2 | ... | n (正整数)
data: [130, 120, 200, 160, 80, 70, 140]
data: [130, 120, 200, 160, 80, 70, 140,130, 120, 200, 160, 80]
}
]
};
......
src/main/webapp/HP/BI/HPBI001.jsp
......@@ -13,11 +13,20 @@
<EF:EFRegion id="inqu" title="查询条件">
<div class="row">
<EF:EFSelect cname="工厂" defaultValue="0" ename="inqu_status-0-factory" colWidth="3">
<%-- <EF:EFSelect cname="工厂" defaultValue="0" ename="inqu_status-0-factory" colWidth="3">
<EF:EFOption label="黄陂" value="黄陂"/>
<EF:EFOption label="红安" value="红安"/>
</EF:EFSelect>--%>
<EF:EFSelect cname="工厂" ename="inqu_status-0-factory" colWidth="3" filter="contains">
<%--<EF:EFOption label="全部" value=""/>--%>
<EF:EFOptions blockId="factory_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>
<EF:EFDatePicker ename="inqu_status-date" colWidth="3" cname="日期:"
<%-- <EF:EFSelect cname="仓库名称" ename="inqu_status-0-whCode" colWidth="3" filter="contains">
<EF:EFOption label="全部" value=""/>
<EF:EFOptions blockId="wh_record_block_id" textField="textField" valueField="valueField"/>
</EF:EFSelect>--%>
<EF:EFDatePicker ename="inqu_status-0-date" colWidth="3" cname="日期:"
format="yyyy-MM-dd"/>
</div>
<%-- <EF:EFButton ename="QUERY" cname="查询" row="1" class="btn-align-right"></EF:EFButton>--%>
......@@ -32,7 +41,7 @@
<EF:EFRegion id="result" title="汇总数据">
<EF:EFGrid blockId="result" autoDraw="no">
<EF:EFColumn ename="id" cname="主键" hidden="true"/>
<%-- <EF:EFColumn ename="id" cname="主键" hidden="true"/>--%>
<EF:EFColumn ename="indNmae" cname="指标名称" readonly="true"/>
<EF:EFColumn ename="dayValue" cname="日" readonly="true"/>
<EF:EFColumn ename="monValue" cname="月" readonly="true"/>
......
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