From 31027cccf50b6a87386ee22b7639f8324d633ce9 Mon Sep 17 00:00:00 2001
From: zrg <z18737863051@163.com>
Date: 星期四, 14 十一月 2024 10:08:04 +0800
Subject: [PATCH] 热处理,干燥机曲线图增加全程追溯报表链接跳转,修复工艺参数其他页面打开时第一次搜索报错
---
WebTM/WebTM.csproj.user | 2
WebTM/views/基础资料/公用基础资料/Gy_TechnologyParameterList.html | 1
WebTM/views/车间管理/报表分析/Cj_TemperatureCurveDryingMachine.html | 43 +++++++++++++
WebTM/views/车间管理/报表分析/Cj_HeatTreatmentTemperatureCurveChart.html | 80 +++++++++++---------------
4 files changed, 77 insertions(+), 49 deletions(-)
diff --git a/WebTM/WebTM.csproj.user b/WebTM/WebTM.csproj.user
index 8233a56..8f1260e 100644
--- a/WebTM/WebTM.csproj.user
+++ b/WebTM/WebTM.csproj.user
@@ -4,7 +4,7 @@
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<NameOfLastUsedPublishProfile>D:\鏅轰簯杩堟�漒MES\MES-WEB-LayUI\WebTM\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
<ProjectView>ProjectFiles</ProjectView>
- <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
+ <LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />
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_TechnologyParameterList.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_TechnologyParameterList.html"
index 05170ed..26636bb 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_TechnologyParameterList.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_TechnologyParameterList.html"
@@ -156,6 +156,7 @@
HMaterName: HMaterName
}
get_Display1(JSON.stringify(sWhere));
+ sWhere = "";
} else {
get_Display(sWhere);
}
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"
index 5c48d04..3eb5502 100644
--- "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"
@@ -70,6 +70,7 @@
<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>
+ <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="Exit" id="btnReSearch" style="padding:0 5px">閫�鍑�</button>
</div>
</div>
</div>
@@ -90,7 +91,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.$
@@ -112,7 +113,7 @@
//#endregion
var params = get_UrlVars();
- var OperationType = params[params[0]] == undefined ? "":params[params[0]];//鎿嶄綔绫诲瀷
+ var OperationType = params[params[0]] == undefined ? "" : params[params[0]];//鎿嶄綔绫诲瀷
var linterid = params[params[1]] == undefined ? "" : params[params[1]];//婧愬崟id
var HSBillType = params[params[2]] == undefined ? "" : params[params[2]];//婧愬崟绫诲瀷
@@ -156,29 +157,23 @@
function set_ClearBill() {
$("#HBeginDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * 30), "yyyy-MM-dd"));
$("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
- get_FastQuery();
- }
-
if (OperationType == 1) {
- //get_HProcHBillNoId(linterid);
+ get_HProcHBillNoId(linterid);
get_FastQuery();
} else {
get_FastQuery();
}
-
}
//鏌ヨ鏁版嵁
- function get_Display(sWhere) {
- var wait = layer.load();//閬僵
+ function get_Display(sWhere) {
$.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);
+ if (data1.count == 1) {
for (var i = 1; i < data1.list.length; i++) {
ColNameData.push(data1.list[i]["ColmCols"]);
}
@@ -190,12 +185,10 @@
ColNameData = [];
DateData = [];
- } else {
- layer.close(wait);
+ } else {
layer.alert(data1.Message, { icon: 5 });
}
}, error: function () {
- layer.close(wait);
layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
}
});
@@ -309,7 +302,7 @@
left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
},
grid: {
- top:"13%",
+ top: "13%",
x: '3%', //鐩稿綋浜庤窛绂诲乏杈规晥鏋�:padding-left
//y: '5%', //鐩稿綋浜庤窛绂讳笂杈规晥鏋�:padding-top
//bottom: '5%',
@@ -324,11 +317,11 @@
},
yAxis: {
type: 'value',
- min: function(value) {
+ min: function (value) {
return value.min;
},
- max:function(value) {
- return value.max+10;
+ max: function (value) {
+ return value.max + 10;
},
interval: 30
},
@@ -336,7 +329,7 @@
};
option_Data && myChart.setOption(option_Data);
- //#endregion
+ //#endregion
}
@@ -348,7 +341,6 @@
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HProcExchBillNo = $("#HProcExchBillNo").val();
-
if (HEquipNumber != "" && HProcExchBillNo != "") {
sWhere = {
HEquipNumber: HEquipNumber
@@ -361,12 +353,6 @@
} else {
set_Line();
}
-
- var HEquipFileNo = $("#HEquipFileNo").val();
- sWhere = HEquipFileNo;
- get_Display(sWhere);
- //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- sWhere = "";
}
//閲嶇疆杩囨护鏉′欢
@@ -377,27 +363,29 @@
}
//鍏ㄧ▼杩芥函鎶ヨ〃浼犲叆娴佽浆鍗d 鑾峰彇璁惧缂栧彿
- //function get_HProcHBillNoId(linterid) {
- // var wait = layer.load();//閬僵
- // $.ajax({
- // url: GetWEBURL() + '/Cj_NoPassProc/GetHProcHBillNoId',
- // type: "GET",
- // async: false,
- // data: { "linterid": linterid, "user": sessionStorage["HUserName"] },
- // success: function (data1) {
- // if (data1.count == 1) {
-
- // } else {
- // layer.close(wait);
- // layer.alert(data1.Message, { icon: 5 });
- // }
- // }, error: function () {
- // layer.close(wait);
- // layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
- // }
- // });
- //}
+ function get_HProcHBillNoId(linterid) {
+ $.ajax({
+ url: GetWEBURL() + '/Cj_NoPassProc/GetHProcHBillNoId',
+ type: "GET",
+ async: false,
+ data: { "linterid": linterid, "num": 1 },
+ success: function (data1) {
+ if (data1.count == 1) {
+ $("#HEquipNumber").val(data1.data[0].璁惧缂栫爜);
+ $("#HEquipName").val(data1.data[0].璁惧鍚嶇О);
+ } else {
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ Pub_Close(1);
+ });
//#endregion
});
</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_TemperatureCurveDryingMachine.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_TemperatureCurveDryingMachine.html"
index 15d2fc9..9591023 100644
--- "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_TemperatureCurveDryingMachine.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_TemperatureCurveDryingMachine.html"
@@ -73,6 +73,7 @@
<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>
+ <button type="button" class="layui-btn layuiadmin-btn-order" lay-submit="" lay-filter="Exit" id="btnReSearch" style="padding:0 5px">閫�鍑�</button>
</div>
</div>
</div>
@@ -114,6 +115,11 @@
var HModName = "Cj_HeatTreatmentTemperatureCurveChart";
//#endregion
+ var params = get_UrlVars();
+ var OperationType = params[params[0]] == undefined ? "" : params[params[0]];//鎿嶄綔绫诲瀷
+ var linterid = params[params[1]] == undefined ? "" : params[params[1]];//婧愬崟id
+ var HSBillType = params[params[2]] == undefined ? "" : params[params[2]];//婧愬崟绫诲瀷
+
//#region 杩涘叆椤甸潰鏃㈠姞杞�
//鍒濆鍖栫晫闈�
@@ -136,8 +142,13 @@
if (HEquipNumber == "") {
layer.msg("璁惧缂栧彿涓嶈兘涓虹┖");
return false;
+ }
+ if (OperationType == 1) {
+ get_HProcHBillNoId(linterid);
+ get_FastQuery();
+ } else {
+ get_FastQuery();
}
- get_FastQuery();
});
@@ -341,7 +352,6 @@
var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
var HProcExchBillNo = $("#HProcExchBillNo").val();
-
if (HEquipNumber != "") {
sWhere = {
HEquipNumber: HEquipNumber
@@ -364,6 +374,35 @@
sWhere = "";
}
+ //鍏ㄧ▼杩芥函鎶ヨ〃浼犲叆娴佽浆鍗d 鑾峰彇璁惧缂栧彿
+ function get_HProcHBillNoId(linterid) {
+ var wait = layer.load();//閬僵
+ $.ajax({
+ url: GetWEBURL() + '/Cj_NoPassProc/GetHProcHBillNoId',
+ type: "GET",
+ async: false,
+ data: { "linterid": linterid, "num": 2},
+ success: function (data1) {
+ if (data1.count == 1) {
+ $("#HEquipNumber").val(data1.data[0].璁惧缂栫爜);
+ $("#HEquipName").val(data1.data[0].璁惧鍚嶇О);
+ } else {
+ layer.close(wait);
+ layer.alert(data1.Message, { icon: 5 });
+ }
+ }, error: function () {
+ layer.close(wait);
+ layer.alert("鎺ュ彛璇锋眰澶辫触!", { icon: 5 });
+ }
+ });
+ }
+
+ //閫�鍑�
+ form.on('submit(Exit)', function (data) {
+ Pub_Close(1);
+ //window.parent.location.reload();
+ });
+
//#endregion
});
</script>
\ No newline at end of file
--
Gitblit v1.9.1