소스 검색

大屏刷新提示修正

xuwei 2 년 전
부모
커밋
f27d8733d1
2개의 변경된 파일205개의 추가작업 그리고 278개의 파일을 삭제
  1. 201 276
      wwwroot/main/manage/JiaShiCang/demo.html
  2. 4 2
      wwwroot/main/manage/demo.html

+ 201 - 276
wwwroot/main/manage/JiaShiCang/demo.html

@@ -13,14 +13,7 @@
 
 		.col {
 			width: 1280px;
-			height: 660px;
-		}
-
-		.bigtitle {
-			height: 137px;
-			background-repeat: no-repeat;
-			background-position: center;
-			background-image: url(/Img/title9in1.png);
+			height: 720px;
 		}
 
 		.boardone {
@@ -37,111 +30,73 @@
 			}
 
 			.boardone .chart {
-				margin-left: 150px;
-				margin-top: 10px;
-				width: 980px;
-				height: 450px;
-				/*background-color:white;*/
+				padding-left: 120px;
+				padding-top: 30px;
+				width: 1100px;
+				height: 600px;
 			}
 
 		.doughnut {
-			width: 400px !important;
+			width: 600px !important;
 			height: 800px !important;
 		}
 
-		table, tr, td {
+		table, th, td {
 			border: 1px solid #84C1FF;
-			font-size: 30px;
+			font-size: 40px;
 			color: #D0D0D0;
-			white-space: nowrap;
-			line-height: 200%;
-		}
-
-		.tableheader {
-			font-weight: 800;
-			background-color: #0f58a2;
 		}
 	</style>
 </head>
 <body class="m-0 p-0 border-0">
-	<div class="m-1">
-		<div class="row pb-4" style="width:100%;">
-			<div class="col bigtitle"></div>
+	<div class="box_title" style="display:flex;flex-direction:row;">
+		<div style="width: 76%; text-align: center; color:white; font-size: 100px; font-weight: 900">
+			恒洁卫浴三水陶瓷驾驶舱
 		</div>
+	</div>
+	<div class="m-1">
 		<div class="row row-cols-3 text-center g-2">
 			<div class="col mx-1 boardone">
-				<div class="title">
+				<div class="title" style="margin-top:30px;">
 					每周各车间产质量
 				</div>
 				<div class="chart">
-					<canvas id="canvas01" height="145"></canvas>
+					<canvas id="canvas01"></canvas>
 				</div>
 			</div>
 			<div class="col mx-1 boardone">
-				<div class="title">
-					半检大小件TOP3缺陷占比
+				<div class="title" style="margin-top:30px;">
+					半检大小件TOP10缺陷占比
 				</div>
 				<div class="doughnut">
-					<canvas id="canvas031" style="margin-left:60px; margin-top:120px;"></canvas>
-					<canvas id="canvas032" style="margin-left:440px; margin-top:-200px"></canvas>
-					<canvas id="canvas033" style="margin-left:820px; margin-top:-200px"></canvas>
+					<canvas id="canvas031" style="margin-left:50px; margin-top:120px;"></canvas>
+					<canvas id="canvas032" style="margin-left:620px; margin-top:-300px"></canvas>
 				</div>
 			</div>
 			<div class="col mx-1 boardone">
-				<div class="title">
-					每周大小件大工序产量
-				</div>
-				<div class="chart">
-					<canvas id="canvas07" height="145"></canvas>
-				</div>
-			</div>
-			<div class="col mx-1 boardone">
-				<div class="title">
-					每周各车间成型产量湿收率
-				</div>
-				<div class="chart">
-					<canvas id="canvas04" height="145"></canvas>
-				</div>
-			</div>
-			<div class="col mx-1 boardone">
-				<div class="title">
-					成检大小件TOP3缺陷占比
+				<div class="title" style="margin-top:30px;">
+					成检大小件TOP10缺陷占比
 				</div>
 				<div class="doughnut">
-					<canvas id="canvas021" style="margin-left:60px; margin-top:120px;"></canvas>
-					<canvas id="canvas022" style="margin-left:440px; margin-top:-200px"></canvas>
-					<canvas id="canvas023" style="margin-left:820px; margin-top:-200px"></canvas>
+					<canvas id="canvas021" style="margin-left:50px; margin-top:120px;"></canvas>
+					<canvas id="canvas022" style="margin-left:620px; margin-top:-300px"></canvas>
 				</div>
 			</div>
 			<div class="col mx-1 boardone">
-				<div class="title">
-					品管抽检数据展示
+				<div class="title" style="margin-top:30px;">
+					每周各车间成型产量湿收率
 				</div>
 				<div class="chart">
-					<canvas id="canvas09" height="100"></canvas>
-					<table width="100%">
-						<tr class="tableheader">
-							<td>缺陷</td>
-							<td>整体变形</td>
-							<td>进水孔内孔/圆度</td>
-							<td>外观缺陷</td>
-						</tr>
-						<tr>
-							<td>缺陷占比</td>
-							<td>8.6%</td>
-							<td>7.9%</td>
-							<td>4.5%</td>
-						</tr>
-					</table>
+					<canvas id="canvas04"></canvas>
 				</div>
 			</div>
 			<div class="col mx-1 boardone">
-				<div class="title pb-2">
+				<div class="title" style="margin-top:30px;">
 					各车间缺陷周环比
 				</div>
 				<div class="chart">
-					<table width="100%" class="table-striped">
-						<tr class="tableheader">
+					<table width="100%" style="margin-left:30px">
+						<tr>
 							<td>缺陷名称</td>
 							<td>缺陷占比</td>
 							<td>同月比</td>
@@ -187,12 +142,47 @@
 				</div>
 			</div>
 			<div class="col mx-1 boardone">
-				<div class="title pb-2">
+				<div class="title" style="margin-top:30px;">
+					每周干补率及干补合格率
+				</div>
+				<div class="chart">
+					<table width="100%" style="margin-left:30px;margin-top:120px;">
+						<tr>
+							<td>车间</td>
+							<td>成型一车间 </td>
+							<td>成型二车间</td>
+							<td>成型三车间</td>
+						</tr>
+						<tr>
+							<td>干补率</td>
+							<td>6% </td>
+							<td>11%</td>
+							<td>33%</td>
+						</tr>
+						<tr>
+							<td>干补合格率</td>
+							<td>99% </td>
+							<td>94%</td>
+							<td>89%</td>
+						</tr>
+					</table>
+				</div>
+			</div>
+			<div class="col mx-1 boardone">
+				<div class="title" style="margin-top:30px;">
+					每周大小件大工序产量
+				</div>
+				<div class="chart">
+					<canvas id="canvas07"></canvas>
+				</div>
+			</div>
+			<div class="col mx-1 boardone">
+				<div class="title" style="margin-top:30px;">
 					产品SKU及模具库存周转率
 				</div>
 				<div class="chart">
-					<table width="100%" class="table-striped">
-						<tr class="tableheader">
+					<table width="100%" style="margin-left:-35px;margin-top:-15px">
+						<tr>
 							<td>地点</td>
 							<td colspan="3">周转率最高(3 个) </td>
 							<td colspan="3">周转率最低(3 个)</td>
@@ -228,11 +218,25 @@
 				</div>
 			</div>
 			<div class="col mx-1 boardone">
-				<div class="title pb-2">
-					每周干补率及冷补率
+				<div class="title" style="margin-top:30px;">
+					品管抽检数据展示
 				</div>
 				<div class="chart">
-					<canvas id="canvas06" height="145"></canvas>
+					<canvas id="canvas09" height="110"></canvas>
+					<table width="100%" style="margin-left:30px">
+						<tr>
+							<td>缺陷</td>
+							<td>整体变形</td>
+							<td>进水孔内孔/圆度</td>
+							<td>外观缺陷</td>
+						</tr>
+						<tr>
+							<td>缺陷占比</td>
+							<td>8.6%</td>
+							<td>7.9%</td>
+							<td>4.5%</td>
+						</tr>
+					</table>
 				</div>
 			</div>
 		</div>
@@ -251,7 +255,7 @@
 
 		$(document).ready(function () {
 			//设置缩放
-			xuwell.setScale(0.391);
+			xuwell.setScale(0.3);
 			initAll();
 		});
 
@@ -275,27 +279,27 @@
 			Chart.defaults.global.defaultFontSize = 30;
 
 			//调用数据加载
-			init01(); init021(); init022(); init023(); init031(); init032(); init033(); init04(); init05(); init06(); init07(); init08(); init09();
+			init01(); init021(); init022(); init031(); init032(); init04(); init05(); init06(); init07(); init08(); init09();
 		}
 		//每周各车间产质量
 		function init01() {
 			window.config01 = {
 				data: {
-					labels: ["一车间", "二车间", "三车间"],
+					labels: ["成型一车间", "成型二车间", "成型三车间"],
 					datasets: [{
 						type: 'line',
 						label: "本烧质量",
 						yAxesGroup: 'A',
 						yAxisID: 'A',
-						backgroundColor: color(window.chartColors.orange).alpha(0.5).rgbString(),
-						borderColor: window.chartColors.orange,
+						backgroundColor: color(window.chartColors.red).alpha(0.5).rgbString(),
+						borderColor: window.chartColors.red,
 						borderWidth: 4,
 						pointRadius: 30,
 						data: [94, 85, 95],
 						fill: false
 					}, {
 						type: 'line',
-						label: "综合质量",
+						label: "重烧质量",
 						yAxesGroup: 'A',
 						yAxisID: 'A',
 						backgroundColor: color(window.chartColors.green).alpha(0.5).rgbString(),
@@ -378,33 +382,50 @@
 			var ctx01 = document.getElementById("canvas01").getContext("2d");
 			window.chart01 = new Chart(ctx01, config01);
 		}
-		//成检一车间TOP3缺陷占比
+		//成检大件TOP10缺陷占比
 		function init021() {
 			window.config021 = {
 				data: {
-					labels: ['不平', '变形', '外漏'],
+					labels: ['不平', '变形', '外漏', '内漏', '登伤', '铁锈', '漏气', '撞伤', '内裂', '外裂', '其他'],
 					datasets: [{
 						label: '缺陷',
 						backgroundColor: [
-							Chart.helpers.color(window.chartColors.orange).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.yellow).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.yellow).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
 							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
 							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString()
 						],
 						fill: false,
 						borderColor: [
-							window.chartColors.orange,
+							window.chartColors.red,
+							window.chartColors.green,
+							window.chartColors.blue,
+							window.chartColors.yellow,
+							window.chartColors.red,
+							window.chartColors.blue,
+							window.chartColors.green,
+							window.chartColors.yellow,
+							window.chartColors.red,
 							window.chartColors.green,
 							window.chartColors.blue
 						],
 						borderWidth: 4,
 						pointRadius: 30,
-						data: [1, 2, 3]
+						data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
 					}]
 				},
 				type: 'doughnut',
 				options: {
 					legend: {
-						display: true
+						display: true,
+						position: 'left'
 					},
 					textstyle: {
 						fontsize: 2
@@ -425,33 +446,50 @@
 			var ctx021 = document.getElementById("canvas021").getContext("2d");
 			window.chart021 = new Chart(ctx021, config021);
 		}
-		//成检二车间TOP3缺陷占比
+		//成检小件TOP10缺陷占比
 		function init022() {
 			window.config022 = {
 				data: {
-					labels: ['不平', '变形', '外漏'],
+					labels: ['不平', '变形', '外漏', '内漏', '登伤', '铁锈', '漏气', '撞伤', '内裂', '外裂', '其他'],
 					datasets: [{
 						label: '缺陷',
 						backgroundColor: [
-							Chart.helpers.color(window.chartColors.orange).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.yellow).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.yellow).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
 							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
 							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString()
 						],
 						fill: false,
 						borderColor: [
-							window.chartColors.orange,
+							window.chartColors.red,
+							window.chartColors.green,
+							window.chartColors.blue,
+							window.chartColors.yellow,
+							window.chartColors.red,
+							window.chartColors.blue,
+							window.chartColors.green,
+							window.chartColors.yellow,
+							window.chartColors.red,
 							window.chartColors.green,
 							window.chartColors.blue
 						],
 						borderWidth: 4,
 						pointRadius: 30,
-						data: [1, 2, 3]
+						data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
 					}]
 				},
 				type: 'doughnut',
 				options: {
 					legend: {
-						display: true
+						display: true,
+						position: 'right'
 					},
 					title: {
 						display: false,
@@ -468,76 +506,50 @@
 			var ctx022 = document.getElementById("canvas022").getContext("2d");
 			window.chart022 = new Chart(ctx022, config022);
 		}
-		//成检三车间TOP3缺陷占比
-		function init023() {
-			window.config023 = {
-				data: {
-					labels: ['不平', '变形', '外漏'],
-					datasets: [{
-						label: '缺陷',
-						backgroundColor: [
-							Chart.helpers.color(window.chartColors.orange).alpha(0.6).rgbString(),
-							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
-							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString()
-						],
-						fill: false,
-						borderColor: [
-							window.chartColors.orange,
-							window.chartColors.green,
-							window.chartColors.blue
-						],
-						borderWidth: 4,
-						pointRadius: 30,
-						data: [1, 2, 3]
-					}]
-				},
-				type: 'doughnut',
-				options: {
-					legend: {
-						display: true
-					},
-					title: {
-						display: false,
-						text: "缺陷"
-					},
-					tooltips: {
-						mode: 'point',
-						intersect: false
-					},
-					responsive: true
-
-				}
-			};
-			var ctx023 = document.getElementById("canvas023").getContext("2d");
-			window.chart023 = new Chart(ctx023, config023);
-		}
-		//半检一车间TOP3缺陷占比
+		//半检大件TOP10缺陷占比
 		function init031() {
 			window.config031 = {
 				data: {
-					labels: ['不平', '变形', '外漏'],
+					labels: ['不平', '变形', '外漏', '内漏', '登伤', '铁锈', '漏气', '撞伤', '内裂', '外裂', '其他'],
 					datasets: [{
 						label: '缺陷',
 						backgroundColor: [
-							Chart.helpers.color(window.chartColors.orange).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.yellow).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.yellow).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
 							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
 							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString()
 						],
 						fill: false,
 						borderColor: [
-							window.chartColors.orange,
+							window.chartColors.red,
+							window.chartColors.green,
+							window.chartColors.blue,
+							window.chartColors.yellow,
+							window.chartColors.red,
+							window.chartColors.blue,
+							window.chartColors.green,
+							window.chartColors.yellow,
+							window.chartColors.red,
 							window.chartColors.green,
 							window.chartColors.blue
 						],
 						borderWidth: 4,
 						pointRadius: 30,
-						data: [1, 2, 3]
+						data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
 					}]
 				},
 				type: 'doughnut',
 				options: {
 					legend: {
-						display: true
+						display: true,
+						position: 'left'
 					},
 					textstyle: {
 						fontsize: 2
@@ -558,33 +570,50 @@
 			var ctx031 = document.getElementById("canvas031").getContext("2d");
 			window.chart031 = new Chart(ctx031, config031);
 		}
-		//半检二车间TOP3缺陷占比
+		//半检小件TOP10缺陷占比
 		function init032() {
 			window.config032 = {
 				data: {
-					labels: ['不平', '变形', '外漏'],
+					labels: ['不平', '变形', '外漏', '内漏', '登伤', '铁锈', '漏气', '撞伤', '内裂', '外裂', '其他'],
 					datasets: [{
 						label: '缺陷',
 						backgroundColor: [
-							Chart.helpers.color(window.chartColors.orange).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.yellow).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.yellow).alpha(0.6).rgbString(),
+							Chart.helpers.color(window.chartColors.red).alpha(0.6).rgbString(),
 							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
 							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString()
 						],
 						fill: false,
 						borderColor: [
-							window.chartColors.orange,
+							window.chartColors.red,
+							window.chartColors.green,
+							window.chartColors.blue,
+							window.chartColors.yellow,
+							window.chartColors.red,
+							window.chartColors.blue,
+							window.chartColors.green,
+							window.chartColors.yellow,
+							window.chartColors.red,
 							window.chartColors.green,
 							window.chartColors.blue
 						],
 						borderWidth: 4,
 						pointRadius: 30,
-						data: [1, 2, 3]
+						data: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11]
 					}]
 				},
 				type: 'doughnut',
 				options: {
 					legend: {
-						display: true
+						display: true,
+						position: 'right'
 					},
 					title: {
 						display: false,
@@ -595,53 +624,12 @@
 						intersect: false
 					},
 					responsive: true
+
 				}
 			};
 			var ctx032 = document.getElementById("canvas032").getContext("2d");
 			window.chart032 = new Chart(ctx032, config032);
 		}
-		//半检三车间TOP3缺陷占比
-		function init033() {
-			window.config033 = {
-				data: {
-					labels: ['不平', '变形', '外漏'],
-					datasets: [{
-						label: '缺陷',
-						backgroundColor: [
-							Chart.helpers.color(window.chartColors.orange).alpha(0.6).rgbString(),
-							Chart.helpers.color(window.chartColors.green).alpha(0.6).rgbString(),
-							Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString()
-						],
-						fill: false,
-						borderColor: [
-							window.chartColors.orange,
-							window.chartColors.green,
-							window.chartColors.blue
-						],
-						borderWidth: 4,
-						pointRadius: 30,
-						data: [1, 2, 3]
-					}]
-				},
-				type: 'doughnut',
-				options: {
-					legend: {
-						display: true
-					},
-					title: {
-						display: false,
-						text: "缺陷"
-					},
-					tooltips: {
-						mode: 'point',
-						intersect: false
-					},
-					responsive: true
-				}
-			};
-			var ctx033 = document.getElementById("canvas033").getContext("2d");
-			window.chart033 = new Chart(ctx033, config033);
-		}
 		//每周各车间成型产量湿收率
 		function init04() {
 			window.config04 = {
@@ -652,8 +640,8 @@
 						label: "湿收率",
 						yAxesGroup: 'A',
 						yAxisID: 'A',
-						backgroundColor: color(window.chartColors.orange).alpha(0.5).rgbString(),
-						borderColor: window.chartColors.orange,
+						backgroundColor: color(window.chartColors.red).alpha(0.5).rgbString(),
+						borderColor: window.chartColors.red,
 						borderWidth: 4,
 						pointRadius: 30,
 						data: [5, 4, 6],
@@ -737,27 +725,31 @@
 		function init05() {
 
 		}
-		//每周干补率及冷补
+		//每周干补率,干补合格
 		function init06() {
-			window.config06 = {
+
+		}
+		//每周大小件大工序产量
+		function init07() {
+			window.config07 = {
 				data: {
-					labels: ["一车间", "二车间", "三车间"],
+					labels: ["成型", "半检", "施釉", "烧成", "成检", "包装"],
 					datasets: [{
-						label: "干部率",
+						label: "大件产量",
 						backgroundColor: Chart.helpers.color(window.chartColors.orange).alpha(0.6).rgbString(),
 						borderColor: window.chartColors.orange,
 						borderWidth: 4,
 						pointRadius: 30,
-						data: [6, 15, 12],
+						data: [989, 956, 912, 899, 864, 855],
 						fill: false,
 					}, {
-						label: "冷补率",
+						label: "小件产量",
 						fill: false,
 						backgroundColor: Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString(),
 						borderColor: window.chartColors.blue,
 						borderWidth: 4,
 						pointRadius: 30,
-						data: [23, 33, 35]
+						data: [944, 910, 856, 830, 819, 800]
 					}]
 				},
 				type: 'line',
@@ -768,7 +760,7 @@
 					},
 					title: {
 						display: false,
-						text: '每周干补率及冷补率'
+						text: '每周大小件大工序产量'
 					},
 					tooltips: {
 						mode: 'index',
@@ -793,76 +785,8 @@
 								labelString: 'Value'
 							},
 							ticks: {
-								min: 0,
-								stepSize: 10,
-								max: 100
-							}
-						}]
-					}
-				}
-			};
-			var ctx06 = document.getElementById("canvas06").getContext("2d");
-			window.chart06 = new Chart(ctx06, config06);
-		}
-		//每周大小件大工序产量
-		function init07() {
-			window.config07 = {
-				data: {
-					labels: ["成型", "半检", "施釉", "烧成", "成检", "包装"],
-					datasets: [{
-						label: '大件产量',
-						backgroundColor: Chart.helpers.color(window.chartColors.orange).alpha(0.6).rgbString(),
-						fill: false,
-						borderColor: window.chartColors.orange,
-						borderWidth: 4,
-						pointRadius: 30,
-						data: [989, 956, 912, 899, 864, 855]
-					},
-					{
-						label: '小件产量',
-						backgroundColor: Chart.helpers.color(window.chartColors.blue).alpha(0.6).rgbString(),
-						fill: false,
-						borderColor: window.chartColors.blue,
-						borderWidth: 4,
-						pointRadius: 30,
-						data: [944, 910, 856, 830, 819, 800]
-					},]
-				},
-				type: 'bar',
-				options: {
-					legend: {
-						display: true
-					},
-					title: {
-						display: false,
-						text: "品管抽检数据展示"
-					},
-					tooltips: {
-						mode: 'point',
-						intersect: false
-					},
-					responsive: true,
-					scales: {
-						xAxes: [{
-							display: true,
-							scaleLabel: {
-								display: false,
-								labelString: ''
-							}
-						}],
-						yAxes: [{
-							display: true,
-							id: 'A',
-							name: 'A',
-							scalePositionLeft: true,
-							position: 'left',
-							scaleLabel: {
-								display: false,
-								labelString: 'Value'
-							},
-							ticks: {
-								min: 0,
-								stepSize: 100,
+								min: 500,
+								stepSize: 50,
 								max: 1000
 							}
 						}]
@@ -907,7 +831,7 @@
 					},
 					title: {
 						display: false,
-						text: "品管抽检数据展示"
+						text: "施釉机器人(1号)流量统计"
 					},
 					tooltips: {
 						mode: 'point',
@@ -928,6 +852,7 @@
 							}
 						}]
 					}
+
 				}
 			};
 			var ctx09 = document.getElementById("canvas09").getContext("2d");

+ 4 - 2
wwwroot/main/manage/demo.html

@@ -137,9 +137,11 @@
         });
 
         function doTimer() {
-            if (currentTime01 == 0) load01(); else $("#currentTime01").text(currentTime01);
+            if (currentTime01 == 0) load01();
+            if (currentTime01 >= 0) $("#currentTime01").text(currentTime01);
             currentTime01--;
-            if (currentTime02 == 0) load02(); else $("#currentTime02").text(currentTime02);
+            if (currentTime02 == 0) load02();
+            if (currentTime01 >= 0) $("#currentTime02").text(currentTime02);
             currentTime02--;
 
         }