From 581138dcdd4ca89eb74e6074b0730e6ed68f5709 Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期一, 23 六月 2025 11:28:14 +0800
Subject: [PATCH] 华远：直方图，对一个PCS存在多个检验结果的情况，只取第一个检验结果进行显示。
---
WebTM/views/案例代码/华远/HY_HistogramReport.html | 126 ++++++++++++++++++++++-------------------
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user | 4
2 files changed, 70 insertions(+), 60 deletions(-)
diff --git a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
index b7b94c8..cf2f84d 100644
--- a/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
+++ b/WebTM/Properties/PublishProfiles/LAYUI.pubxml.user
@@ -3659,7 +3659,7 @@
<publishTime>06/23/2025 09:37:48</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PNLInfoList.html">
- <publishTime>06/20/2025 14:01:58</publishTime>
+ <publishTime>06/23/2025 11:02:52</publishTime>
</File>
<File Include="views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_PoStockStyle.html">
<publishTime>06/03/2025 16:35:43</publishTime>
@@ -4909,7 +4909,7 @@
<publishTime>09/13/2024 15:42:13</publishTime>
</File>
<File Include="views/妗堜緥浠ｇ爜/鍗庤繙/HY_HistogramReport.html">
- <publishTime>06/10/2025 16:50:02</publishTime>
+ <publishTime>06/23/2025 11:17:43</publishTime>
</File>
<File Include="views/妗堜緥浠ｇ爜/鍗庤繙/HY_HistogramReport_ForPCSCheckNote.html">
<publishTime>06/10/2025 16:46:17</publishTime>
diff --git "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html" "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
index f711817..38fce99 100644
--- "a/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
+++ "b/WebTM/views/\346\241\210\344\276\213\344\273\243\347\240\201/\345\215\216\350\277\234/HY_HistogramReport.html"
@@ -74,6 +74,7 @@
var HBarCode_PNL_Note = ""; //璁板綍鏌ヨ鍚庣殑PNL鏉＄爜缂栧彿
var HLayOut_PNL = []; //PNL甯冨眬淇℃伅鏁版嵁
+ var HPCSNoList = []; //璁板綍甯冨眬涓婂凡缁忓姞鍏ョ殑PCS鍙�
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -162,6 +163,9 @@
HBarCode_PNL_Note = "";
}
+ //娓呯┖ 甯冨眬涓婂凡缁忓姞鍏ョ殑PCS鍙�
+ HPCSNoList = []
+
//鍔犺浇PNL甯冨眬鐩存柟鍥�
draw_Histogram(HLayOut_PNL);
@@ -236,67 +240,73 @@
//閬嶅巻鐢熸垚鐩存柟鍥�
for (var i = 0; i < data.length; i++) {
- //濡傛灉褰撳墠PCS鎵�灞炵殑set鍙� 涓庤褰曠殑 涓婁竴涓狿CS鎵�灞炵殑set鍙� 涓嶄竴鑷达紝鍒欓渶瑕佸垱寤烘柊鐨剆et瀹瑰櫒
- if (data[i]["HSetNo"] != HSetNo) {
- //鑾峰彇鐩存柟鍥惧鍣ㄥ璞�
- var HContainerElement = document.getElementById(HContainerElementID);
+ if ($.inArray(data[i]["HPCSNo"], HPCSNoList) > -1) {
+ continue;
+ } else {
+ HPCSNoList.push(data[i]["HPCSNo"]);
- //set瀹瑰櫒
- var HContainerElement_Set = document.createElement('div'); //set瀹瑰櫒
- HContainerElement_Set.id = data[i]["HSetNo"]; //set瀹瑰櫒鐨刬d涓簊et鍙�
- HContainerElement_Set.className = "layui-inline";
- HContainerElement_Set.style = "margin-left:20px;";
-
- //灏唖et瀹瑰櫒娣诲姞鍒扮洿鏂瑰浘瀹瑰櫒瀵硅薄涓�
- HContainerElement.appendChild(HContainerElement_Set);
+ //濡傛灉褰撳墠PCS鎵�灞炵殑set鍙� 涓庤褰曠殑 涓婁竴涓狿CS鎵�灞炵殑set鍙� 涓嶄竴鑷达紝鍒欓渶瑕佸垱寤烘柊鐨剆et瀹瑰櫒
+ if (data[i]["HSetNo"] != HSetNo) {
+ //鑾峰彇鐩存柟鍥惧鍣ㄥ璞�
+ var HContainerElement = document.getElementById(HContainerElementID);
- //璁板綍 褰撳墠set瀹瑰櫒id
- HCurrentElementID_Set = data[i]["HSetNo"];
+ //set瀹瑰櫒
+ var HContainerElement_Set = document.createElement('div'); //set瀹瑰櫒
+ HContainerElement_Set.id = data[i]["HSetNo"]; //set瀹瑰櫒鐨刬d涓簊et鍙�
+ HContainerElement_Set.className = "layui-inline";
+ HContainerElement_Set.style = "margin-left:20px;";
+
+ //灏唖et瀹瑰櫒娣诲姞鍒扮洿鏂瑰浘瀹瑰櫒瀵硅薄涓�
+ HContainerElement.appendChild(HContainerElement_Set);
+
+ //璁板綍 褰撳墠set瀹瑰櫒id
+ HCurrentElementID_Set = data[i]["HSetNo"];
+ }
+
+ //鏍规嵁 褰撳墠set瀹瑰櫒id 鑾峰彇 褰撳墠set瀹瑰櫒瀵硅薄
+ var HCurrentElement_Set = document.getElementById(HCurrentElementID_Set);
+
+ //PCS瀹瑰櫒
+ var HContainerElement_PCS = document.createElement('div'); //PCS瀹瑰櫒
+ HContainerElement_PCS.id = data[i]["HPCSNo"]; //PCS瀹瑰櫒鐨刬d涓篜CS鍙�
+ HContainerElement_PCS.style = "border: 2px solid black;"; //璁剧疆PCS鐨勫浘鏍�
+ HContainerElement_PCS.className = "layui-inline";
+ if (data[i]["HSetNo"] == HSetNo && data[i]["HPosition_x"] != HPosition_x) { //鐩稿悓set瀹瑰櫒涓紝褰撳墠PCS鐨勮绱㈠紩涓庝笂涓�涓狿CS鐨勮绱㈠紩涓嶄竴鑷达紝鍒欐崲琛�
+ var HBrElement_PCS = document.createElement('br');
+ HCurrentElement_Set.appendChild(HBrElement_PCS);
+ }
+
+ //PCS鏁版嵁缁存姢鎸夐挳
+ var HButtonElement_PCS = document.createElement('button'); //PCS瀹瑰櫒涓殑鎸夐挳
+ HButtonElement_PCS.id = data[i]["HPCSNo"] + "_Button";
+ HButtonElement_PCS.setAttribute('lay-filter', data[i]["HPCSNo"] + "_Button");
+ HButtonElement_PCS.type = "button";
+ HButtonElement_PCS.className = "layui-btn layuiadmin-btn-order";
+ if (data[i]["HIsBadFlag"] == "1" && data[i]["HCheckProc"] == "鐐．VRS鍐呭眰") {
+ HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:red;";
+ }
+ else if (data[i]["HIsBadFlag"] == "1" && data[i]["HCheckProc"] == "鐐．VRS澶栧眰") {
+ HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:orange;";
+ }
+ else if (data[i]["HIsBadFlag"] == "1" && data[i]["HCheckProc"] == "AVI") {
+ HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:yellow;";
+ }
+ else if (data[i]["HIsBadFlag"] == "1" && data[i]["HCheckProc"] == "鐢垫祴") {
+ HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:green;";
+ }
+ else {
+ HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:black;";
+ }
+
+ ////灏哖CS鏁版嵁缁存姢鎸夐挳娣诲姞鍒癙CS瀹瑰櫒瀵硅薄涓�
+ HContainerElement_PCS.appendChild(HButtonElement_PCS);
+
+ //灏哖CS瀹瑰櫒娣诲姞鍒皊et瀹瑰櫒瀵硅薄涓�
+ HCurrentElement_Set.appendChild(HContainerElement_PCS);
+
+ HSetNo = data[i]["HSetNo"];
+ HPosition_x = data[i]["HPosition_x"];
}
-
- //鏍规嵁 褰撳墠set瀹瑰櫒id 鑾峰彇 褰撳墠set瀹瑰櫒瀵硅薄
- var HCurrentElement_Set = document.getElementById(HCurrentElementID_Set);
-
- //PCS瀹瑰櫒
- var HContainerElement_PCS = document.createElement('div'); //PCS瀹瑰櫒
- HContainerElement_PCS.id = data[i]["HPCSNo"]; //PCS瀹瑰櫒鐨刬d涓篜CS鍙�
- HContainerElement_PCS.style = "border: 2px solid black;"; //璁剧疆PCS鐨勫浘鏍�
- HContainerElement_PCS.className = "layui-inline";
- if (data[i]["HSetNo"] == HSetNo && data[i]["HPosition_x"] != HPosition_x) { //鐩稿悓set瀹瑰櫒涓紝褰撳墠PCS鐨勮绱㈠紩涓庝笂涓�涓狿CS鐨勮绱㈠紩涓嶄竴鑷达紝鍒欐崲琛�
- var HBrElement_PCS = document.createElement('br');
- HCurrentElement_Set.appendChild(HBrElement_PCS);
- }
-
- //PCS鏁版嵁缁存姢鎸夐挳
- var HButtonElement_PCS = document.createElement('button'); //PCS瀹瑰櫒涓殑鎸夐挳
- HButtonElement_PCS.id = data[i]["HPCSNo"] + "_Button";
- HButtonElement_PCS.setAttribute('lay-filter', data[i]["HPCSNo"] + "_Button");
- HButtonElement_PCS.type = "button";
- HButtonElement_PCS.className = "layui-btn layuiadmin-btn-order";
- if (data[i]["HIsBadFlag"] == "1" && data[i]["HCheckProc"] == "鐐．VRS鍐呭眰") {
- HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:red;";
- }
- else if (data[i]["HIsBadFlag"] == "1" && data[i]["HCheckProc"] == "鐐．VRS澶栧眰") {
- HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:orange;";
- }
- else if (data[i]["HIsBadFlag"] == "1" && data[i]["HCheckProc"] == "AVI") {
- HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:yellow;";
- }
- else if (data[i]["HIsBadFlag"] == "1" && data[i]["HCheckProc"] == "鐢垫祴") {
- HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:green;";
- }
- else {
- HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:black;";
- }
-
- ////灏哖CS鏁版嵁缁存姢鎸夐挳娣诲姞鍒癙CS瀹瑰櫒瀵硅薄涓�
- HContainerElement_PCS.appendChild(HButtonElement_PCS);
-
- //灏哖CS瀹瑰櫒娣诲姞鍒皊et瀹瑰櫒瀵硅薄涓�
- HCurrentElement_Set.appendChild(HContainerElement_PCS);
-
- HSetNo = data[i]["HSetNo"];
- HPosition_x = data[i]["HPosition_x"];
};
}
//#endregion
--
Gitblit v1.9.1