|
|
@@ -68,15 +68,15 @@
|
|
|
</head>
|
|
|
<style>
|
|
|
#show{
|
|
|
- font-size: 24px;
|
|
|
+ font-size: 30px;
|
|
|
color:#black;
|
|
|
text-align:center;
|
|
|
}
|
|
|
</style>
|
|
|
<body onload="startClock()" onunload="stopClock()">
|
|
|
- <nav class="navbar navbar-expand-lg navbar-light bg-light">
|
|
|
+ <nav class="navbar navbar-expand-lg navbar-light bg-light" style="margin-bottom: 1em">
|
|
|
+
|
|
|
|
|
|
- </div>
|
|
|
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
|
|
|
<span class="navbar-toggler-icon"></span>
|
|
|
</button>
|
|
|
@@ -84,7 +84,7 @@
|
|
|
<div class="collapse navbar-collapse" id="navbarSupportedContent">
|
|
|
<ul class="navbar-nav mr-auto">
|
|
|
<li class="nav-item active">
|
|
|
- <div class="navbar-brand" href="#">生产线<span>1</span>号
|
|
|
+ <div class="navbar-brand" href="#" style="font-size: 25px">生产线<span>1</span>号
|
|
|
|
|
|
</li>
|
|
|
<li class="nav-item">
|
|
|
@@ -101,8 +101,15 @@
|
|
|
</ul>
|
|
|
<div class="dropdown" style="font-size: 2em">
|
|
|
<button class="btn btn-default dropdown-toggle" type="button" id="dropdownMenu2" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" style="font-size: 0.5em">
|
|
|
- 拉长
|
|
|
- <span class="caret">张三</span>
|
|
|
+ <div class="row">
|
|
|
+ <div class="col-4">
|
|
|
+ 拉长
|
|
|
+ </div>
|
|
|
+ <div class="col-5">
|
|
|
+ 张三
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+
|
|
|
</button>
|
|
|
<ul class="dropdown-menu" aria-labelledby="dropdownMenu2">
|
|
|
<li><a href="#">更改密码</a></li>
|
|
|
@@ -118,51 +125,58 @@
|
|
|
$(name).tab('show');
|
|
|
}
|
|
|
</script>
|
|
|
- <section class="content" style="margin: 0 auto;padding-top: 5em">
|
|
|
- <div class="container-fluid " style="padding-bottom: 1em">
|
|
|
- <div class="row text-center" style="font-size: 2em">
|
|
|
+ <section class="content" style="margin: 0 auto;padding-top: 2em;">
|
|
|
+ <div class="container-fluid " style="padding-bottom: 0.2em">
|
|
|
+ <div class="row text-center" >
|
|
|
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
|
|
|
- <div class="info-box bg-green hover-expand-effect">
|
|
|
+ <div class="info-box bg-green hover-expand-effect" style="margin: 0;height: 70px">
|
|
|
<div class="icon">
|
|
|
<i class="material-icons">equalizer</i>
|
|
|
</div>
|
|
|
<div class="content">
|
|
|
- <div class="text">合格数</div>
|
|
|
- <div class="number">555/div>
|
|
|
+ <div class="row text-center" style="margin: 0 auto">
|
|
|
+ <div class="text" style="font-size: 1.5em;padding-top: 0.2em">合格数:</div>
|
|
|
+ <div class="number" style="font-size: 3em">555</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
|
|
|
- <div class="info-box bg-red hover-expand-effect">
|
|
|
+ <div class="info-box bg-red hover-expand-effect" style="margin: 0;height: 70px">
|
|
|
<div class="icon">
|
|
|
<i class="material-icons">equalizer</i>
|
|
|
</div>
|
|
|
<div class="content">
|
|
|
- <div class="text">不合格数</div>
|
|
|
- <div class="number">231</div>
|
|
|
+ <div class="row text-center" style="margin: 0 auto">
|
|
|
+ <div class="text" style="font-size: 1.5em;padding-top: 0.2em">不合格数:</div>
|
|
|
+ <div class="number" style="font-size: 3em">5255</div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
|
|
|
- <div class="info-box bg-lime hover-expand-effect">
|
|
|
+ <div class="info-box bg-lime hover-expand-effect" style="margin: 0;height: 70px">
|
|
|
<div class="icon">
|
|
|
<i class="material-icons">brightness_low</i>
|
|
|
</div>
|
|
|
<div class="content">
|
|
|
- <div class="text">合格率</div>
|
|
|
- <div class="number">40%</div>
|
|
|
+ <div class="row text-center" style="margin: 0 auto">
|
|
|
+ <div class="text" style="font-size: 1.5em;padding-top: 0.2em">合格率:</div>
|
|
|
+ <div class="number" style="font-size: 3em">55%</div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
<div class="col-lg-3 col-md-3 col-sm-6 col-xs-12">
|
|
|
- <div class="info-box bg-cyan hover-zoom-effect">
|
|
|
+ <div class="info-box bg-cyan hover-zoom-effect" style="margin: 0;height: 70px ">
|
|
|
<div class="icon">
|
|
|
<i class="material-icons">access_alarm</i>
|
|
|
</div>
|
|
|
<div class="content">
|
|
|
- <div class="text">堆积数</div>
|
|
|
- <div class="number">2323</div>
|
|
|
+ <div class="row text-center" style="margin: 0 auto">
|
|
|
+ <div class="text" style="font-size: 1.5em;padding-top: 0.2em">堆积数:</div>
|
|
|
+ <div class="number" style="font-size: 3em">235</div>
|
|
|
+ </div>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -170,15 +184,15 @@
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
- <div class="container-fluid">
|
|
|
+ <div class="container-fluid" style="margin-top: 0.5em">
|
|
|
<div id="container10" style="min-width:400px;height:400px"></div>
|
|
|
<div class="card">
|
|
|
<div>
|
|
|
<div class="" style="">
|
|
|
<div class="table-responsive" style="width: 30%;float: left" >
|
|
|
<table class="table table-hover dashboard-task-infos">
|
|
|
- <thead>
|
|
|
- <tr>
|
|
|
+ <thead >
|
|
|
+ <tr style="border-bottom:3px solid black;">
|
|
|
<th>姓名(工号)</th>
|
|
|
<th>合格数</th>
|
|
|
<th>不合格数</th>
|
|
|
@@ -209,10 +223,10 @@
|
|
|
</tbody>
|
|
|
</table>
|
|
|
</div>
|
|
|
- <div class="table-responsive" style="width: 30%;float: left" >
|
|
|
+ <div class="table-responsive" style="width: 30%;float: left;padding-left: 5em" >
|
|
|
<table class="table table-hover dashboard-task-infos">
|
|
|
<thead>
|
|
|
- <tr>
|
|
|
+ <tr style="border-bottom:3px solid black;">
|
|
|
<th>姓名(工号)</th>
|
|
|
<th>合格数</th>
|
|
|
<th>不合格数</th>
|
|
|
@@ -246,7 +260,7 @@
|
|
|
<div class="table-responsive" style="width: 30%;float: right" >
|
|
|
<table class="table table-hover dashboard-task-infos">
|
|
|
<thead>
|
|
|
- <tr>
|
|
|
+ <tr style="border-bottom:3px solid black;">
|
|
|
<th>姓名(工号)</th>
|
|
|
<th>合格数</th>
|
|
|
<th>不合格数</th>
|
|
|
@@ -767,7 +781,13 @@
|
|
|
zoomType: 'xy'
|
|
|
},
|
|
|
title: {
|
|
|
- text: '堆积数'
|
|
|
+ text: null
|
|
|
+ },
|
|
|
+ credits:{
|
|
|
+ enabled: false // 禁用版权信息
|
|
|
+ },
|
|
|
+ exporting: {
|
|
|
+ enabled: false
|
|
|
},
|
|
|
xAxis: [{
|
|
|
categories: ['张三', '李四', '王五', 'Apr', 'May', 'Jun',
|
|
|
@@ -781,26 +801,30 @@
|
|
|
labels: {
|
|
|
format: '{value}',
|
|
|
style: {
|
|
|
- color: Highcharts.getOptions().colors[0]
|
|
|
+ color: Highcharts.getOptions().colors[0],
|
|
|
+ fontSize:'15px'
|
|
|
}
|
|
|
},
|
|
|
title: {
|
|
|
text: '堆积数',
|
|
|
style: {
|
|
|
- color: Highcharts.getOptions().colors[0]
|
|
|
+ color: Highcharts.getOptions().colors[0],
|
|
|
+ fontSize:'15px'
|
|
|
}
|
|
|
}
|
|
|
}, { // Secondary yAxis
|
|
|
title: {
|
|
|
text: '不良率',
|
|
|
style: {
|
|
|
- color: Highcharts.getOptions().colors[1]
|
|
|
+ color: 'red',
|
|
|
+ fontSize:'15px'
|
|
|
}
|
|
|
},
|
|
|
labels: {
|
|
|
format: '{value} %',
|
|
|
style: {
|
|
|
- color: Highcharts.getOptions().colors[1]
|
|
|
+ color: 'red',
|
|
|
+ fontSize:'15px'
|
|
|
}
|
|
|
},
|
|
|
opposite: true
|
|
|
@@ -821,14 +845,15 @@
|
|
|
name: '堆积数',
|
|
|
type: 'column',
|
|
|
yAxis: 1,
|
|
|
- data: [49.9, 71.5, 106.4, 129.2, 144.0, 176.0, 135.6, 148.5, 216.4, 194.1, 95.6, 54.4],
|
|
|
+ data: [200, 150, 135, 122, 111, 75, 65, 63.2, 50, 45, 22, 11],
|
|
|
tooltip: {
|
|
|
valueSuffix: ' mm'
|
|
|
}
|
|
|
}, {
|
|
|
name: '不良率',
|
|
|
type: 'spline',
|
|
|
- data: [7.0, 6.9, 9.5, 14.5, 18.2, 21.5, 25.2, 26.5, 23.3, 18.3, 13.9, 9.6],
|
|
|
+ data: [55, 53, 52.5, 41.5, 44.2, 45.5, 35.2, 26.5, 23.3, 18.3, 13.9, 9.6],
|
|
|
+ color:'red',
|
|
|
tooltip: {
|
|
|
valueSuffix: '%'
|
|
|
}
|
Guichuan Yu