From 57572d047e974de24ebb1a926b060fda25bf0b3e Mon Sep 17 00:00:00 2001
From: duhe <226547893@qq.com>
Date: 星期二, 12 八月 2025 17:43:05 +0800
Subject: [PATCH] 华远：直观图 备料set显示坐标有问题 处理
---
WebTM/views/案例代码/华远/HY_HistogramReport.html | 164 ++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 132 insertions(+), 32 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 01392c4..e744e8f 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"
@@ -41,13 +41,19 @@
<input type="text" class="layui-input" name="HBarCode_Set" id="HBarCode_Set">
</div>
</div>
+ <div class="layui-inline">
+ <div class="layui-input-block" style="margin-left: 0px;">
+ <input type="checkbox" name="checkbox_isAVI" id="checkbox_isAVI" lay-skin="primary" lay-filter="checkbox_isAVI" checked title="AVI">
+ <input type="hidden" value="true" name="isAVI" id="isAVI" lay-verify="isAVI">
+ </div>
+ </div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch">
<i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
</button>
<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="HistogramReport" style = "background-color: black; height: 2000px; width: 100%; display: flex; justify-content: center;">
+ <div id="HistogramReport" style = "background-color: black; height: 2000px; width: 100%; display: flex; flex-direction: column; align-items:center;">
</div>
</form>
@@ -96,6 +102,11 @@
});
//#endregion
+ //#region AVI澶嶉�夋
+ form.on('checkbox(checkbox_isAVI)', function (data) {
+ $("#isAVI").val(data.elem.checked);
+ });
+ //#endregion
//#region 鏈〉闈㈡墍鏈夎璋冪敤鐨勬柟娉�
//#region 鍒濆鍖栫晫闈�
@@ -254,27 +265,88 @@
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;margin-top:50px;";
+ HContainerElement_Set.style = "margin-left:20px;margin-top:20px;";
+
+ //鍦ㄦ瘡涓�涓猻et涓婄殑鍚勪釜鍒楁渶涓婃柟澧炲姞鍒楃储寮�
+ var HColIndexList = [];
+ var HSetNo_ForRowIndex = data[0]["HSetNo"];
+ for (var j = 0; j < data.length; j++) {
+ if (data[j]["HSetNo"] == HSetNo_ForRowIndex && data[j]["HPosition_x"] == "1") {
+ if ($.inArray(data[j]["HPosition_y"], HColIndexList) == -1) {
+ HColIndexList.push(data[j]["HPosition_y"], HColIndexList);
+
+ //鍒楃储寮曞鍣�
+ var HContainerElement_RowIndex = document.createElement('div'); //鍒楃储寮曞鍣�
+ HContainerElement_RowIndex.style = "border: 2px solid black;color:white;";
+ HContainerElement_RowIndex.className = "layui-inline";
+
+ //鍒楃储寮曟寜閽�
+ var HButtonElement_RowIndex = document.createElement('div'); //鍒楃储寮曞鍣ㄤ腑鐨勬寜閽�
+ HButtonElement_RowIndex.className = "layui-btn layuiadmin-btn-order";
+ HButtonElement_RowIndex.style = "background-color:black;color:white;width:18px;";
+ HButtonElement_RowIndex.innerHTML = data[j]["HPosition_y"];
+
+
+ //灏嗗垪绱㈠紩鎸夐挳娣诲姞鍒板垪绱㈠紩瀹瑰櫒瀵硅薄涓�
+ HContainerElement_RowIndex.appendChild(HButtonElement_RowIndex);
+
+ //灏嗗垪绱㈠紩瀹瑰櫒娣诲姞鍒皊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);
+ break;
+ }
+ }
+
+
//灏唖et瀹瑰櫒娣诲姞鍒扮洿鏂瑰浘瀹瑰櫒瀵硅薄涓�
HContainerElement.appendChild(HContainerElement_Set);
//璁板綍 褰撳墠set瀹瑰櫒id
HCurrentElementID_Set = data[i]["HSetNo"];
+
+
}
//鏍规嵁 褰撳墠set瀹瑰櫒id 鑾峰彇 褰撳墠set瀹瑰櫒瀵硅薄
var HCurrentElement_Set = document.getElementById(HCurrentElementID_Set);
+
+ //鍦ㄦ瘡涓�涓猻et涓婄殑鍚勪釜琛屽墠澧炲姞琛岀储寮�
+ if ((data[i]["HSetNo"] == HCurrentElementID_Set && data[i]["HPosition_x"] != HPosition_x) || (data[i]["HSetNo"] == HCurrentElementID_Set && data[i]["HPosition_x"] == "1" && data[i]["HPosition_y"] == "1")) { //鐩稿悓set瀹瑰櫒涓紝褰撳墠PCS鐨勮绱㈠紩涓庝笂涓�涓狿CS鐨勮绱㈠紩涓嶄竴鑷达紝鍒欐崲琛�,骞惰缃垪鍧愭爣
+ //鍒楃储寮曞鍣�
+ var HContainerElement_ColIndex = document.createElement('div'); //琛岀储寮曞鍣�
+ HContainerElement_ColIndex.style = "border: 2px solid black;color:white;";
+ HContainerElement_ColIndex.className = "layui-inline";
+ HContainerElement_ColIndex.innerHTML = data[i]["HPosition_x"];
+ 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);
+ }
+
+ //灏嗚绱㈠紩瀹瑰櫒瀹瑰櫒娣诲姞鍒皊et瀹瑰櫒瀵硅薄涓�
+ HCurrentElement_Set.appendChild(HContainerElement_ColIndex);
+ }
+
//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);
- }
+ //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瀹瑰櫒涓殑鎸夐挳
@@ -282,21 +354,29 @@
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 {
+
+ 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"] + ";";
+ } 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);
@@ -337,19 +417,39 @@
var SetNo = SetElement_Div.id; //set鍙�
var title = "PNL鏉＄爜缂栧彿锛�" + HBarCode_PNL_Note + "锛泂et鍙凤細" + SetNo + "锛汸CS鍙凤細" + PCSNo;
- layer.open({
- type: 2
- , skin: "layui-layer-rim" //鍔犱笂杈规
- , title: "PCS妫�楠屼俊鎭淮鎶わ紙" + title + "锛�" //鏍囬
- , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
- , shift: 2 //寮瑰嚭鍔ㄧ敾
- , area: ["50%", "80%"] //绐椾綋澶у皬
- , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
- , content: ['./HY_HistogramReport_ForPCSCheckNote.html?HBarCode_PNL=' + HBarCode_PNL_Note + "&HSetNo=" + SetNo + "&PCSNo=" + PCSNo, "yes"]
- , end: function () {
- $("#btnSearch").trigger('click');
- }
- })
+
+ var isAVI = $("#isAVI").val();
+
+ if (isAVI=="true") {
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: 'AVI鏂板锛�' + title + ')',
+ closeBtn: 1,
+ shift: 2,
+ area: ['100%', '100%'],
+ maxmin: true,
+ content: '../../璐ㄩ噺绠＄悊/PNL妫�楠屼俊鎭�/QC_CheckNote_PNL_TempEdit.html?OperationType=6&linterid=&HSouceBillType=10004&HBarCode_PNL=' + HBarCode_PNL_Note + "&HSetNo=" + SetNo + "&HPCSNo=" + PCSNo,
+ end: function () {
+ //鍒锋柊椤甸潰,
+ get_FastQuery();
+ }
+ });
+ } else {
+ layer.open({
+ type: 2
+ , skin: "layui-layer-rim" //鍔犱笂杈规
+ , title: "PCS妫�楠屼俊鎭淮鎶わ紙" + title + "锛�" //鏍囬
+ , closeBtn: 1 //绐椾綋鍙充笂瑙掑叧闂� 鐨� 鏍峰紡
+ , shift: 2 //寮瑰嚭鍔ㄧ敾
+ , area: ["50%", "80%"] //绐椾綋澶у皬
+ , maxmin: true //璁剧疆鏈�澶ф渶灏忔寜閽槸鍚︽樉绀�
+ , content: ['./HY_HistogramReport_ForPCSCheckNote.html?HBarCode_PNL=' + HBarCode_PNL_Note + "&HSetNo=" + SetNo + "&PCSNo=" + PCSNo, "yes"]
+ , end: function () {
+ $("#btnSearch").trigger('click');
+ }
+ })
+ }
});
}
}
--
Gitblit v1.9.1