From e9ccb16eaca25fd7cea51b15685ddee9101e9fa0 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期四, 12 十二月 2024 11:30:12 +0800
Subject: [PATCH] 首巡末合格不合格自动带出 spc 八大判定
---
WebTM/views/质量管理/巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html | 21 ---
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 296 ++++++++++++++++++++++++++++++++++++++++++++++++-
WebTM/views/质量管理/工序检验单/QC_ProcessCheckBill.html | 4
WebTM/views/IpadIndex.html | 10
WebTM/views/质量管理/首件检验单/QC_Add_Edit_FirstPieceCheckBill.html | 4
5 files changed, 303 insertions(+), 32 deletions(-)
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index a996612..8f684fd 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1489,16 +1489,16 @@
<span class="imgtitle">棣栨</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4">
- <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
+ <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
+ <div class="cnt bottomright">
<span class="layui-icon layui-icon-search imgicon"></span>
<span class="imgtitle">宸℃</span>
</div>
</div>
- <div class="layui-col-sm12 layui-col-md4" onclick="OpenProcess(event,this)">
- <div class="cnt bottomright">
+ <div class="layui-col-sm12 layui-col-md4">
+ <div class="cnt bottomright" style="pointer-events:none; background-color:rgb(0 0 0 / 10%);display:none;">
<span class="layui-icon layui-icon-search imgicon"></span>
- <span class="imgtitle">杩囩▼妫�楠�</span>
+ <span class="imgtitle">鏈</span>
</div>
</div>
</div>
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
index 61a9c0c..14112d3 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\241\346\243\200\350\256\260\345\275\225\345\215\225/QC_Add_Edit_PatrolProcCheckOtherill.html"
@@ -1175,23 +1175,6 @@
});
}
- var data = obj.data;
- var rowIndex = $(obj.tr).attr("data-index");
- if (obj.event === 'del') {
- layer.confirm('鐪熺殑鍒犻櫎琛屼箞', function (index) {
- if (rowIndex === '0') {
- layer.msg('棣栬鏃犳硶鍒犻櫎锛侊紒锛�');
- } else {
- //obj.del();
- //layer.close(index);
- var oldData = table.cache["mainTable"];
- oldData.splice(obj.tr.data('index'), 1);
- table.reload('mainTable', { data: oldData });
- layer.close(index);
- }
- });
- }
-
$(document).off('keydown', ".layui-table-edit").on('keydown', '.layui-table-edit', function (e) {
var rowIndex = Number($(obj.tr).attr("data-index")) + Number(1);
if (event.key == "F7") {
@@ -1383,6 +1366,8 @@
});
table.on('edit(mainTable)', function (obj) {
+ var cell = $(this);
+ var rowIndex = cell.closest('tr').data('index'); // 鑾峰彇褰撳墠琛屾暟鎹储寮�
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
@@ -1391,7 +1376,7 @@
var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
//var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
//var HComparator = $("#HComparator").val(); //姣旇緝绗�
- var HEntryID = $("#HEntryID").val() - 1;
+ var HEntryID = rowIndex;
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
index ca4ac99..fdde703 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\345\267\245\345\272\217\346\243\200\351\252\214\345\215\225/QC_ProcessCheckBill.html"
@@ -1307,6 +1307,8 @@
table.on('edit(mainTable)', function (obj) {
+ var cell = $(this);
+ var rowIndex = cell.closest('tr').data('index'); // 鑾峰彇褰撳墠琛屾暟鎹储寮�
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
@@ -1315,7 +1317,7 @@
var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
//var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
//var HComparator = $("#HComparator").val(); //姣旇緝绗�
- var HEntryID = $("#HEntryID").val() - 1;
+ var HEntryID = rowIndex;
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
index 026afe1..5e2b479 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\350\264\250\351\207\217\346\212\245\350\241\250/QC_InspectionFormReport.html"
@@ -727,9 +727,17 @@
let HDifference = [];//宸��
let HSJZ = [];//瀹為檯鍊�
+ var judge = spc_judge();
+
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0 || optionS.length != 0) {
- HAvg.push(optionAVG[0][option.cols[0][j].field]);
+ if ($.inArray(optionAVG[0][option.cols[0][j].field], judge) != -1) {
+ var data = { value: optionAVG[0][option.cols[0][j].field], itemStyle: { color: 'red' } };
+ HAvg.push(data);
+ } else {
+ HAvg.push(optionAVG[0][option.cols[0][j].field]);
+ }
+
HDifference.push(optionS[0][option.cols[0][j].field]);
HSJZ.push(optionSJZ[0][option.cols[0][j].field]);
} else {
@@ -750,6 +758,10 @@
sum += value;
});
var average = sum / HSJZ.length;
+
+ var HAreaValue = calc(calc(parseFloat($("#HControlUpperLimit_X").val()), parseFloat($("#HCenterline_X").val()), "-"), 3, "/").toFixed(5);
+ var HAreaValue_A = HAreaValue * 2;
+ var HAreaValue_B = HAreaValue * 1;
option_ZXT_Avg = {
title: {
@@ -776,8 +788,13 @@
{
data: HAvg,
type: 'line',
-
- itemStyle: { normal: { label: { show: true } } },
+ itemStyle: {
+ normal: {
+ label: {
+ show: true
+ }
+ }
+ },
markLine: {
symbol: 'none',//鍘绘帀绠ご
data: [
@@ -788,14 +805,30 @@
name: 'LSL', yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }, label: { formatter: '{b}: {c}' }
},
{
- name: 'UCL', yAxis: parseFloat($("#HControlUpperLimit_X").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ name: 'UCL', yAxis: parseFloat($("#HControlUpperLimit_X").val()), lineStyle: { color: '#ff9145' }, label: { color: '#ff9145', 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}' }
+ name: 'LCL', yAxis: parseFloat($("#HControlLowerLimit_X").val()), lineStyle: { color: '#ff9145' }, label: { color: '#ff9145', fontSize: 10 }, label: { formatter: '{b}: {c}' }
}
,
{
- name: 'CL', yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ name: 'CL', yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#000000' }, label: { color: '#000000', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ }
+ ,
+ {
+ name: 'B', yAxis: parseFloat($("#HCenterline_X").val()) + HAreaValue_A, lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ }
+ ,
+ {
+ name: '-B', yAxis: parseFloat($("#HCenterline_X").val()) - HAreaValue_A, lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ }
+ ,
+ {
+ name: 'C', yAxis: parseFloat($("#HCenterline_X").val()) + HAreaValue_B, lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
+ }
+ ,
+ {
+ name: '-C', yAxis: parseFloat($("#HCenterline_X").val()) - HAreaValue_B, lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }, label: { formatter: '{b}: {c}' }
}
],
precision: 3
@@ -888,7 +921,14 @@
{
data: HSJZ,
type: 'line',
- itemStyle: { normal: { label: { show: true } } },
+ itemStyle: {
+ normal:
+ {
+ label: {
+ show: true
+ }
+ }
+ },
markLine: {
symbol: 'none',//鍘绘帀绠ご
data: [
@@ -918,6 +958,248 @@
}
+ //璁＄畻spc鍏ぇ鍒ゅ畾
+ function spc_judge() {
+ //鍧囧��
+ var HAreaValue = calc(calc(parseFloat($("#HControlUpperLimit_X").val()), parseFloat($("#HCenterline_X").val()), "-"), 3, "/").toFixed(5);
+ //涓婇檺閮ㄥ垎
+ var HAreaValue_A = parseFloat($("#HControlUpperLimit_X").val());
+ var HAreaValue_B = calc(calc(HAreaValue, 2, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
+ var HAreaValue_C = calc(calc(HAreaValue, 1, "*"), parseFloat($("#HCenterline_X").val()), "+").toFixed(5);
+ //涓嬮檺閮ㄥ垎
+ var HAreaValue_FA = parseFloat($("#HControlLowerLimit_X").val());
+ var HAreaValue_FB = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 2, "*"), "-").toFixed(5);
+ var HAreaValue_FC = calc(parseFloat($("#HCenterline_X").val()),calc(HAreaValue, 1, "*"), "-").toFixed(5);
+
+
+ let HAvg = [];//骞冲潎鍊�
+
+ for (var j = 1; j < option.cols[0].length; j++) {
+ if (optionAVG.length != 0) {
+ HAvg.push(optionAVG[0][option.cols[0][j].field]);
+ }
+ }
+
+ //杩炵画鍗佷簲涓偣鍦ㄤ腑蹇冪嚎涓や晶鐨凜鍖哄唴
+ var judge_return = [];
+ if (HAvg.length >= 15) {
+ for (var i = 14; i < HAvg.length; i++) {
+ if (HAvg[i] >= HAreaValue_FC && HAvg[i] <= HAreaValue_C) {
+ for (var j = i - 14; j <= i; j++) {
+ if (HAvg[j] >= HAreaValue_FC && HAvg[j] <= HAreaValue_C) {
+ if (i == j) {
+ for (var j1 = i; j1 >= i - 14; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ } else {
+ break;
+ }
+ }
+ }
+ }
+ }
+ //杩炵画14涓偣涓浉閭荤偣浜ゆ浛涓婁笅
+ if (HAvg.length >= 14) {
+ for (var i = 13; i < HAvg.length; i++) {
+ var judge = [];
+ for (var j = i - 13; j < i; j++) {
+ if (HAvg[j] > HAvg[j + 1]) {
+ judge.push(1);
+ } else if (HAvg[j] < HAvg[j + 1]) {
+ judge.push(-1);
+ }
+ }
+ for (var k = 0; k < judge.length; k++) {
+ if (judge[k] + judge[k + 1] == 0) {
+ if ((k + 1) == judge.length) {
+ for (var j1 = i; j1 >= i - 13; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ } else {
+ break;
+ }
+ }
+ }
+ }
+
+ //杩炵画9涓偣钀藉湪涓績绾跨殑鍚屼竴渚�
+ if (HAvg.length >= 9) {
+ for (var i = 8; i < HAvg.length; i++) {
+ var judge = [];
+ for (var j = i - 8; j <= i; j++) {
+ if (HAvg[j] > parseFloat($("#HCenterline_X").val())) {
+ judge.push(1);
+ } else if (HAvg[j] < parseFloat($("#HCenterline_X").val())) {
+ judge.push(-1);
+ }
+ }
+ var sum = 0;
+ for (var k = 0; k < judge.length; k++) {
+ sum += judge[k];
+ }
+ if (sum == 9 || sum == -9) {
+ for (var j1 = i; j1 >= i - 8; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+ }
+
+ //杩炵画8鐐硅惤鍦ㄤ腑蹇冪嚎涓や晶涓旀棤涓�鍦–鍖轰互鍐�(鍗冲湪C鍖轰互澶�)
+ if (HAvg.length >= 8) {
+ for (var i = 7; i < HAvg.length; i++) {
+ if (HAvg[i] < HAreaValue_FC || HAvg[i] > HAreaValue_C) {
+ for (var j = i - 7; j <= i; j++) {
+ if (HAvg[j] < HAreaValue_FC || HAvg[j] > HAreaValue_C) {
+ if (j == i) {
+ for (var j1 = i; j1 >= i - 7; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ } else {
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ //杩炵画6鐐归�掑鎴栭�掑噺
+ if (HAvg.length >= 6) {
+ for (var i = 5; i < HAvg.length; i++) {
+ var judge = [];
+ for (var j = i - 5; j < i; j++) {
+ if (HAvg[j] > HAvg[j + 1]) {
+ judge.push(1);
+ } else if (HAvg[j] < HAvg[j + 1]) {
+ judge.push(-1);
+ }
+ }
+ var sum = 0;
+ for (var k = 0; k < judge.length; k++) {
+ sum += judge[k];
+ }
+ if (sum == 5 || sum == -5) {
+ for (var j1 = i; j1 >= i - 5; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+ }
+
+ //杩炵画5鐐逛腑鏈�4鐐硅惤鍦ㄤ腑蹇冪嚎鍚屼竴渚х殑C鍖哄
+ if (HAvg.length >= 5) {
+ for (var i = 4; i < HAvg.length; i++) {
+ var judge = [];
+ if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_C) {
+ for (var j = i - 4; j <= i; j++) {
+ var record = [];
+ if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_C) {
+ record.push(HAvg[j]);
+ if (record.length >= 4) {
+ for (var j1 = i; j1 >= i - 4; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+
+ }
+ }
+ else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FC) {
+ for (var j = i - 4; j <= i; j++) {
+ var record = [];
+ if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FC) {
+ record.push(HAvg[j]);
+ if (record.length >= 4) {
+ for (var j1 = i; j1 >= i - 4; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ }
+ }
+
+
+ //杩炵画3鐐逛腑鏈�2鐐硅惤鍦ㄤ腑蹇冪嚎鍚屼竴渚х殑B鍖哄
+ if (HAvg.length >= 3) {
+ for (var i = 2; i < HAvg.length; i++) {
+ var judge = [];
+ if (HAvg[i] > parseFloat($("#HCenterline_X").val()) && HAvg[i] > HAreaValue_B) {
+ for (var j = i - 2; j <= i; j++) {
+ var record = [];
+ if (HAvg[j] > parseFloat($("#HCenterline_X").val()) && HAvg[j] > HAreaValue_B) {
+ record.push(HAvg[j]);
+ if (record.length >= 2) {
+ for (var j1 = i; j1 >= i - 2; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+
+ }
+ }
+ else if (HAvg[i] < parseFloat($("#HCenterline_X").val()) && HAvg[i] < HAreaValue_FB) {
+ for (var j = i - 2; j <= i; j++) {
+ var record = [];
+ if (HAvg[j] < parseFloat($("#HCenterline_X").val()) && HAvg[j] < HAreaValue_FB) {
+ record.push(HAvg[j]);
+ if (record.length >= 2) {
+ for (var j1 = i; j1 >= i - 2; j1--) {
+ if ($.inArray(HAvg[j1], judge_return) == -1) {
+ judge_return.push(HAvg[j1]);
+ }
+ }
+ }
+ }
+ }
+ }
+
+ }
+ }
+
+
+ //1涓偣钀藉湪A鍖轰互澶�
+ if (HAvg.length >= 0) {
+ for (var i = 0; i < HAvg.length; i++) {
+ var judge = [];
+ if (HAvg[i] > HAreaValue_A) {
+ if ($.inArray(HAvg[i], judge_return) == -1) {
+ judge_return.push(HAvg[i]);
+ }
+ }
+ else if (HAvg[i] < HAreaValue_FA) {
+ if ($.inArray(HAvg[i], judge_return) == -1) {
+ judge_return.push(HAvg[i]);
+ }
+ }
+ }
+ }
+
+ return judge_return;
+
+ }
+
//鐢熶骇杞﹂棿
function get_Dept() {
//鑾峰彇杞﹂棿鍒�
diff --git "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html" "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
index 9ca65e7..687ca3e 100644
--- "a/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
+++ "b/WebTM/views/\350\264\250\351\207\217\347\256\241\347\220\206/\351\246\226\344\273\266\346\243\200\351\252\214\345\215\225/QC_Add_Edit_FirstPieceCheckBill.html"
@@ -3899,6 +3899,8 @@
//#region 銆愬簾寮冧唬鐮�(鏂帿灏斿凡鍚敤)銆�
table.on('edit(mainTable)', function (obj) {
+ var cell = $(this);
+ var rowIndex = cell.closest('tr').data('index'); // 鑾峰彇褰撳墠琛屾暟鎹储寮�
// 鍗曞厓鏍肩紪杈戜箣鍓嶇殑鍊�
var oldText = $(this).prev().text();
var value = obj.value //寰楀埌淇敼鍚庣殑鍊�
@@ -3907,7 +3909,7 @@
var HInspectVal = $("#HInspectVal").val(); //妫�楠屽��
var HTargetVal = $("#HTargetVal").val(); //鐩爣鍊�
var HComparator = $("#HComparator").val(); //姣旇緝绗�
- var HEntryID = $("#HEntryID").val()-1;
+ var HEntryID = rowIndex;
var HAnalysisMethod = table.cache["mainTable"][HEntryID].HAnalysisMethod; //鍒嗘瀽鏂规硶
var HUpLimit = table.cache["mainTable"][HEntryID].HUpLimit; //涓婇檺鍊�
var HDownLimit = table.cache["mainTable"][HEntryID].HDownLimit; //涓嬮檺鍊�
--
Gitblit v1.9.1