From 77d4a93ed9a3e49df5de1cb5ea8b3b75d987e4c5 Mon Sep 17 00:00:00 2001
From: llj <132905093+newwwwwwtree@users.noreply.github.com>
Date: 星期一, 18 八月 2025 16:28:15 +0800
Subject: [PATCH] 补充
---
WebTM/views/基础资料/公用基础资料/Gy_BarCodeReport.html | 49 +++++++++++++++++++++++++++----------------------
WebTM/layuiadmin/Scripts/webConfig.js | 3 ++-
2 files changed, 29 insertions(+), 23 deletions(-)
diff --git a/WebTM/layuiadmin/Scripts/webConfig.js b/WebTM/layuiadmin/Scripts/webConfig.js
index 00f1da3..8f07eb4 100644
--- a/WebTM/layuiadmin/Scripts/webConfig.js
+++ b/WebTM/layuiadmin/Scripts/webConfig.js
@@ -7,10 +7,11 @@
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://localhost:8082/API/"; //鏉滆春鏈湴閰嶇疆
/*var WEBURL = "http://localhost:8082/API/"; //寮犵憺骞挎湰鍦伴厤缃�*/
- var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�
+/* var WEBURL = "http://localhost:81/API/" //缈佹稕娑涙湰鍦伴厤缃�*/
//var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉ㄤ箰鏈湴閰嶇疆
//var WEBURL = "http://47.96.97.237/API/"; //鏅轰簯鏈嶅姟鍣�
/* var WEBURL = "http://localhost:8082/LuBaoAPI/"; //浣欐�濇澃鏈湴閰嶇疆*/
+ var WEBURL = "http://localhost:8082/LuBaoAPI/"; //鏉庢灄淇婃湰鍦伴厤缃�
//var WEBURL = "http://localhost:8088/ARAPI/"; //浣欐�濇澃鏈湴閰嶇疆(瀹夌憺)
//var WEBURL = "http://61.164.86.218:8099/ABAPI/"; //濂ラ偊
//var WEBURL = "http://10.1.4.155/API/"; //姹熶赴瀹㈡埛NEW
diff --git "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html" "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
index be6b0db..cd13ac6 100644
--- "a/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
+++ "b/WebTM/views/\345\237\272\347\241\200\350\265\204\346\226\231/\345\205\254\347\224\250\345\237\272\347\241\200\350\265\204\346\226\231/Gy_BarCodeReport.html"
@@ -803,34 +803,39 @@
//#endregion
//鏌辩姸鍥剧粦瀹氭暟鎹�
- var HXTitle = [];//X杞存爣棰樺悕绉�
+ // 1. 鎸夋壒娆″彿鍒嗙粍鑱氬悎
+ var batchMap = {};
+ option.data.forEach(function (item) {
+ var batchNo = item['lot鎵规鍙�'] || item['HBatchNo'];
+ if (!batchNo) return;
+ if (!batchMap[batchNo]) {
+ batchMap[batchNo] = {
+ 涓嶈壇鏁扮洰: 0,
+ 鎬绘暟: 0
+ };
+ batchMap[batchNo].鎬绘暟 = (parseInt(item['鎺掔増鏁�'] || 0) + parseInt(item['澶囧搧鎺掔増鏁�'] || 0));
+ }
+ batchMap[batchNo].涓嶈壇鏁扮洰 += (parseInt(item['涓嶈壇鎬绘暟'] || 0) + parseInt(item['澶囧搧涓嶈壇鎬绘暟'] || 0));
+ });
+ // 2. 鏋勯�犳煴鐘跺浘鏁版嵁
+ var HXTitle = [];
var HSourceIssueCount = [];
var HSourceIssueCount1 = [];
var HSourceIssueCount2 = [];
var ZZTColor = [];
- //姣忎釜鎵规鐨凱CS鎬绘暟count_option_LotNoList
- var count_option_LotNoList = 0;
- var AllCount = 0;
- var BadReasonCount = 0;
+ for (var batchNo in batchMap) {
+ HXTitle.push(batchNo);
+ HSourceIssueCount.push(batchMap[batchNo].涓嶈壇鏁扮洰);
+ HSourceIssueCount1.push(batchMap[batchNo].鎬绘暟);
+ // 涓嶈壇鐜� = 涓嶈壇鏁扮洰 / 鎬绘暟
+ var rate = batchMap[batchNo].鎬绘暟 > 0 ? (batchMap[batchNo].涓嶈壇鏁扮洰 / batchMap[batchNo].鎬绘暟 * 100).toFixed(2) : "0.00";
+ HSourceIssueCount2.push(rate + "%");
+ }
-
+
var ZZTColor2 = ['#00FFFF', '#FC2C83', '#FCED2C', '#93FC2C', '#FC2CF0', '#FC892C', '#2C81FC', '#2CC9FC', '#2CFCA7', '#DED3F2', '#F2D8D3', '#F2D3E0', '#D8E052', '#7EE052', '#52E0D8', '#5F52E0', '#E06F52', '#52E09B', '#E052DE', '#E05F52', '#52B2E0', '#E0C452', '#52CEE0', '#648690', '#E5D1D6', '#D8E5D1', '#E5D1E5', '#D8E5D1', '#7C6262', '#76627C', '#81A583', '#81A595'];
- //缁熻涓嶅悓鎵规鍙蜂笅鐨勬�绘暟鐩�
- for (let i = 0; i < option_LotNoList.data.length; i++) {
- //缁熻璇ユ壒娆′笅鐨凱NL鍙峰拰鎬绘暟
- AllCount++;
- count_option_LotNoList += option_LotNoList.data[i].鎬昏;
- }
- for (let i = 0; i < option_BadReason.data.length; i++) {
- BadReasonCount += option_BadReason.data[i].涓嶈壇鍘熷洜鏁伴噺;
- }
-
- for (let i = 0; i < option_LotNoList.data.length; i++) {
- HXTitle.push(option_LotNoList.data[i].HBatchNo);
-
- HSourceIssueCount.push(BadReasonCount);
- HSourceIssueCount1.push(count_option_LotNoList);
- HSourceIssueCount2.push(((BadReasonCount) / (AllCount * count_option_LotNoList)) * 100 + '%');
+
+ for (let i = 0; i < option.data.length; i++) {
ZZTColor.push({
x: 1,
y: 0,
--
Gitblit v1.9.1