From b271390a82f91918dcd588bb4062672395a3ff1f Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期三, 28 八月 2024 11:02:39 +0800
Subject: [PATCH] 单品过站查询遗漏条码 spc报表优化 单品过站查询报表 热处理温度曲线图
---
WebTM/views/质量管理/质量报表/QC_InspectionFormReport.html | 179 +++++++++----
WebTM/views/基础资料/公用基础资料/Gy_CheckItem.html | 27 ++
WebTM/views/IpadIndex.html | 7
WebTM/views/车间管理/报表分析/Cj_HeatTreatmentTemperatureCurveChart.html | 226 +++++++++++++++++
WebTM/views/index.html | 2
WebTM/WebTM.csproj | 3
WebTM/views/车间管理/产线/MES_ProductionLinePackaging.html | 2
WebTM/views/车间管理/单品过站/SingleItemTransitList.html | 294 ++++++++++++++++++++++
8 files changed, 678 insertions(+), 62 deletions(-)
diff --git a/WebTM/WebTM.csproj b/WebTM/WebTM.csproj
index 9537646..0f45871 100644
--- a/WebTM/WebTM.csproj
+++ b/WebTM/WebTM.csproj
@@ -476,7 +476,6 @@
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_ErrManagerLedgerReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_RegistrationForTestingReport.html" />
- <Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_MoistureContentDataLedger.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_QualityStatisticsDailyReport.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\QC_TechnologyParameterClass.html" />
<Content Include="views\璐ㄩ噺绠＄悊\璐ㄩ噺鎶ヨ〃\SB_TechnologyParameterList.html" />
@@ -502,6 +501,7 @@
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_ProcessReportList_Last.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\Sc_StationInBillList.html" />
<Content Include="views\杞﹂棿绠＄悊\浜х嚎\test.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鍗曞搧杩囩珯\SingleItemTransitList.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBill.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Sc_WorkBeginDotCheckBillList.html" />
<Content Include="views\璁惧绠＄悊\璁惧鍋滄満鍗昞Sb_EquipStopBill.html" />
@@ -512,6 +512,7 @@
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBillList_Source.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeArrangement_PG.html" />
<Content Include="views\杞﹂棿绠＄悊\宸ュ簭娴佽浆鍗Sc_ProcessExchangeBill_BatchSplit.html" />
+ <Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_HeatTreatmentTemperatureCurveChart.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Cj_SPCOscillationCurve.html" />
<Content Include="views\杞﹂棿绠＄悊\鎶ヨ〃鍒嗘瀽\Kf_PressurizedWaterNoOutReport.html" />
<Content Include="views\杞﹂棿绠＄悊\鍚姩鐐规鍗昞Gy_WorkBeginDotCheckListBill.html" />
diff --git a/WebTM/views/IpadIndex.html b/WebTM/views/IpadIndex.html
index f4f5488..6b74ae3 100644
--- a/WebTM/views/IpadIndex.html
+++ b/WebTM/views/IpadIndex.html
@@ -1067,6 +1067,10 @@
layer.alert("璇烽�夋嫨宸ュ崟鍒楄〃", { icon: 5 });
return false;
}
+ if (WorkStaus(HSourceID1, workcode, HSourceInterID, "鏂帿灏旀眹鎶�")) {
+ layer.alert("鍗曟嵁鐘舵�佷笉婊¤冻姹囨姤鏉′欢!", { icon: 5 });
+ return false;
+ }
layer.open({
type: 2,
skin: 'layui-layer-rim', //鍔犱笂杈规
@@ -1297,6 +1301,9 @@
case "姹囨姤":
sWhere = " where HSourceID='" + HSourceID1 + "' and HICMOBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
break;
+ case "鏂帿灏旀眹鎶�":
+ sWhere = " where HSourceID='" + HSourceID1 + "' and HSourceBillNo='" + workcode + "' and HInterID='" + HSourceInterID + "' and hicmostatus not in('1','2')"; //鏄惁鏈変笉涓哄紑宸ャ�佸仠宸ユ寕璧风姸鎬�
+ break;
case "鎶ユ鐢宠":
break;
diff --git a/WebTM/views/index.html b/WebTM/views/index.html
index 45725c9..1cddf4a 100644
--- a/WebTM/views/index.html
+++ b/WebTM/views/index.html
@@ -587,6 +587,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_ProdProcessSumReport_DyeColor_third.html">鏌撳巶浜ч噺鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Kf_MateOutSumReport_QiaoYi.html">棰嗘枡缁熻鎶ヨ〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_SPCOscillationCurve.html">SPC闇囪崱鏇茬嚎鍥�</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鎶ヨ〃鍒嗘瀽/Cj_HeatTreatmentTemperatureCurveChart.html">鐑鐞嗘俯搴︽洸绾垮浘</a></dd>
</dl>
</dd>
<dd>
@@ -620,6 +621,7 @@
<dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/Sc_SourceLineRepairBillList.html">杩斾慨璁板綍鍒楄〃</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/RetrospectiveQueryReport.html">璐ㄩ噺杩芥函鏌ヨ</a></dd>
<dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/BadQueryReport.html">閫嗗悜杩芥函鏌ヨ鎶ヨ〃</a></dd>
+ <dd><a lay-href="杞﹂棿绠＄悊/鍗曞搧杩囩珯/SingleItemTransitList.html">鍗曞搧杩囩珯鏌ヨ</a></dd>
</dl>
</dd>
<dd>
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_CheckItem.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_CheckItem.html"
index 6bf1ae3..d7d98c0 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_CheckItem.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_CheckItem.html"
@@ -145,6 +145,7 @@
var option = [];
let that = this;
var HModName = "Gy_CheckItem";
+ var HQCCheckNum = [];
//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
var titleData = ["HItemID","ParentID"];
//tree.render({
@@ -206,6 +207,14 @@
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ var params = getUrlVars();
+ if (typeof (params[params[0]]) == "undefined") {
+ HQCCheckNum = [];//鎿嶄綔绫诲瀷
+ } else if (params[params[0]] == "SPC") {
+ HQCCheckNum = params[params[1]];//鎿嶄綔绫诲瀷
+ }
+
//鍒濆鍖栫晫闈�
set_ClearBill();
//#endregion
@@ -276,7 +285,7 @@
//鍒濆鍖栬〃鏍�
set_InitGrid();
//鏌ヨ
- get_Display(sWhere);
+ get_FastQuery();
get_DefaultModule();
@@ -419,6 +428,10 @@
break;
}
sWhere += " and " + ColName + " " + com;
+ }
+
+ if (HQCCheckNum.length > 0) {
+ sWhere += " and HItemID in (" + HQCCheckNum.toString() + ")";
}
if (HNumber) {
sWhere += " and 浠ｇ爜 like '%" + HNumber + "%'";
@@ -1090,6 +1103,18 @@
}
});
}
+
+ //鑾峰彇鍙傛暟
+ function getUrlVars() {
+ var vars = [], hash;
+ var hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&');
+ for (var i = 0; i < hashes.length; i++) {
+ hash = hashes[i].split('=');
+ vars.push(hash[0]);
+ vars[hash[0]] = hash[1];
+ }
+ return vars;
+ }
//#endregion
</script>
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_InspectionFormReport.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_InspectionFormReport.html"
index 9d30fab..e3a16f3 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_InspectionFormReport.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_InspectionFormReport.html"
@@ -193,6 +193,9 @@
<div id="histogram_Diff" style="width:99.5%;height:calc(100vh);margin-top:15px;">
</div>
+ <div id="histogram_SJZ" style="width:99.5%;height:calc(100vh);margin-top:15px;">
+
+ </div>
</div>
<script type="text/html" id="toolbarDemo">
<div class="layui-btn-container">
@@ -211,7 +214,7 @@
base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
}).extend({
index: 'lib/index', //涓诲叆鍙ｆā鍧�
- }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate', 'soulTable'], function () {
//#region 鍏叡鍙橀噺
var $ = layui.$
@@ -230,6 +233,8 @@
var HModName = "QC_InspectionFormReport";
var optionAVG = [];
var optionS = [];
+ var optionSJZ = [];
+ var HQCCheckNum = [];
//#endregion
//#region 杩涘叆椤甸潰鏃㈠姞杞�
@@ -239,7 +244,7 @@
//#endregion
-
+
//#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
//澶村伐鍏锋爮浜嬩欢
@@ -259,13 +264,14 @@
form.on('submit(btnHMaterID)', function (data) {
btnHMaterID();
});
- //#endregion
+ //#endregion
//#region 妫�楠岄」鐩�
form.on('submit(btnHQCCheckItemID)', function (data) {
+ btnCheckProjectList(2);
btnHQCCheckItemID();
});
- //#endregion
+ //#endregion
//閲嶇疆鎸夐挳
form.on('submit(btnReSearch)', function (data) {
@@ -313,7 +319,7 @@
}
});
});
-
+
//#endregion
//#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
@@ -337,8 +343,8 @@
var columns = [];
//columns.push({ type: 'numbers', title: '搴忓彿' });
- columns.push({ field:"Id", title: "搴忓彿", width: 70 });
-
+ columns.push({ field: "Id", title: "搴忓彿", width: 70 });
+
//鑾峰彇涓や釜鏈堟湡涔嬮棿鐨勭浉宸�
var time1 = Date.parse(new Date($("#HBeginDate").val()));//寮�濮嬫椂闂�
var time2 = Date.parse(new Date($("#HEndDate").val()));//缁撴潫鏃堕棿
@@ -415,14 +421,15 @@
option.cols = [col];
option.data = data1.data;
+ optionSJZ[0] = data1.data[0];
optionAVG[0] = data1.data[limit + 1];
optionS[0] = data1.data[limit + 2];
table.render(option);
- set_Line();
set_PPK();
set_CPK();
+ set_Line();
}
-
+
} else {
layer.close(wait);
layer.alert(data1.Message, { icon: 5 });
@@ -436,7 +443,7 @@
//PPK璁＄畻 x
function set_PPK() {
- var x_AVG =0;
+ var x_AVG = 0;
var x_SUM = 0;
var x_PPK = 0;
var numCount = 0
@@ -455,7 +462,7 @@
for (var j = 0; j < option.data.length - 3; j++) {
numCount += 1;
x_SUM = calc(x_SUM, parseFloat(((parseFloat(option.data[j][option.cols[0][i].field]) - x_AVG) ** 2).toFixed(6)), "+")
-
+
}
}
@@ -483,12 +490,15 @@
}
}
- //CPK璁＄畻 s
+ //CPK璁＄畻 s
function set_CPK() {
var x_AVG = 0;
var s_AVG = 0;
var s_CPK = 0;
var d2 = [1.128, 1.693, 2.059, 2.326, 2.534, 2.704, 2.847, 3.078, 3.173, 3.258, 3.336, 3.407, 3.472, 3.532, 3.588, 3.640, 3.689, 3.735, 3.778, 3.819, 3.858, 3.895, 3.931];
+ var A2 = [0,1.880, 1.023, 0.729, 0.577, 0.483, 0.419, 0.373, 0.337, 0.308];
+ var D3 = [0,0.000, 0.000, 0.000, 0.000, 0.000, 0.076, 0.136, 0.184, 0.223];
+ var D4 = [0,3.267, 2.574, 2.282, 2.114, 2.004, 1.924, 1.864, 1.816, 1.777];
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0 || optionS.length != 0) {
@@ -515,9 +525,17 @@
s_CPK = calc(s_AVG, d2[option.data.length - 4], "/");
+ //鍧囧�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
+ $("#HControlUpperLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "+"))
+ $("#HControlLowerLimit_X").val(calc(x_AVG, calc(A2[$("#limit").val() - 1], s_AVG, "*"), "-"))
+
+ //宸�� 鎺у埗涓婇檺 鎺у埗涓嬮檺
+ $("#HControlUpperLimit_S").val(calc(D4[$("#limit").val() - 1], s_AVG, "*"));
+ $("#HControlLowerLimit_S").val(calc(D3[$("#limit").val() - 1], s_AVG, "*"))
+
//涓婇檺
if ($("#HUpLimit").val() != "" && $("#HDownLimit").val() == "") {
- var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()),"+"), s_AVG, "-"), (3 * s_CPK), "/");
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
$("#HCPK").val(HUpLimit.toFixed(4));
}
//涓嬮檺
@@ -525,7 +543,7 @@
var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
$("#HCPK").val(HDownLimit.toFixed(4));
} else {
- var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), s_AVG, "-"), (3 * s_CPK), "/");
+ var HUpLimit = calc(calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HTargetVal").val()), "+"), x_AVG, "-"), (3 * s_CPK), "/");
var HDownLimit = calc(calc(x_AVG, calc(parseFloat($("#HDownLimit").val()), parseFloat($("#HTargetVal").val()), "+"), "-"), (3 * s_CPK), "/");
if (s_CPK == 0) {
$("#HCPK").val(0);
@@ -540,7 +558,7 @@
var str1, // 杞崲涓哄瓧绗︿覆鐨勬暟瀛�
str2,
ws1 = 0,// ws1锛寃s2 鐢ㄦ潵瀛樺偍浼犲叆鐨刵um鐨勫皬鏁扮偣鍚庣殑鏁板瓧鐨勪綅鏁�
- ws2 = 0,// 璧嬮粯璁ゅ�硷紝瑙ｅ喅褰撴暣鏁板拰灏忔暟杩愮畻鏃跺�嶆暟璁＄畻閿欒瀵艰嚧鐨勭粨鏋滆宸�
+ ws2 = 0,// 璧嬮粯璁ゅ�硷紝瑙ｅ喅褰撴暣鏁板拰灏忔暟杩愮畻鏃跺�嶆暟璁＄畻閿欒瀵艰嚧鐨勭粨鏋滆宸�
bigger,// bigger鍜宻maller鐢ㄤ簬鍔狅紝鍑忥紝闄ゆ硶鎵惧嚭灏忕殑閭ｄ釜鏁板瓧锛岀粰鍚庨潰琛�0锛岃В鍐充綅鏁颁笉瀵逛粠鑰岄�犳垚鐨勮绠楅敊璇殑闂锛涗箻娉曢渶瑕佸皢缁撴灉闄や袱涓暟瀛楃殑鍊嶆暟涔嬪拰
smaller,// 渚嬪锛氬姞鍑忛櫎娉曚腑1.001 + 2.03 锛屽鏋滀笉缁�2.03杩涜琛�0锛屾渶鍚庝細鍙樻垚1001+203锛屾暟瀛楅敊浣嶅鑷寸粨鏋滈敊璇紱涔樻硶涓�1.12*1.1浼氭斁澶т负112*11锛屾墍浠ョ粨鏋滈渶瑕侀櫎浠�1000鎵嶄細鏄纭殑缁撴灉锛�112*11/1000=1.232
zeroCount, // 闇�瑕佽ˉ鍏�0鐨勪釜鏁�
@@ -562,7 +580,7 @@
if (isExistDot2) {
ws2 = str2.split('.')[1].length;
}
- // 濡倃s1 鍜� ws2 鏃犻粯璁ゅ�硷紝濡傛灉num1 鎴� num2 涓嶆槸灏忔暟鐨勮瘽鍒� ws1 鎴� ws2 鐨勫�煎皢涓� undefined
+ // 濡倃s1 鍜� ws2 鏃犻粯璁ゅ�硷紝濡傛灉num1 鎴� num2 涓嶆槸灏忔暟鐨勮瘽鍒� ws1 鎴� ws2 鐨勫�煎皢涓� undefined
// bigger 鍜� smaller 鐨勫�间細鍜岄鏈熶笉绗�
bigger = ws1 > ws2 ? ws1 : ws2;
smaller = ws1 < ws2 ? ws1 : ws2;
@@ -636,14 +654,17 @@
let H_X = [];//x杞存爣棰�
let HAvg = [];//骞冲潎鍊�
let HDifference = [];//宸��
+ let HSJZ = [];//瀹為檯鍊�
for (var j = 1; j < option.cols[0].length; j++) {
if (optionAVG.length != 0 || optionS.length != 0) {
HAvg.push(optionAVG[0][option.cols[0][j].field]);
HDifference.push(optionS[0][option.cols[0][j].field]);
+ HSJZ.push(optionSJZ[0][option.cols[0][j].field]);
} else {
HAvg.push(0);
HDifference.push(0);
+ HSJZ.push(0);
}
}
@@ -655,7 +676,7 @@
title: {
text: '骞冲潎鍊�',
left: 'center'
- },
+ },
grid: {
x: '3%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
//y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
@@ -668,7 +689,7 @@
},
yAxis: {
type: 'value',
- min: parseFloat($("#HDownLimit").val()) != 0 ? calc((parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.3), "*"), "+") : 0, // 璁剧疆鏈�灏忓��
+ min: parseFloat($("#HDownLimit").val()) != 0 ? calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.3, "*"), "+") : 0, // 璁剧疆鏈�灏忓��
max: calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HUpLimit").val()), 1.3, "*"), "+"), // 璁剧疆鏈�澶у��
interval: calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HDownLimit").val()), "-"), 10, "/"), // 璁剧疆闂磋窛
},
@@ -676,21 +697,7 @@
{
data: HAvg,
type: 'line',
- areaStyle: {//濉厖鐨勯鑹�
- color: {//绾挎�ф笎鍙樺墠鍥涗釜鍙傛暟鍒嗗埆鏄� x0, y0, x2, y2, 鑼冨洿浠� 0 - 1锛岀浉褰撲簬鍦ㄥ浘褰㈠寘鍥寸洅涓殑鐧惧垎姣旓紝濡傛灉 globalCoord 涓� `true`锛屽垯璇ュ洓涓�兼槸缁濆鐨勫儚绱犱綅缃�
- type: 'linear',
- x: 0,
- y: 1,
- x2: 0,
- y2: 0,
- colorStops: [{
- offset: 0, color: 'rgba(232,247,247)' // 0% 澶勭殑棰滆壊
- }, {
- offset: 1, color: 'rgba(183,252,252)' // 100% 澶勭殑棰滆壊
- }],
- globalCoord: false// 缂虹渷涓� false
- }
- },
+
itemStyle: { normal: { label: { show: true } } },
markLine: {
symbol: 'none',//鍘绘帀绠ご
@@ -709,7 +716,8 @@
{
yAxis: parseFloat($("#HCenterline_X").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }
}
- ]
+ ],
+ precision: 3
},
}
]
@@ -743,27 +751,13 @@
{
data: HDifference,
type: 'line',
- areaStyle: {//濉厖鐨勯鑹�
- color: {//绾挎�ф笎鍙樺墠鍥涗釜鍙傛暟鍒嗗埆鏄� x0, y0, x2, y2, 鑼冨洿浠� 0 - 1锛岀浉褰撲簬鍦ㄥ浘褰㈠寘鍥寸洅涓殑鐧惧垎姣旓紝濡傛灉 globalCoord 涓� `true`锛屽垯璇ュ洓涓�兼槸缁濆鐨勫儚绱犱綅缃�
- type: 'linear',
- x: 0,
- y: 1,
- x2: 0,
- y2: 0,
- colorStops: [{
- offset: 0, color: 'rgba(255,240,170,0)' // 0% 澶勭殑棰滆壊
- }, {
- offset: 1, color: 'rgba(255,240,170,1)' // 100% 澶勭殑棰滆壊
- }],
- globalCoord: false// 缂虹渷涓� false
- }
- },
+
itemStyle: { normal: { label: { show: true } } },
markLine: {
symbol: 'none',//鍘绘帀绠ご
data: [
{
- yAxis: parseFloat($("#HControlUpperLimit_S").val()) , lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
+ yAxis: parseFloat($("#HControlUpperLimit_S").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
},
{
yAxis: parseFloat($("#HControlLowerLimit_S").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
@@ -772,14 +766,61 @@
{
yAxis: parseFloat($("#HCenterline_S").val()), lineStyle: { color: '#6dadf0' }, label: { color: '#6dadf0', fontSize: 10 }
}
- ]
+ ],
+ precision: 3
},
}
]
};
option_ZXT_Diff && myChart.setOption(option_ZXT_Diff);
- //#endregion
+ //瀹為檯鍊�
+ var chartDom = document.getElementById('histogram_SJZ');
+ var myChart = echarts.init(chartDom);
+ var option_ZXT_SJZ;
+
+ option_ZXT_SJZ = {
+ title: {
+ text: '妫�娴嬪��',
+ left: 'center'
+ },
+ grid: {
+ x: '3%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ bottom: '5%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: H_X
+ },
+ yAxis: {
+ type: 'value',
+ min: parseFloat($("#HDownLimit").val()) != 0 ? calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HDownLimit").val()), 1.3, "*"), "+") : 0, // 璁剧疆鏈�灏忓��
+ max: calc(parseFloat($("#HTargetVal").val()), calc(parseFloat($("#HUpLimit").val()), 1.3, "*"), "+"), // 璁剧疆鏈�澶у��
+ interval: calc(calc(parseFloat($("#HUpLimit").val()), parseFloat($("#HDownLimit").val()), "-"), 10, "/"), // 璁剧疆闂磋窛
+ },
+ series: [
+ {
+ data: HSJZ,
+ type: 'line',
+ itemStyle: { normal: { label: { show: true } } },
+ markLine: {
+ symbol: 'none',//鍘绘帀绠ご
+ data: [
+ { yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } },
+ {
+ yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
+ }
+ ],
+ precision: 3
+ },
+ }
+ ]
+ };
+ option_ZXT_SJZ && myChart.setOption(option_ZXT_SJZ);
+
+ //#endregion
}
@@ -890,7 +931,7 @@
, area: ['90%', '90%']//澶у皬
, title: '妫�楠岄」鐩垪琛�'//鏍囬
, shift: 2//寮瑰嚭鍔ㄧ敾
- , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html', 'yes']
+ , content: ['../../鍩虹璧勬枡/鍏敤鍩虹璧勬枡/Gy_CheckItem.html?Type=SPC&ID=' + HQCCheckNum.toString(), 'yes']
, btn: ['纭畾', '鍙栨秷']
, btn1: function (index, layero) {//鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
@@ -902,8 +943,8 @@
$("#HQCCheckItemID").val(checkStatus.data[0].HItemID);
$("#HQCCheckItemNumber").val(checkStatus.data[0].浠ｇ爜);
- btnCheckProjectList();
-
+ btnCheckProjectList(1);
+
layer.close(index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
}
, btn2: function (index, layero) { }
@@ -911,8 +952,18 @@
}
//妫�楠屾柟妗�
- function btnCheckProjectList() {
- var sWheres = " and 妫�楠岄」鐩唬鐮�='" + $("#HQCCheckItemNumber").val() + "'";
+ function btnCheckProjectList(Type) {
+ HQCCheckNum = [];
+ //Type 1 鏍规嵁閫変腑鐨勬楠岄」鐩幓鏌ヨ鏁版嵁
+ //Type 2 鏍规嵁閫変腑鐨勭墿鏂欏幓鏌ヨ鏁版嵁
+ var sWheres = "";
+ if (Type == 1) {
+ sWheres = " and 妫�楠岄」鐩唬鐮�='" + $("#HQCCheckItemNumber").val() + "'";
+ }
+ if (Type == 2) {
+ sWheres = " and 鐗╂枡浠ｇ爜='" + $("#HMaterNumber").val() + "'";
+ }
+
var wait = layer.load();//閬僵
$.ajax({
url: GetWEBURL() + '/QC_Management/MES_QC_CheckProjectListProjectDetaiList',
@@ -922,9 +973,17 @@
success: function (data1) {
if (data1.count == 1) {
layer.close(wait);
- $("#HUpLimit").val(data1.data[0].涓婇檺鍊�);
- $("#HDownLimit").val(data1.data[0].涓嬮檺鍊�);
- $("#HTargetVal").val(data1.data[0].鐩爣鍊�);
+
+ if (Type == 1) {
+ $("#HUpLimit").val(data1.data[0].涓婇檺鍊�);
+ $("#HDownLimit").val(data1.data[0].涓嬮檺鍊�);
+ $("#HTargetVal").val(data1.data[0].鐩爣鍊�);
+ }
+ if (Type == 2) {
+ for (var i = 0; i < data1.data.length; i++) {
+ HQCCheckNum.push(data1.data[i]["妫�楠岄」鐩甀D"]);
+ }
+ }
//$("#HControlUpperLimit").val(data1.data[0].鎺у埗涓婇檺);
//$("#HControlLowerLimit").val(data1.data[0].鎺у埗涓嬮檺);
} else {
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
index 3a3bd46..328d5cc 100644
--- "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\344\272\247\347\272\277/MES_ProductionLinePackaging.html"
@@ -65,6 +65,8 @@
<option value="1607222-00-B">1607222-00-B</option>
<option value="1943600-00-B">1943600-00-B</option>
<option value="1941600-00-B">1941600-00-B</option>
+ <option value="1941600-00-C">1941600-00-C</option>
+ <option value="1943600-00-C">1943600-00-C</option>
<option value="鍏朵粬" selected>鍏朵粬</option>
</select>
</div>
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/SingleItemTransitList.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/SingleItemTransitList.html"
new file mode 100644
index 0000000..0d8ff78
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\345\215\225\345\223\201\350\277\207\347\253\231/SingleItemTransitList.html"
@@ -0,0 +1,294 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+ <title>鍗曞搧杩囩珯鏌ヨ</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">宸ュ簭娴佽浆鍗″彿</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo">
+ </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 class="layui-colla-content">
+ </div>
+ </div>
+ </div>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div class="layui-tab layui-tab-card" style="margin-top:0px;">
+ <ul class="layui-tab-title">
+ <li class="layui-this">鏉＄爜淇℃伅</li>
+ </ul>
+ <div class="layui-tab-content">
+ <div class="layui-tab-item layui-show ">
+ <!--缂哄皯鐨勬暟鎹�-->
+ <table class="layui-hide" id="mainTable1" lay-filter="mainTable1"></table>
+ </div>
+ </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ //鍏敤鍙橀噺
+ var sWhere = "";
+ var option = [];
+ var option1 = [];
+ var ins; //鐢ㄤ簬瀵煎嚭excel
+ var HModName = "SingleItemTransitList";
+ var HModName1 = "SingleItemTransitList_SN";
+
+ var titleData = ["HMaterID", "HUnitID", "HSourceID", "hmainid", "HProcExchInterID", "HProcID", "HunitID", "HEmpID", "HGroupID", "HProcExchEntryID", "HSubID", "HICMOInterID", "閫夋嫨", "鏌ヨ鏃ユ湡", "鎴愭湰瀵硅薄", "鎴愭湰瀵硅薄鍚嶇О", "HBillStatus", "HBillType", "HPRDORGID"];//涓嶉渶瑕佹樉绀虹殑瀛楁 鍙墿灞�
+
+ //鍒濆鍖栬〃鏍�
+ set_InitGrid();
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+
+ //鐐瑰嚮涓昏〃甯﹀嚭浠庤〃鏁版嵁
+ table.on('row(mainTable)', function (obj) { //娉細tool 鏄伐鍏锋潯浜嬩欢鍚嶏紝test 鏄� table 鍘熷瀹瑰櫒鐨勫睘鎬� lay-filter="瀵瑰簲鐨勫��"
+
+ var datas = obj.data; //鑾峰緱褰撳墠琛屾暟鎹�
+ var HProcExchBillNo = datas.娴佽浆鍗″彿;
+ var HProcName = datas.宸ュ簭;
+
+ SelectTechParam(HProcExchBillNo, HProcName);//宸ヨ壓鍙傛暟
+ });
+
+
+ //鍒濆鍖栬〃鏍�
+ function set_InitGrid() {
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , height: 700
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , cols: []
+ , text: {
+ none: '鏃犳暟鎹紒'
+ }
+ };
+ get_FastQuery();
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HProcExchBillNo").val("");
+ sWhere = "";
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+
+ get_Display(sWhere);
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ }
+
+ //鏌ヨ鏁版嵁
+ function SelectTechParam(HProcExchBillNo, TableName) {
+ var wait = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/SingleItemTransit_SN_List',
+ type: "GET",
+ data: { "sWhere": HProcExchBillNo, "TableName": TableName },
+ async: false,
+ success: function (data1) {
+ if (data1.count == 1) {
+ var totalArray = ["鐢熶骇鏁伴噺", "宸ヤ环", "閲戦", "浠诲姟鏁伴噺", "鏁伴噺", "鍑虹珯鏁伴噺", "鎶ュ簾鏁伴噺", "涓嶈壇鏁伴噺", "宸ユ椂", "娴佽浆鍗℃暟閲�", "浠诲姟鍗曟暟閲�"];
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //col.push({ type: 'checkbox', fixed: 'left' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, "") > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ } else if (data[i].name == '鍗曟嵁鍙�') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, event: '鍗曟嵁鍙�' });
+ }
+ else if ($.inArray(data[i].name, totalArray) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option1 = {
+ elem: '#mainTable1'
+ //, toolbar: '#toolbarDemo1'
+ , cols: [col]
+ , data: data1.data
+ , height: 550
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ }
+ table.render(option1);
+
+ layer.close(wait);
+ //layer.alert("鏌ヨ鎴愬姛", { icon: 1 });
+ } else {
+ layer.close(wait);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鍔犺浇缃戞牸
+ function get_Display(sWhere) {
+ var HProcExchBillNo = $("#HProcExchBillNo").val(); //宸ュ簭娴佽浆鍗″彿
+ //杩涘叆椤甸潰鏄剧ず鐨勭紦瀛樺垪琛�
+ var ajaxLoad = layer.load();
+ $.ajax({
+ url: GetWEBURL() + '/Cj_SingleStation/SingleItemTransitList',
+ type: "GET",
+ async: false,
+ data: { "HProcExchBillNo": HProcExchBillNo, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ var data = [];
+ var col = [];
+ //缁欑┖鐨勬暟缁勮祴鍊�
+ for (var key in data1.list) {
+ data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });
+ }
+ //鍦ㄥ垪琛ㄥ乏杈规坊鍔犲嬀閫夋
+ //col.push({ type: 'checkbox', fixed: 'left', totalRowText: '鍚堣' });
+ for (var i = 0; i < data.length; i++) {
+ // if (data[i].name == 'HInterID' || data[i].name == 'HBillType' || data[i].name == 'hmainid') {
+ if ($.inArray(data[i].name, titleData) > -1) {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', hide: true }); //闅愯棌id鍒�
+ }
+ else {
+ switch (data[i].Type) {
+ //int
+ case 'DateTime':
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
+ break;
+ default:
+ if (data[i].name == '鏁伴噺' || data[i].name == '鍑虹珯鏁伴噺' || data[i].name == '鎶ュ簾鏁伴噺' || data[i].name == '鍙栨牱鏁伴噺' || data[i].name == '宸ユ椂') {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
+ } else {
+ col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
+ }
+ }
+ }
+ }
+
+ //鍔ㄦ�佹樉绀哄垪鍚�
+ option = {
+ elem: '#mainTable'
+ //, toolbar: '#toolbarDemo'
+ , cols: [col]
+ , data: data1.data
+ , height: 700
+ , page: true
+ , totalRow: true
+ , cellMinWidth: 90
+ , limit: 50
+ , limits: [50, 500, 5000, 20000]
+ , done: function (res, curr, count) {
+ soulTable.render(this);
+ }
+ }
+ table.render(option);
+ layer.close(ajaxLoad);
+ } else {
+ layer.close(ajaxLoad);
+ layer.alert(data1.code + data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(ajaxLoad);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ layer.close(ajaxLoad);
+ }
+
+
+ //浠ヤ笂鏄痩ayui妯″潡
+ });
+
+</script>
\ No newline at end of file
diff --git "a/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html" "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
new file mode 100644
index 0000000..671e4a1
--- /dev/null
+++ "b/WebTM/views/\350\275\246\351\227\264\347\256\241\347\220\206/\346\212\245\350\241\250\345\210\206\346\236\220/Cj_HeatTreatmentTemperatureCurveChart.html"
@@ -0,0 +1,226 @@
+锘�<!DOCTYPE html>
+<html>
+<head>
+ <meta charset="utf-8" />
+ <title>鐑鐞嗘俯搴︽洸绾垮浘</title>
+ <meta name="renderer" content="webkit">
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
+ <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+ <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
+ <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
+ <script src="../../../layuiadmin/layui/layui.js"></script>
+ <script src="../../../layuiadmin/Scripts/json2.js"></script>
+ <script src="../../../layuiadmin/Scripts/jquery-1.4.1.js"></script>
+ <script src="../../../layuiadmin/Scripts/webConfig.js"></script>
+ <script src="../../../layuiadmin/zgqCustom/zgqCustom.js"></script>
+ <script src="../../../layuiadmin/PubCustom.js"></script>
+ <script src="../../../layuiadmin/HideButton.js"></script>
+ <script src="../../../layuiadmin/soulTable.slim.js"></script>
+ <script src="../../../layuiadmin/PageTitle.js"></script>
+ <script src='../../../layuiadmin/lib/extend/echarts.min.js'></script>
+</head>
+<body>
+ <div class="layui-fluid">
+ <div class="layui-col-md12">
+ <div class="layui-card" style="padding: 1px">
+ <div class="layui-card-body" style="padding: 1px;">
+ <form class="layui-form" action="" lay-filter="component-form-group">
+ <div class="layui-collapse">
+ <div class="layui-colla-item">
+ <div class="layui-colla-title layui-inline">
+ <div class="layui-inline">
+ <span>鏇村</span>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label">璁惧</label>
+ <div class="layui-input-block">
+ <select name="HEquipFileNo" id="HEquipFileNo" lay-verify="required" lay-search class="layui-input">
+ <!--鍔ㄦ�佹覆鏌撹溅闂�-->
+ </select>
+ </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>
+ <table class="" id="mainTable" lay-filter="mainTable"></table>
+ <div id="HeatTreatmentTemperatureCurveChart" style="width:99.5%;height:calc(100vh);margin-top:5px;"> </div>
+ </div>
+ </form>
+ </div>
+ </div>
+ </div>
+ </div>
+</body>
+</html>
+
+<script>
+ layui.config({
+ base: '../../../layuiadmin/' //闈欐�佽祫婧愭墍鍦ㄨ矾寰�
+ }).extend({
+ index: 'lib/index', //涓诲叆鍙ｆā鍧�
+ }).use(['index', 'form', 'table', 'element', 'laypage', 'laydate','soulTable'], function () {
+
+ //#region 鍏叡鍙橀噺
+ var $ = layui.$
+ , admin = layui.admin
+ , layer = layui.layer
+ , table = layui.table
+ , form = layui.form
+ , element = layui.element
+ , laypage = layui.laypage
+ , laydate = layui.laydate
+ , util = layui.util
+ , soulTable = layui.soulTable
+ //鏌ヨ鏉′欢
+ var sWhere = "";
+ var option = [];
+ var ColNameData = [];//鍒楀悕鏁版嵁
+ var DateData = [];//鏃ユ湡鏁版嵁
+ var HModName = "Cj_HeatTreatmentTemperatureCurveChart";
+ //#endregion
+
+ //#region 杩涘叆椤甸潰鏃㈠姞杞�
+
+ //鍒濆鍖栫晫闈�
+ set_ClearBill();
+
+ //#endregion
+
+
+
+ //#region 鐐瑰嚮浜嬩欢鍖呮嫭on form浜嬩欢绛�
+
+ //閲嶇疆鎸夐挳
+ form.on('submit(btnReSearch)', function (data) {
+ set_ClearQuery();
+ });
+ //鏌ヨ鎸夐挳
+ form.on('submit(btnSearch)', function (data) {
+ get_FastQuery();
+ });
+
+
+ //#endregion
+
+ //#region 姝ら〉闈㈡墍鏈夌殑鏂规硶
+
+ //鍒濆鍖栫晫闈�
+ function set_ClearBill() {
+ get_FastQuery();
+ }
+
+ //鏌ヨ鏁版嵁
+ function get_Display(sWhere) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Cj_NoPassProc/HeatTreatmentTemperatureCurveChart',
+ type: "GET",
+ async: false,
+ data: { "sWhere": sWhere, "user": sessionStorage["HUserName"] },
+ success: function (data1) {
+ if (data1.count == 1) {
+ layer.close(wait);
+ for (var i = 1; i < data1.list.length; i++) {
+ ColNameData.push(data1.list[i]["ColmCols"]);
+ }
+ for (var i = 0; i < data1.data.length; i++) {
+ DateData.push(data1.data[i]["HDate"]);
+ }
+ option = data1;
+ set_Line();
+
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //鎶樼嚎鍥�
+ function set_Line() {
+ //#region銆愭姌绾垮浘銆�
+ //骞冲潎鍊�
+ var chartDom = document.getElementById('HeatTreatmentTemperatureCurveChart');
+ var myChart = echarts.init(chartDom);
+ var option_Data;
+
+ var Data_series = [];
+
+ for (var i = 0; i < ColNameData.length; i++) {
+ var optionData = [];//鍊兼暟鎹�
+ for (var j = 0; j < DateData.length; j++) {
+ optionData.push(option.data[j][ColNameData[i]]);
+ }
+ Data_series.push({
+ name: ColNameData[i],
+ type: 'line',
+ //stack: 'Total', //琛ㄧず鎶樼嚎鍫嗗彔
+ data: optionData
+ })
+ }
+
+ option_Data = {
+ title: {
+ text: '鐑鐞嗘俯搴︽洸绾垮浘',
+ top: '3%',
+ left: 'center'
+ },
+ legend: {
+ data: ColNameData
+ },
+ grid: {
+ top:"13%",
+ x: '3%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
+ //y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
+ //bottom: '5%',
+ containLabel: true
+ },
+ xAxis: {
+ type: 'category',
+ data: DateData,
+ axisLabel: {
+ //interval: 0 // 璁剧疆涓�0浠ユ樉绀烘墍鏈夊潗鏍囩偣
+ }
+ },
+ yAxis: {
+ type: 'value',
+ min: 0,
+ max:1000
+ },
+ series: Data_series
+ };
+ option_Data && myChart.setOption(option_Data);
+
+ //#endregion
+
+ }
+
+ //蹇�熻繃婊�
+ function get_FastQuery() {
+ var HEquipFileNo = $("#HEquipFileNo").val();
+
+ sWhere = HEquipFileNo;
+ get_Display(sWhere);
+ //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ sWhere = "";
+ }
+
+ //閲嶇疆杩囨护鏉′欢
+ function set_ClearQuery() {
+ $("#HEquipFileNo").val("0");
+ form.render()
+ sWhere = "";
+ }
+
+ //#endregion
+ });
+</script>
\ No newline at end of file
--
Gitblit v1.9.1