MES-WEB-LayUI.git

			@@ -132,13 +132,13 @@
			</div>
			<div class="layui-row" style="margin-top:5px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ§å¶ä¸é</label>
			<label class="layui-form-label" style="width: 85px;">åå¼æ§å¶ä¸é</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HControlUpperLimit_X" id="HControlUpperLimit_X">
			</div>
			</div>
			<div class="layui-inline" style="margin-left: 48px;">
			<label class="layui-form-label" style="width: 85px;">æ§å¶ä¸é</label>
			<label class="layui-form-label" style="width: 85px;">åå¼æ§å¶ä¸é</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HControlLowerLimit_X" id="HControlLowerLimit_X">
			</div>
			@@ -158,13 +158,13 @@
			</div>
			<div class="layui-row" style="margin-top:5px;">
			<div class="layui-inline">
			<label class="layui-form-label" style="width: 85px;">æ§å¶ä¸é</label>
			<label class="layui-form-label" style="width: 85px;">æå·®æ§å¶ä¸é</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HControlUpperLimit_S" id="HControlUpperLimit_S">
			</div>
			</div>
			<div class="layui-inline" style="margin-left: 48px;">
			<label class="layui-form-label" style="width: 85px;">æ§å¶ä¸é</label>
			<label class="layui-form-label" style="width: 85px;">æå·®æ§å¶ä¸é</label>
			<div class="layui-input-block" style="margin-left: 120px;">
			<input type="text" class="layui-input" name="HControlLowerLimit_S" id="HControlLowerLimit_S">
			</div>
			@@ -185,20 +185,37 @@
			</div>
			</div>
			</div>
			<div>
			<div class="layui-tab layui-tab-card">
			<table class="" id="mainTable" lay-filter="mainTable"></table>
			<div id="histogram_Avg" style="width:99.5%;height:calc(100vh);margin-top:5px;">
			<ul class="layui-tab-title">
			<li class="layui-this">xÌç®¡å¶å¾</li>
			<li>Rç®¡å¶å¾</li>
			<li>æ£æµå¼</li>
			</ul>
			<div class="layui-tab-content">
			<div class="layui-tab-item layui-show">
			<!--xÌç®¡å¶å¾-->
			<div id="histogram_Avg" style="width: 99.5%; height: calc(100vh);">

			</div>
			<div id="histogram_Diff" style="width:99.5%;height:calc(100vh);margin-top:15px;">
			</div>
			</div>
			<div class="layui-tab-item layui-show">
			<!--Rç®¡å¶å¾-->
			<div id="histogram_Diff" style="width: 99.5%; height: calc(100vh);">

			</div>
			<div id="histogram_SJZ" style="width:99.5%;height:calc(100vh);margin-top:15px;">
			</div>
			</div>
			<div class="layui-tab-item layui-show">
			<!--æ£æµå¼-->
			<div id="histogram_SJZ" style="width: 99.5%; height: calc(100vh);">

			</div>
			</div>
			</div>
			</div>
			<script type="text/html" id="toolbarDemo">
			<div class="layui-btn-container">
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn_Export" id="btn_Export"><i class="layui-icon layui-icon-export"></i>å¯¼åº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>éåº</button>
			<button type="button" class="layui-btn layui-btn-sm" lay-event="HideColumn"><i class="layui-icon layui-icon-form"></i>éèåè®¾ç½®</button>
			</div>
			@@ -230,6 +247,7 @@
			//æ¥è¯¢æ¡ä»¶
			var sWhere = "";
			var option = [];
			var ins; //ç¨äºå¯¼åºexcel
			var HModName = "QC_InspectionFormReport";
			var optionAVG = [];
			var optionS = [];
			@@ -256,6 +274,9 @@
			//éèåè®¾ç½®
			case 'HideColumn':
			get_HideColumn();
			break;
			//å¯¼åºæé®
			case 'btn_Export': btn_Export();
			break;
			};
			});
			@@ -425,6 +446,7 @@
			optionAVG[0] = data1.data[limit + 1];
			optionS[0] = data1.data[limit + 2];
			table.render(option);
			ins = table.render(option);
			set_PPK();
			set_CPK();
			set_Line();
			@@ -446,6 +468,7 @@
			var x_AVG = 0;
			var x_SUM = 0;
			var x_PPK = 0;
			var x_CPK = 0;
			var numCount = 0
			var c4 = [0.7979, 0.8862, 0.9213, 0.9400, 0.9515, 0.9594, 0.9650, 0.9693, 0.9727, 0.9754, 0.9776, 0.9794, 0.9810, 0.9823, 0.9835, 0.9845, 0.9854, 0.9862, 0.9869, 0.9876, 0.9882, 0.9887, 0.9892, 0.9896];

			@@ -467,26 +490,63 @@
			}

			x_PPK = Math.sqrt(calc(x_SUM, (numCount - 1), "/"));

			x_CPK = Math.sqrt(calc(x_SUM, numCount, "/"));
			var limit = $("#limit").val();
			if (parseInt(limit) >= 9) {
			$("#HCenterline_S").val(x_PPK.toFixed(4));
			}

			//åå¼ æ§å¶ä¸é æ§å¶ä¸é
			if (limit == 1) {
			$("#HControlUpperLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "+"))
			$("#HControlLowerLimit_X").val(calc(x_AVG, calc(x_PPK, 3, "*"), "-"))

			//ä¸é
			if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
			var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
			$("#HPPK").val(HUpLimit.toFixed(4));
			}
			//ä¸é
			else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
			var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
			$("#HPPK").val(HDownLimit.toFixed(4));
			//è®¡ç®æ ·æ¬éä¸º1 ç ppk
			var min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, x_PPK, "*"), "/");
			var max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, x_PPK, "*"), "/");
			var DataHCPK = min > max ? max : min;
			$("#HPPK").val(DataHCPK);

			//è®¡ç®æ ·æ¬éä¸º1 ç cpk

			var cpkSum = 0;
			var CPK_U = 0;
			var CPK_N = 0;
			for (var i = 1; i < option.cols[0].length; i++) {
			for (var j = 0; j < option.data.length - 3; j++) {
			if (i == 1) {
			CPK_U = option.data[j][option.cols[0][i].field];
			} else {
			CPK_N = option.data[j][option.cols[0][i].field];
			var data_un = CPK_U > CPK_N ? calc(CPK_U, CPK_N, "-") : calc(CPK_N, CPK_U, "-");
			cpkSum = calc(cpkSum, data_un, "+");
			CPK_U = CPK_N;
			}
			}
			}
			cpkSum = calc(cpkSum, option.cols[0].length - 2, "/");
			var HAVG_CPK = calc(cpkSum, 1.128, "/");

			min = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(3, HAVG_CPK, "*"), "/");
			max = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(3, HAVG_CPK, "*"), "/");
			DataHCPK = min > max ? max : min;

			$("#HCPK").val(DataHCPK);
			} else {
			var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
			var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
			$("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
			//ä¸é
			if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
			var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
			$("#HPPK").val(HUpLimit.toFixed(4));
			}
			//ä¸é
			else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
			var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
			$("#HPPK").val(HDownLimit.toFixed(4));
			} else {
			var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), calc(calc(3, x_PPK, "*"), c4[option.data.length - 4], "/"), "/");
			var HDownLimit = (x_AVG - calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+")) / ((3 * x_PPK) / c4[option.data.length - 4]);
			$("#HPPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
			}
			}
			}

			@@ -526,31 +586,36 @@
			s_CPK = calc(s_AVG, d2[option.data.length - 4], "/");

			//åå¼ æ§å¶ä¸é æ§å¶ä¸é
			$("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+"))
			$("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-"))

			if (limit > 1) {
			$("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+"))
			$("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-"))
			}

			//å·®å¼ æ§å¶ä¸é æ§å¶ä¸é
			$("#HControlUpperLimit_S").val(calc(D4[$("#limit").val() - 1], s_AVG, "*"));
			$("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*"))
			$("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*"));
			var limit = $("#limit").val();

			//ä¸é
			if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
			var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
			$("#HCPK").val(HUpLimit.toFixed(4));
			}
			//ä¸é
			else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
			var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
			$("#HCPK").val(HDownLimit.toFixed(4));
			} else {
			var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
			var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
			if (s_CPK == 0) {
			$("#HCPK").val(0);
			} else {
			$("#HCPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
			if (limit > 1) {
			//ä¸é
			if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
			var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
			$("#HCPK").val(HUpLimit.toFixed(4));
			}
			//ä¸é
			else if ($("#HDownLimit").val() != "" && $("#HUpLimit").val() == "") {
			var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
			$("#HCPK").val(HDownLimit.toFixed(4));
			} else {
			var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
			var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
			if (s_CPK == 0) {
			$("#HCPK").val(0);
			} else {
			$("#HCPK").val(HUpLimit > HDownLimit ? HDownLimit.toFixed(4) : HUpLimit.toFixed(4));
			}

			}
			}
			}

			@@ -643,6 +708,12 @@
			return sum;
			}

			//#region å¯¼åºExecel
			function btn_Export() {
			table.exportFile(ins.config.id, option.data, "xls");
			}
			//#endregion

			//æçº¿å¾
			function set_Line() {
			//#regionãæçº¿å¾ã
			@@ -674,7 +745,7 @@

			option_ZXT_Avg = {
			title: {
			text: 'å¹³åå¼',
			text: 'xÌç®¡å¶å¾',
			left: 'center'
			},
			grid: {
			@@ -702,19 +773,21 @@
			markLine: {
			symbol: 'none',//å»æç®å¤´
			data: [
			{ yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } },
			{
			yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
			name: 'USL', yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }, label: { formatter: '{b}: {c}' }
			},
			{
			yAxis: parseFloat($("#HControlUpperLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
			name: 'LSL', yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }, label: { formatter: '{b}: {c}' }
			},
			{
			yAxis: parseFloat($("#HControlLowerLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
			name: 'UCL', yAxis: parseFloat($("#HControlUpperLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
			},
			{
			name: 'LCL', yAxis: parseFloat($("#HControlLowerLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
			}
			,
			{
			yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }
			name: 'CL', yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
			}
			],
			precision: 3
			@@ -731,7 +804,7 @@

			option_ZXT_Diff = {
			title: {
			text: 'å·®å¼',
			text: 'Rç®¡å¶å¾',
			left: 'center'
			},
			grid: {
			@@ -745,7 +818,10 @@
			data: H_X
			},
			yAxis: {
			type: 'value'
			type: 'value',
			min: 0, // è®¾ç½®æå°å¼
			max: parseFloat($("#HControlUpperLimit_S").val()) != 0 ? calc(parseFloat($("#HControlUpperLimit_S").val()), 0.01, "+") : 0, // è®¾ç½®æå¤§å¼
			interval: calc(parseFloat($("#HControlUpperLimit_S").val()), 10, "/"), // è®¾ç½®é´è·
			},
			series: [
			{
			@@ -757,14 +833,14 @@
			symbol: 'none',//å»æç®å¤´
			data: [
			{
			yAxis: parseFloat($("#HControlUpperLimit_S").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
			name: 'UCL', yAxis: parseFloat($("#HControlUpperLimit_S").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
			},
			{
			yAxis: parseFloat($("#HControlLowerLimit_S").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
			name: 'LCL', yAxis: parseFloat($("#HControlLowerLimit_S").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
			}
			,
			{
			yAxis: parseFloat($("#HCenterline_S").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }
			name: 'CL', yAxis: parseFloat($("#HCenterline_S").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
			}
			],
			precision: 3
			@@ -808,9 +884,9 @@
			markLine: {
			symbol: 'none',//å»æç®å¤´
			data: [
			{ yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } },
			{ name: 'USL', yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }, label: { formatter: '{b}: {c}' } },
			{
			yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
			name: 'LSL', yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }, label: { formatter: '{b}: {c}' }
			}
			],
			precision: 3
			@@ -958,7 +1034,7 @@
			//Type 2 æ ¹æ®éä¸çç©æå»æ¥è¯¢æ°æ®
			var sWheres = "";
			if (Type == 1) {
			sWheres = " and æ£éªé¡¹ç®ä»£ç ='" + $("#HQCCheckItemNumber").val() + "'";
			sWheres = " and æ£éªé¡¹ç®ä»£ç ='" + $("#HQCCheckItemNumber").val() + "' and ç©æä»£ç ='" + $("#HMaterNumber").val() + "'";
			}
			if (Type == 2) {
			sWheres = " and ç©æä»£ç ='" + $("#HMaterNumber").val() + "'";