From 31431d1ba460d57059280d917a5ceaef1f617a4d Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 18 八月 2025 16:28:36 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/案例代码/华远/HY_HistogramReport.html | 85 ++++++++++++++++++++++++++++++++++++------
1 files changed, 72 insertions(+), 13 deletions(-)
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 6b6e08e..4453800 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"
@@ -53,6 +53,8 @@
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">閲嶇疆</button>
</div>
</div>
+ <div id="HBadLabelNameList">
+ </div>
<div id="HistogramReport" style = "background-color: black; height: 2000px; width: 100%; display: flex; flex-direction: column; align-items:center;">
</div>
@@ -81,6 +83,12 @@
var HBarCode_PNL_Note = ""; //璁板綍鏌ヨ鍚庣殑PNL鏉＄爜缂栧彿
var HLayOut_PNL = []; //PNL甯冨眬淇℃伅鏁版嵁
var HPCSNoList = []; //璁板綍甯冨眬涓婂凡缁忓姞鍏ョ殑PCS鍙�
+
+ var HBadLabelNameList = ["AOI1", "AOI2", "AOI3", "AOI4", "AVI", "MRB", "鐢垫祴"]; //妫�楠岀珯鍒爣绛惧悕绉版暟缁�
+ var HBadInfo = {}; //妫�楠岀珯鍒搴斾笉鑹暟閲�
+ for (var i = 0; i < HBadLabelNameList.length; i++) {
+ HBadInfo[HBadLabelNameList[i]] = 0;
+ }
//#endregion
//#region 杩涘叆椤甸潰鍗冲姞杞�
@@ -293,6 +301,13 @@
//灏嗗垪绱㈠紩瀹瑰櫒娣诲姞鍒皊et瀹瑰櫒瀵硅薄涓�
HContainerElement_Set.appendChild(HContainerElement_RowIndex);
}
+
+ if (j == data.length - 1) {
+ var HBrElement_PCS = document.createElement('br');
+ HContainerElement_Set.appendChild(HBrElement_PCS);
+ break;
+ }
+
} else {
var HBrElement_PCS = document.createElement('br');
HContainerElement_Set.appendChild(HBrElement_PCS);
@@ -347,21 +362,34 @@
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:" + data[i]["HColorStr"] + ";";
- }
- 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 {
+
+ if (data[i]["HIsBadFlag"] == "1") {
+ HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:" + data[i]["HPCSColor"] + ";";
+
+ //缁熻妫�楠岀珯鍒搴斾笉鑹暟閲�
+ if (typeof (HBadInfo[data[i]["HCheckProcName"]]) != "undefined") {
+ HBadInfo[data[i]["HCheckProcName"]] += 1;
+ }
+ } else {
HButtonElement_PCS.style = "background-image: url('" + HIconUrl + "'); background-size: cover; background-position: center; background-repeat: no-repeat;background-color:black;";
}
+
+
+ //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:" + data[i]["HColorStr"] + ";";
+ //}
+ //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);
@@ -373,6 +401,9 @@
HPosition_x = data[i]["HPosition_x"];
}
};
+
+ //璁剧疆 妫�楠岀珯鍒爣绛�
+ setBadInfoLabel();
}
//#endregion
@@ -443,6 +474,34 @@
}
}
//#endregion
+
+ //#region 璁剧疆涓嶈壇鏍囩
+ function setBadInfoLabel() {
+ //鑾峰彇鏍囩瀹瑰櫒
+ var HBadLabelNameListElement = document.getElementById("HBadLabelNameList");
+ if (HBadLabelNameListElement != null) {
+ // 閬嶅巻鏍囩瀹瑰櫒瀵硅薄涓殑鎵�鏈夊瓙鍏冪礌骞朵粠DOM涓Щ闄�
+ while (HBadLabelNameListElement.firstChild) {
+ HBadLabelNameListElement.removeChild(HBadLabelNameListElement.firstChild);
+ }
+
+ for (var i = 0; i < HBadLabelNameList.length; i++) {
+ //set瀹瑰櫒
+ var labelElement= document.createElement('div'); //鏍囩
+ labelElement.id = HBadLabelNameList[i]; //鏍囩鐨刬d
+ labelElement.style = "font-size: 20px; color: red;margin-left:50px;display: inline;";
+ labelElement.innerHTML = HBadLabelNameList[i] + "锛�" + HBadInfo[HBadLabelNameList[i]];
+
+ //灏嗘爣绛炬坊鍔犲埌鏍囩瀹瑰櫒瀵硅薄涓�
+ HBadLabelNameListElement.appendChild(labelElement);
+ }
+ }
+
+ for (var i = 0; i < HBadLabelNameList.length; i++) {
+ HBadInfo[HBadLabelNameList[i]] = 0;
+ }
+ }
+ //#endregion
});
//#endregion
--
Gitblit v1.9.1