Skip to content

K
kwell-mes
Commit 76a022ac authored by 李苏's avatar 李苏 💬
Browse files
Options

登录页面

parent e8e320f4
Hide whitespace changes
Inline Side-by-side
Showing with 41 additions and 17 deletions
gavel/src/main/resources/static/js/dashboard/echarts.js
View file @ 76a022ac
...@@ -2043,7 +2043,7 @@ function setproduceEchart(chart,apidata) { ...@@ -2043,7 +2043,7 @@ function setproduceEchart(chart,apidata) {
show: false show: false
}, },
grid: { grid: {
top: "10%", top: "20",
left: "5%", left: "5%",
bottom: "0%", bottom: "0%",
right: "5%", right: "5%",
......
gavel/src/main/resources/templates/views/kmes/dashboard/first.html
View file @ 76a022ac
...@@ -19,6 +19,18 @@ ...@@ -19,6 +19,18 @@
height: 100%; height: 100%;
vertical-align: middle; vertical-align: middle;
} }
.listTxt{
display: flex;
flex-wrap: wrap;
align-items: center;
}
.listTxt p{
/* flex: 1; */
width: 50%;
}
.listTxt label{
width: auto!important;
}
</style> </style>
</head> </head>
<body> <body>
...@@ -47,17 +59,25 @@ ...@@ -47,17 +59,25 @@
<div class="center"> <div class="center">
<div class="center-left fl"> <div class="center-left fl">
<div class="left-top rightTop border"> <div class="left-top rightTop border">
<!--<h1 id="ceshi">数据可视化</h1>--> <div class="title">工艺流程图</div>
<div class="title">OA考勤</div> <div class="chat">
<div class="bottom-b"> <canvas id="gylct" style="width: 100%;height: 100%"></canvas>
<div id="chartSdcl" class="allnav"></div> </div>
</div>
</div> </div>
<div class="left-cen rightTop border"> <div class="left-cen rightTop border">
<div class="title">日产量&合格率</div> <div class="title">OA考勤</div>
<div class="bottom-b"> <div class="bottom-b">
<div id="chartRpcdcsj" class="allnav"></div> <div class="allnav banner">
</div> <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>
<div class="left-bottom rightTop border"> <div class="left-bottom rightTop border">
<div class="title">静电手环</div> <div class="title">静电手环</div>
...@@ -306,10 +326,14 @@ ...@@ -306,10 +326,14 @@
</div> </div>
<div class="right-bottom rightTop border"> <div class="right-bottom rightTop border">
<div class="title">工艺流程图</div> <div class="title">日产量&合格率</div>
<div class="chat"> <div class="chat">
<canvas id="gylct" style="width: 100%;height: 100%"></canvas> <div id="chartRpcdcsj" class="allnav"></div>
</div> </div>
<!-- <div class="title">OA考勤</div>
<div class="chat">
<div id="chartSdcl" class="allnav"></div>
</div> -->
</div> </div>
</div> </div>
</div> </div>
...@@ -342,7 +366,7 @@ ...@@ -342,7 +366,7 @@
},200) },200)
}); });
var myChartSdcl = echarts.init(document.getElementById('chartSdcl')); // var myChartSdcl = echarts.init(document.getElementById('chartSdcl'));
var chartRpcdcsj=echarts.init(document.getElementById("chartRpcdcsj")); var chartRpcdcsj=echarts.init(document.getElementById("chartRpcdcsj"));
var chartHgl=echarts.init(document.getElementById("chartHgl")); var chartHgl=echarts.init(document.getElementById("chartHgl"));
var chartRjh=echarts.init(document.getElementById("chartRjh")); var chartRjh=echarts.init(document.getElementById("chartRjh"));
...@@ -350,7 +374,7 @@ ...@@ -350,7 +374,7 @@
var chartJdshCirle=echarts.init(document.getElementById("chartJdshCirle")); var chartJdshCirle=echarts.init(document.getElementById("chartJdshCirle"));
var chartTzzp=echarts.init(document.getElementById("chartzzp")); var chartTzzp=echarts.init(document.getElementById("chartzzp"));
setproduceEchart(chartTzzp)/* 在制品状态 */ setproduceEchart(chartTzzp)/* 在制品状态 */
oaechart(myChartSdcl); /*oa*/ // oaechart(myChartSdcl); /*oa*/
setRclHglEchart(chartRpcdcsj); /*日排产达成数据*/ setRclHglEchart(chartRpcdcsj); /*日排产达成数据*/
// setHglEchart(chartHgl);/*合格率*/ // setHglEchart(chartHgl);/*合格率*/
setPieDailyChart(chartRjh,80);/*日计划*/ setPieDailyChart(chartRjh,80);/*日计划*/
...@@ -362,7 +386,7 @@ ...@@ -362,7 +386,7 @@
}); });
function echartzsy(){ function echartzsy(){
chartTzzp.resize() chartTzzp.resize()
myChartSdcl.resize() // myChartSdcl.resize()
chartRpcdcsj.resize() chartRpcdcsj.resize()
chartHgl.resize() chartHgl.resize()
chartRjh.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