Skip to content

K
kwell-mes
Commit 996191fc authored by yff's avatar yff
Browse files
Options

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

parents d82e418e 671ee3de
Show whitespace changes
Inline Side-by-side
Showing with 113 additions and 34 deletions
gavel/src/main/resources/static/css/dashboard/index.css
View file @ 996191fc
......@@ -464,9 +464,12 @@
.allnav-right ul li{
height: 25%;
float: left;
width: 50%;
width: 25%;
text-align: center;
}
.allnav-right ul li>div{
transform: scale(0.8, 0.8);
}
.out{
position: relative;
height: 0.6rem;
......
gavel/src/main/resources/static/js/dashboard/echarts.js
View file @ 996191fc
......@@ -2012,25 +2012,45 @@ function setTimeProductionEchart(chart,apidata) {
}
},
grid: {
top:80,
left: 20,
bottom: 20,
right: 40,
top:"10%",
left: "5%",
bottom: "0%",
right: "5%",
containLabel: true,
},
xAxis: {
type: 'category',
data: dateList,
axisLabel: {
interval: 4,
interval: 1,
tooltip: {
show: true,
},
inside: false,
textStyle: {
fontSize: 14
fontSize: 12
},
color: 'rgba(255,255,255,0.6)'
color: 'rgba(255,255,255,0.6)',
formatter:function(value){
var str = "";
var num = 6; //每行显示字数
var valLength = value.length; //该项x轴字数
var rowNum = Math.ceil(valLength / num); // 行数
if(rowNum > 1) {
for(var i = 0; i < rowNum; i++) {
var temp = "";
var start = i * num;
var end = start + num;
temp = value.substring(start, end) + "\n";
str += temp;
}
return str;
} else {
return value;
}
}
},
axisTick: {
show: false
......@@ -2130,13 +2150,17 @@ function setDailyDataEchart(chart,apidata) {
}
},
legend: {
align: 'left',
right:0,
orient:"vertical",
// orient:"vertical",
x : 'right', //居左显示
y: 'left', //延Y轴
textStyle:{
color:'white'
}
},
grid: {
top:'20%',
left: '3%',
right: '4%',
bottom: '3%',
......@@ -2264,6 +2288,13 @@ function setHglEchart(chart,apidata) {
}
var ops= {
color:["#409eff"],
grid: {
top:"10%",
left: "5%",
bottom: "5%",
right: "5%",
containLabel: true,
},
xAxis: {
type: 'category',
data:datelist|| ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'],
......@@ -2384,7 +2415,7 @@ function setRpcHglEchart(chart,apidata1,apidata2) {
})
}
var ops = {
color:["#409eff","#ffd03e"],
color:["#409eff","#55ff7f","#ffd03e"],
// tooltip: {
// trigger: 'axis',
// axisPointer: {
......@@ -2395,7 +2426,7 @@ function setRpcHglEchart(chart,apidata1,apidata2) {
// }
// },
legend: {
data: ['计划', '合格率'],
data: ['计划', '完工','合格率'],
textStyle:{
color:'white'
}
......@@ -2501,7 +2532,28 @@ function setRpcHglEchart(chart,apidata1,apidata2) {
data: jslist||[
2.6, 5.9, 9.0, 26.4, 28.7,
],
barWidth : 30,
barWidth : 15,
itemStyle:{
normal:{
label:{
show:true,
position:"top",
textStyle:{
color:"white",
}
}
}
}
},
{
name: '完工',
type: 'bar',
data: wglist||[
2.6, 5.9, 9.0, 26.4, 28.7,
],
barWidth : 15,
itemStyle:{
normal:{
label:{
......
gavel/src/main/resources/templates/views/kmes/dashboard/first.html
View file @ 996191fc
......@@ -25,8 +25,8 @@
<div class="main">
<div class="header">
<div class="header-left fl" id="time"></div>
<div class="header-center fl">
<div class="header-left fr" id="time"></div>
<div class="header-center fr">
<div class="header-title">
车间作业及质量看板
</div>
......@@ -83,6 +83,14 @@
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
</ul>
</div>
</div>
......@@ -248,7 +256,7 @@
</div>
<div class="center-right fr">
<div class="right-top rightTop border">
<div class="title">日计划/月计划达成</div>
<div class="title">周计划/月计划达成</div>
<div class="chart" style="width: calc(100% - 0.2rem);
height: 2.6rem;
margin-left: 0.1rem;
......@@ -259,8 +267,8 @@
<div id="chartRjh" class="allnav"></div>
</div>
<div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
<div>日计划数：<span id="rjhs">100</span></div>
<div>日完工数：<span id="rwgs">80</span></div>
<div>周计划数：<span id="rjhs">100</span></div>
<div>周完工数：<span id="rwgs">80</span></div>
</div>
</li>
<li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
......
gavel/src/main/resources/templates/views/kmes/dashboard/fourth.html
View file @ 996191fc
......@@ -37,8 +37,8 @@
<div class="main">
<div class="header">
<div class="header-left fl" id="time"></div>
<div class="header-center fl">
<div class="header-left fr" id="time"></div>
<div class="header-center fr">
<div class="header-title">
车间作业及质量看板
</div>
......@@ -100,6 +100,14 @@
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
</ul>
</div>
</div>
......@@ -274,7 +282,7 @@
</div>
<div class="center-right fr" style="width: 33.3%">
<div class="right-top rightTop border">
<div class="title">日计划/月计划达成</div>
<div class="title">周计划/月计划达成</div>
<div class="chart" style="width: calc(100% - 0.2rem);
height: 2.6rem;
margin-left: 0.1rem;
......@@ -285,8 +293,8 @@
<div id="chartRjh" class="allnav"></div>
</div>
<div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
<div>日计划数：<span>100</span></div>
<div>日完工数：<span>80</span></div>
<div>周计划数：<span>100</span></div>
<div>周完工数：<span>80</span></div>
</div>
</li>
<li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
......
gavel/src/main/resources/templates/views/kmes/dashboard/second.html
View file @ 996191fc
......@@ -11,8 +11,8 @@
<div class="main main-second">
<div class="header">
<div class="header-left fl" id="time"></div>
<div class="header-center fl">
<div class="header-left fr" id="time"></div>
<div class="header-center fr">
<div class="header-title">
车间作业及质量看板
</div>
......@@ -187,7 +187,7 @@
</div>
<div class="center-right fr">
<div class="right-top rightTop border">
<div class="title">日计划/月计划达成</div>
<div class="title">周计划/月计划达成</div>
<div class="chart" style="width: calc(100% - 0.2rem);
height: 2.6rem;
margin-left: 0.1rem;
......@@ -198,8 +198,8 @@
<div id="chartRjh" class="allnav"></div>
</div>
<div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
<div>日计划数：<span id="rjhs">100</span></div>
<div>日完工数：<span id="rwgs">80</span></div>
<div>周计划数：<span id="rjhs">100</span></div>
<div>周完工数：<span id="rwgs">80</span></div>
</div>
</li>
<li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
......
gavel/src/main/resources/templates/views/kmes/dashboard/third.html
View file @ 996191fc
......@@ -25,8 +25,8 @@
<div class="main main-second">
<div class="header">
<div class="header-left fl" id="time"></div>
<div class="header-center fl">
<div class="header-left fr" id="time"></div>
<div class="header-center fr">
<div class="header-title">
车间作业及质量看板
</div>
......@@ -219,6 +219,14 @@
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
<li><div class="circle circle-middle out circle-normal"><div class="circle in"></div></div></li>
</ul>
</div>
</div>
......@@ -243,7 +251,7 @@
</div>
</div>
<div class="cen-bottom rightTop border" style="width: calc(50% - 0.1rem); display: inline-block; margin-left: 0.1rem;">
<div class="title">日计划/月计划达成</div>
<div class="title">周计划/月计划达成</div>
<div class="chart" style="width: calc(100% - 0.2rem); height: 2.6rem;margin-left: 0.1rem; margin-top: 0.1rem;">
<ul style="width: 100%;height: 100%">
<li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
......@@ -251,8 +259,8 @@
<div id="chartRjh" class="allnav"></div>
</div>
<div style="position: absolute;bottom: 0;right: 0;left: 0;text-align: center">
<div>日计划数：<span id="rjhs">100</span></div>
<div>日完工数：<span id="rwgs">80</span></div>
<div>周计划数：<span id="rjhs">100</span></div>
<div>周完工数：<span id="rwgs">80</span></div>
</div>
</li>
<li style="float: left;width: 50%;height: 100%;position: relative;overflow:hidden;">
......
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