From 3d240d150e6e1a4e2df1a9f87d00ddd03ace4ee5 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期五, 17 一月 2025 10:06:37 +0800
Subject: [PATCH] 增加 BOM层级展开报表,修复全程追溯报表 黑白标页签导出失败,工艺路线的表头查询优化页面排序
---
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 315 +++++++++++++++++++++------------------------------
1 files changed, 130 insertions(+), 185 deletions(-)
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_EquipMentCollectionTechParam.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_EquipMentCollectionTechParam.html"
index 8634b46..4b18a7f 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_EquipMentCollectionTechParam.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_EquipMentCollectionTechParam.html"
@@ -46,7 +46,7 @@
</button>
</div>
</div>
- <div class="layui-inline">
+ <div class="layui-inline" style="display:none">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ュ簭</label>
<div class="layui-input-block">
<input type="text" class="layui-input" lay-verify="HProcName" name="HProcName" id="HProcName" value="" style="background-color: #efefef4d; width: 75%; display: inline-block;" readonly>
@@ -55,7 +55,15 @@
</button>
</div>
</div>
-
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">閲囬泦鏉ユ簮</label>
+ <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
+ <select name="HEquipType" id="HEquipType" class=" ForFilteringSchemes" lay-verify="HEquipType">
+ <option value="鎵嬪姩杈撳叆">鎵嬪姩杈撳叆</option>
+ <option value="璁惧閲囬泦">璁惧閲囬泦</option>
+ </select>
+ </div>
+ </div>
<div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
<div class="layui-inline">
<label class="layui-form-label" style="width: 85px;padding: 9px 18px;">宸ヨ壓鍙傛暟</label>
@@ -67,101 +75,21 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label">鏃ユ湡</label>
+ <label class="layui-form-label">寮�濮嬫棩鏈�</label>
<div class="layui-input-block">
<input type="date" class="layui-input ForFilteringSchemes" id="HDate" style="width:190px;">
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">缁撴潫鏃ユ湡</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HDate1" style="width:190px;">
</div>
</div>
<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnSearch" id="btnSearch" style="padding: 0 10px;margin-left: 20px;">
<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 class="layui-colla-content" style="padding: 0px; margin-left: 6%;">
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
- </div>
- </div>
- <div class="layui-row" style="margin-top:5px">
- <div class="layui-inline">
- <label class="layui-form-label">杩囨护</label>
- <div class="layui-input-block">
- <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
- </select>
- </div>
- </div>
- <div class="layui-inline">
- <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
- <option value="0" selected="selected"></option>
- <option value="=">=</option>
- <option value=">=">>=</option>
- <option value=">">></option>
- <option value="<="><=</option>
- <option value="<"><</option>
- <option value="<>"><></option>
- <option value="7">鍖呭惈</option>
- <option value="8">宸﹀寘鍚�</option>
- <option value="9">鍙冲寘鍚�</option>
- <option value="10">涓嶅寘鍚�</option>
- </select>
- </div>
- <div class="layui-inline">
- <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
- </div>
- </div>
</div>
</div>
</div>
@@ -273,6 +201,7 @@
// 鍒濆鍖栫晫闈�
function set_ClearBill() {
$("#HDate").val(Format(new Date, "yyyy-MM-dd"));
+ $("#HDate1").val(Format(new Date, "yyyy-MM-dd"));
set_InitGrid(); //鍒濆鍖栬〃鏍�
get_FastQuery();
////鍔犺浇鎶樼嚎鍥�
@@ -312,7 +241,7 @@
url: GetWEBURL() + '/QC_CustomerAppealReport/Get_QC_EquipMentCollectionTechParamList',
type: "GET",
async:false,
- data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"]},
success: function (data1) {
if (data1.count == 1) {
var data = [];
@@ -374,105 +303,31 @@
});
layer.close(index);
}
+
//蹇�熸煡璇�
function get_FastQuery() {
var HEquipNumber = $("#HEquipNumber").val();
var HEquipName = $("#HEquipName").val();
var HProcName = $("#HProcName").val();
var HTechParamName = $("#HTechParamName").val();
- var HDate = $("#HDate").val();
-
- var ColName = $("#ColName").val();//澶嶉�夋
- var Comparator = $("#Comparator").val()
- var ColContent = $("#ColContent").val();
-
- var ColName1 = $("#ColName1").val();//澶嶉�夋
- var Comparator1 = $("#Comparator1").val()
- var ColContent1 = $("#ColContent1").val();
- var ColName2 = $("#ColName2").val();//澶嶉�夋
- var Comparator2 = $("#Comparator2").val()
- var ColContent2 = $("#ColContent2").val();
-
- if (ColName != 0 && Comparator != 0) {
- var com = "";
- switch (Comparator) {
- case "7":
- com = "like'%" + ColContent + "%'";
- break;
- case "8":
- com = "like'%" + ColContent + "'";
- break;
- case "9":
- com = "like'" + ColContent + "%'";
- break;
- case "10":
- com = "not like'%" + ColContent + "%'";
- break;
- default:
- com = "" + Comparator + "'" + ColContent + "'";
- break;
+ var HDate = $("#HDate").val(); //寮�濮嬫棩鏈�
+ var HDate1 = $("#HDate1").val();//缁撴潫鏃ユ湡
+ var HEquipType = $("#HEquipType").val();
+
+ if (HEquipNumber != "" || HTechParamName != "") {
+ sWhere = {
+ HEquipNumber: HEquipNumber
+ , HTechParamName: HTechParamName
+ , HDate: HDate
+ , HDate1: HDate1
+ , HEquipType: HEquipType
}
- sWhere += " and " + ColName + " " + com;
- }
- if (ColName1 != 0 && Comparator1 != 0) {
- var com1 = "";
- switch (Comparator1) {
- case "7":
- com1 = "like'%" + ColContent1 + "%'";
- break;
- case "8":
- com1 = "like'%" + ColContent1 + "'";
- break;
- case "9":
- com1 = "like'" + ColContent1 + "%'";
- break;
- case "10":
- com1 = "not like'%" + ColContent1 + "%'";
- break;
- default:
- com1 = "" + Comparator1 + "'" + ColContent1 + "'";
- break;
- }
- sWhere += " and " + ColName1 + " " + com1;
- }
- if (ColName2 != 0 && Comparator2 != 0) {
- var com2 = "";
- switch (Comparator2) {
- case "7":
- com2 = "like'%" + ColContent2 + "%'";
- break;
- case "8":
- com2 = "like'%" + ColContent2 + "'";
- break;
- case "9":
- com2 = "like'" + ColContent2 + "%'";
- break;
- case "10":
- com2 = "not like'%" + ColContent2 + "%'";
- break;
- default:
- com2 = "" + Comparator + "'" + ColContent + "'";
- break;
- }
- sWhere += " and " + ColName2 + " " + com2;
- }
-
-
- if (HEquipNumber) {
- sWhere += " and 璁惧缂栫爜 = '" + HEquipNumber + "'";
- }
- if (HTechParamName) {
- sWhere += " and 宸ヨ壓浜ф暟 = '" + HTechParamName + "'";
- }
- if (HDate) {
- sWhere += " and CONVERT(date, 閲囬泦鏃ユ湡) = '" + HDate + "'";
- }
- if (HEquipNumber != "" || HTechParamName!="") {
- get_Display(sWhere);
+ get_Display(JSON.stringify(sWhere));
sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
}
}
+
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
$("#HEquipNumber").val("");
@@ -495,6 +350,7 @@
sWhere = "";
}
+
//鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
@@ -508,18 +364,37 @@
//鎶樼嚎鍥剧粦瀹氭暟鎹�
var H_X = [];//X杞存爣棰�
- var HVaule = [];//瀹為檯鍊�
+ var HVaule = [];//瀹為檯鍊�
+ var HStd = [];//鏍囧噯鍊�
+ var HMax = [];//涓婄嚎鍊�
+ var HMin = [];//涓嬮檺鍊�
var HTitle = "璁惧宸ヨ壓鍙傛暟瓒嬪娍鍒嗘瀽鍥�";//鍥惧舰鏍囬
if (option.data.length > 0) {
for (let i = 0; i < option.data.length ; i++) {
H_X.push(option.data[i].閲囬泦鏃ユ湡);
}
// 濉厖鏁版嵁
- for (let i = 0; i < option.data.length; i++) {
-
- HVaule.push(option.data[i].鏁伴噰鍊�);
+ for (let i = 0; i < option.data.length; i++) {
+ if ($("#HEquipType").val() == "鎵嬪姩杈撳叆") {
+ HMax.push(option.data[i].涓婇檺鍊�);
+ HMin.push(option.data[i].涓嬮檺鍊�);
+ HStd.push(option.data[i].鏍囧噯鍊�);
+ HVaule.push(option.data[i].瀹為檯鍊�);
+ } else {
+ HVaule.push(option.data[i].鏁伴噰鍊�);
+ HMax.push(option.data[i].涓婇檺鍊�);
+ HMin.push(option.data[i].涓嬮檺鍊�);
+ HStd.push(option.data[i].鏍囧噯鍊�);
+ }
}
}
+
+ var minValue = Math.min(...HVaule) - 10; //鎶樼嚎鐨勬渶澶у��
+ var maxValue = Math.max(...HVaule) + 10; //鎶樼嚎鐨勬渶灏忓��
+ var interval = Math.floor((maxValue - minValue) / 10); //鏄剧ず鎶樼嚎鐨勯棿闅�
+ minValue = Number(minValue.toFixed(2)); // 淇濈暀涓や綅灏忔暟骞惰浆鎹负鏁板瓧
+ minValue = Number(minValue.toFixed(2)); // 淇濈暀涓や綅灏忔暟骞惰浆鎹负鏁板瓧
+
option_ZZT = {
title: {
text: HTitle,
@@ -529,7 +404,7 @@
trigger: 'axis'
},
legend: {
- data: ['鏁伴噰鍊�'],
+ data: ['鏁伴噰鍊�', '涓婇檺鍊�', '涓嬮檺鍊�', '鏍囧噯鍊�'],
top: 'bottom',
left: 'center'
},
@@ -555,7 +430,10 @@
],
yAxis: [
{
- type: 'value'
+ type: 'value',
+ min: minValue,
+ max: maxValue,
+ interval: interval
}
],
series: [
@@ -572,6 +450,72 @@
}
},
data: HVaule
+ },
+ {
+ name: '涓婇檺鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'red' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'red' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HMax
+ },
+ {
+ name: '涓嬮檺鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'red' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'red' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HMin
+ },
+ {
+ name: '鏍囧噯鍊�',
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ itemStyle: {
+ normal: {
+ lineStyle: {
+ color: 'green' // 璁剧疆绾挎潯棰滆壊涓虹孩鑹�
+ },
+ color: 'green' // 璁剧疆鎶樼嚎鐐归鑹蹭负绾㈣壊
+ }
+ },
+ data: HStd
}
]
};
@@ -680,6 +624,7 @@
//宸ヨ壓鍙傛暟
form.on('submit(btnHTechParam)', function () {
+ var HEquipNumber = $("#HEquipNumber").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -689,7 +634,7 @@
shift: 2,
area: ['90%', '90%'],
maxmin: true,
- content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html', 'yes'],
+ content: ['../../../views/鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_TechnologyParameterList.html?type=HTechParam&OperationType=2&HEquipNumber=' + HEquipNumber + '', 'yes'],
btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {
--
Gitblit v1.9.1