Skip to content

K
kwell-mes
Commit 28d1a1f8 authored by yff's avatar yff
Browse files
Options

Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

parents f16cabbe 76a022ac
Expand all Show whitespace changes
Inline Side-by-side
Showing with 53 additions and 691 deletions
gavel/src/main/resources/static/js/dashboard/echarts.js
View file @ 28d1a1f8
......@@ -2008,12 +2008,17 @@ function oaechart(chart) {
itemStyle: {
normal: {
label: {
textStyle: {
fontSize:10
},
show: true,
// formatter: '{b} : {c} ({d}%)'
formatter: '{b}:({d}%)'
},
labelLine: {
show: true
show: true,
}
}
},
......@@ -2038,7 +2043,7 @@ function setproduceEchart(chart,apidata) {
show: false
},
grid: {
top: "10%",
top: "20",
left: "5%",
bottom: "0%",
right: "5%",
......@@ -2062,7 +2067,11 @@ function setproduceEchart(chart,apidata) {
},
axisLabel: {
show: true,
color: 'white'
color: 'white',
textStyle: {
// color: '#000',
fontSize:'10',
}
}
},
......
gavel/src/main/resources/templates/views/bom/bom/edit.html deleted 100644 → 0
View file @ f16cabbe
<div id="bomBomEdit" class="e-dialog-container" data-options="width:720,height:320">
<div class="e-single-dialog">
<input type="hidden" name="flag">
<input type="hidden" name="id" >
<input type="hidden" name="xh" >
<input type="hidden" name="bomid" >
<!-- <div class="gui-row" style="display: none">
<div class="gui-col-sm12">
<label class="gui-form-label">产品结构：</label>
<div class="gui-input-block">
<input type="text" name="bomid" data-toggle="gui-textbox" data-options="required:true" disabled >
</div>
</div>
</div>-->
<div class="gui-row">
<div class="gui-col-sm6" >
<label class="gui-form-label">物料：</label>
<div class="gui-input-block">
<input type="text" name="wlid" data-toggle="gui-textbox" data-title="wlxxName" data-options="required:true" >
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">单位用量：</label>
<div class="gui-input-block">
<input type="text" name="dwyl" data-toggle="gui-textbox" data-options="required:true" >
</div>
</div>
</div>
<div class="gui-row" >
<!-- <div class="gui-col-sm4">
<label class="gui-form-label">工厂：</label>
<div class="gui-input-block">
<input type="text" name="gcid" data-toggle="gui-textbox" >
</div>
</div>-->
<!-- <div class="gui-col-sm4">
<label class="gui-form-label">序号：</label>
<div class="gui-input-block">
<input type="text" name="xh" data-toggle="gui-textbox" data-options="" >
</div>
</div>-->
</div>
<div class="gui-row" >
<div class="gui-col-sm6">
<label class="gui-form-label">损耗率：</label>
<div class="gui-input-block">
<input type="text" name="shl" data-toggle="gui-textbox" data-options="" >
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">损耗值：</label>
<div class="gui-input-block">
<input type="text" name="shz" data-toggle="gui-textbox" data-options="" >
</div>
</div>
</div>
<div class="gui-row">
<div class="gui-col-sm6">
<label class="gui-form-label">发放原则：</label>
<div class="gui-input-block">
<input type="text" name="ffyz" data-toggle="gui-textbox" data-options="required:true" >
</div>
</div>
<div class="gui-col-sm6">
<label class="gui-form-label">发放工序：</label>
<div class="gui-input-block">
<input type="text" name="ffgx" data-toggle="gui-textbox" data-title="gylxName" data-options="" >
<input type="hidden" name="gylxName">
</div>
</div>
</div>
<div class="gui-row" >
<div class="gui-col-sm12">
<label class="gui-form-label">备注：</label>
<div class="gui-input-block">
<input type="text" name="bz" data-toggle="gui-textbox" data-options="" >
</div>
</div>
</div>
</div>
<div class="e-dialog-footer">
<a href="javascript:void(0);" class="e-dialog-ok"></a>
<a href="javascript:void(0);" class="e-dialog-cancel"></a>
</div>
</div>
<script>
$(function () {
var $dialog=$('#bomBomEdit');
var $edtbomid=$dialog.find("input[name='bomid']");
var $edtWlid=$dialog.find("input[name='wlid']");
var $edtFfgx=$dialog.find("input[name='ffgx']");
var $edtFfyz=$dialog.find("input[name='ffyz']");
var $inputXh=$dialog.find("input[name='xh']");
var parmas=$dialog.parent().dialog("options").params;
var xh=parmas.xh;
var tag=$dialog.closest("form").attr("tag");
function paramsInit(){
}
function pageInit(){
$edtFfyz.iCombobox({valueField:'id', textField:'name',allowNull:false, allowEdit:false});
if(tag=="add"){
$edtbomid.val(parmas.bomid);
}
Auxiliary.box($edtWlid,{code:'WLID'});
Auxiliary.box($edtFfgx,{code:'FFGX',onBeforeLoad:function(){
return {wlid:$edtbomid.val()};
}});
}
function dataInit(ops) {
gas.postHTTP("bom/bom/init/ffyz",{},function (res) {
if(res.success){
$edtFfyz.combobox("loadData",res.data.records||[])
}
}, ops);
$inputXh.val(xh);
}
function run(){
}
gas.load(paramsInit,pageInit,dataInit,run);
$dialog.find(".e-dialog-ok").iMenubutton({
text:"确定",
iconCls:"fa fa-save",
btnCls:"gui-btn-save",
onClick:function (){
var data=DataBind.collectData($dialog);
var queryUrl="bom/bom/add";
if(tag=='add'){
HTTP.post(queryUrl,{master:data},function (res) {
if(res.success){
$dialog.closest(".panel-body").iDialog("setStatus",{"state":"ok",data:{
data:$.extend({},data,{
id:res.data.id,
bomid:data.bomid,
wlid:data.wlid
}),
type:tag
}});
gas.showTips("操作成功")
}else{
gas.showWarning(res,"操作失败")
}
})
}else if(tag=="edit"){
queryUrl="bom/bom/update";
HTTP.post(queryUrl,{master:data},function (res) {
if(res.success){
$dialog.closest(".panel-body").iDialog("setStatus",{"state":"ok",data:{
data:data,
type:tag
}});
gas.showTips("操作成功");
}else{
gas.showWarning(res,"操作失败")
}
})
}
}
});
})
</script>
\ No newline at end of file
gavel/src/main/resources/templates/views/kmes/dashboard/first.html
View file @ 28d1a1f8
......@@ -19,6 +19,18 @@
height: 100%;
vertical-align: middle;
}
.listTxt{
display: flex;
flex-wrap: wrap;
align-items: center;
}
.listTxt p{
/* flex: 1; */
width: 50%;
}
.listTxt label{
width: auto!important;
}
</style>
</head>
<body>
......@@ -47,16 +59,24 @@
<div class="center">
<div class="center-left fl">
<div class="left-top rightTop border">
<!--<h1 id="ceshi">数据可视化</h1>-->
<div class="title">OA考勤</div>
<div class="bottom-b">
<div id="chartSdcl" class="allnav"></div>
<div class="title">工艺流程图</div>
<div class="chat">
<canvas id="gylct" style="width: 100%;height: 100%"></canvas>
</div>
</div>
<div class="left-cen rightTop border">
<div class="title">日产量&合格率</div>
<div class="title">OA考勤</div>
<div class="bottom-b">
<div id="chartRpcdcsj" class="allnav"></div>
<div class="allnav banner">
<div class="list clearfix">
<div class="listTxt">
<p><label for="">应到人数：</label><span id="ydrs">0</span></p>
<p><label for="">实际人数：</label><span id="sjrs">0</span></p>
<p><label for="">休假人数：</label><span id="xjrs">0</span> </p>
<p><label for="">总生产量：</label><span id="zscl">0</span></p>
</div>
</div>
</div>
</div>
</div>
<div class="left-bottom rightTop border">
......@@ -306,10 +326,14 @@
</div>
<div class="right-bottom rightTop border">
<div class="title">工艺流程图</div>
<div class="title">日产量&合格率</div>
<div class="chat">
<canvas id="gylct" style="width: 100%;height: 100%"></canvas>
<div id="chartRpcdcsj" class="allnav"></div>
</div>
<!-- <div class="title">OA考勤</div>
<div class="chat">
<div id="chartSdcl" class="allnav"></div>
</div> -->
</div>
</div>
</div>
......@@ -342,7 +366,7 @@
},200)
});
var myChartSdcl = echarts.init(document.getElementById('chartSdcl'));
// var myChartSdcl = echarts.init(document.getElementById('chartSdcl'));
var chartRpcdcsj=echarts.init(document.getElementById("chartRpcdcsj"));
var chartHgl=echarts.init(document.getElementById("chartHgl"));
var chartRjh=echarts.init(document.getElementById("chartRjh"));
......@@ -350,8 +374,8 @@
var chartJdshCirle=echarts.init(document.getElementById("chartJdshCirle"));
var chartTzzp=echarts.init(document.getElementById("chartzzp"));
setproduceEchart(chartTzzp)/* 在制品状态 */
oaechart(myChartSdcl); /*oa*/
setDailyDataEchart(chartRpcdcsj); /*日排产达成数据*/
// oaechart(myChartSdcl); /*oa*/
setRclHglEchart(chartRpcdcsj); /*日排产达成数据*/
// setHglEchart(chartHgl);/*合格率*/
setPieDailyChart(chartRjh,80);/*日计划*/
setPieDailyChart(chartYjh,80);
......@@ -362,7 +386,7 @@
});
function echartzsy(){
chartTzzp.resize()
myChartSdcl.resize()
// myChartSdcl.resize()
chartRpcdcsj.resize()
chartHgl.resize()
chartRjh.resize()
......
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