From d7d73f792b3d752710123e749c9cd84e8221b5a6 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 12 十一月 2024 16:49:27 +0800
Subject: [PATCH] 首巡末 修改 每页显示数量 热处理曲线图 干燥机曲线图 单品过站 产线包装 09项目控制
---
WebTM/views/车间管理/报表分析/Cj_HeatTreatmentTemperatureCurveChart.html | 191 ++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 163 insertions(+), 28 deletions(-)
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 671e4a1..9243070 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"
@@ -33,22 +33,49 @@
</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>
+ <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="HEquipNumber" id="HEquipNumber" value="" style="background-color: #efefef4d;" readonly>
</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-inline">
+ <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="HEquipName" name="HEquipName" id="HEquipName" value="" style="background-color:#efefef4d;width: 75%;display: inline-block;" readonly>
+ <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHEquip" id="btnHEquip" style="padding: 0 10px;float: right;margin-right: 3px;">
+ <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
+ </button>
+ </div>
+ </div>
+ <div class="layui-inline">
+ <label class="layui-form-label" style="width: 85px;">ID鍙�</label>
+ <div class="layui-input-block" style="margin-left: 120px;">
+ <input type="text" class="layui-input" name="HProcExchBillNo" id="HProcExchBillNo" value="">
+ </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">寮�濮嬫棩鏈�</label>
+ <div class="layui-input-block">
+ <input type="date" class="layui-input ForFilteringSchemes" id="HBeginDate" 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="HEndDate" 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>
</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 id="HeatTreatmentTemperatureCurveChart" style="width:99.5%;height:calc(85vh);"></div>
</div>
</form>
</div>
@@ -101,6 +128,16 @@
});
//鏌ヨ鎸夐挳
form.on('submit(btnSearch)', function (data) {
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
+ var HEquipNumber = $("#HEquipNumber").val();
+ if (HEquipNumber == "") {
+ layer.msg("璁惧缂栧彿涓嶈兘涓虹┖");
+ return false;
+ }
+ if (HProcExchBillNo == "") {
+ layer.msg("ID鍙蜂笉鑳戒负绌�");
+ return false;
+ }
get_FastQuery();
});
@@ -111,6 +148,8 @@
//鍒濆鍖栫晫闈�
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();
}
@@ -133,6 +172,8 @@
}
option = data1;
set_Line();
+ ColNameData = [];
+ DateData = [];
} else {
layer.close(wait);
@@ -145,6 +186,44 @@
});
}
+ //璁惧寮圭獥
+ form.on('submit(btnHEquip)', function () {
+ //椤甸潰灞�-鑷畾涔�
+ layer.open({
+ type: 2,
+ skin: 'layui-layer-rim', //鍔犱笂杈规
+ title: '璁惧妗ｆ鍒楄〃',
+ closeBtn: 1,
+ shift: 2,
+ area: ['90%', '90%'],
+ maxmin: true,
+ content: ['../../../views/璁惧绠＄悊/璁惧妗ｆ/Gy_EquipFileMainList.html', 'yes'],
+ btn: ['纭畾', '鍙栨秷']
+ , btn1: function (index, layero) {
+
+ //鎸夐挳銆愭寜閽竴銆戠殑鍥炶皟
+ var iframeWindow = window['layui-layer-iframe' + index] //鑾峰彇寮规椤甸潰
+ var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//鑾峰彇table鐨別lem:"#test"
+ if (checkStatus.data.length === 0) {
+ return layer.msg('璇烽�夋嫨鏁版嵁');
+ }
+ $("#HEquipNumber").val(checkStatus.data[0].璁惧缂栫爜);
+ $("#HEquipName").val(checkStatus.data[0].璁惧鍚嶇О);
+ layer.close(layer.index); //瀹冭幏鍙栫殑濮嬬粓鏄渶鏂板脊鍑虹殑鏌愪釜灞傦紝鍊兼槸鐢眑ayer鍐呴儴鍔ㄦ�侀�掑璁＄畻鐨�
+ }
+ , btn2: function (index, layero) {
+ //鎸夐挳銆愭寜閽簩銆戠殑鍥炶皟
+ //return false 寮�鍚浠ｇ爜鍙姝㈢偣鍑昏鎸夐挳鍏抽棴
+ },
+ end: function () {
+
+ },
+ success: function (layero, index) {
+
+ }
+ });
+ });
+
//鎶樼嚎鍥�
function set_Line() {
//#region銆愭姌绾垮浘銆�
@@ -155,17 +234,52 @@
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]]);
+ if (ColNameData.length == 0) {
+ var ColNameData_s = ["鐢垫祦", "涓婂尯瀹為檯娓╁害", "涓尯瀹為檯娓╁害", "涓嬪尯瀹為檯娓╁害", "璁惧畾娓╁害"];
+ for (var i = 0; i < ColNameData_s.length; i++) {
+ var optionData = [];//鍊兼暟鎹�
+ for (var j = 0; j < DateData.length; j++) {
+ optionData.push(option.data[j][ColNameData_s[i]]);
+ }
+ Data_series.push({
+ name: ColNameData_s[i],
+ type: 'line',
+ label: {
+ show: true,
+ formatter: '{c}'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ //stack: 'Total', //琛ㄧず鎶樼嚎鍫嗗彔
+ data: []
+ })
}
- Data_series.push({
- name: ColNameData[i],
- type: 'line',
- //stack: 'Total', //琛ㄧず鎶樼嚎鍫嗗彔
- data: optionData
- })
+ }
+ else {
+ 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',
+ label: {
+ show: true,
+ formatter: '{c}'
+ },
+ tooltip: {
+ valueFormatter: function (value) {
+ return value;
+ }
+ },
+ //stack: 'Total', //琛ㄧず鎶樼嚎鍫嗗彔
+ data: optionData
+ })
+ }
}
option_Data = {
@@ -175,7 +289,9 @@
left: 'center'
},
legend: {
- data: ColNameData
+ data: (ColNameData.length == 0 ? ["鐢垫祦", "涓婂尯瀹為檯娓╁害", "涓尯瀹為檯娓╁害", "涓嬪尯瀹為檯娓╁害", "璁惧畾娓╁害"] : ColNameData),
+ top: 'bottom', // 灏嗗浘渚嬫斁缃湪鍥捐〃鐨勪笅鏂�
+ left: 'center' // 鎴栬�� 'right'锛屾牴鎹渶瑕佽皟鏁存按骞充綅缃�
},
grid: {
top:"13%",
@@ -193,8 +309,13 @@
},
yAxis: {
type: 'value',
- min: 0,
- max:1000
+ min: function(value) {
+ return value.min;
+ },
+ max:function(value) {
+ return value.max+10;
+ },
+ interval: 30
},
series: Data_series
};
@@ -206,12 +327,26 @@
//蹇�熻繃婊�
function get_FastQuery() {
- var HEquipFileNo = $("#HEquipFileNo").val();
+ var HEquipNumber = $("#HEquipNumber").val();
+ var HEquipName = $("#HEquipName").val();
+ var HBeginDate = $("#HBeginDate").val(); //寮�濮嬫棩鏈�
+ var HEndDate = $("#HEndDate").val();//缁撴潫鏃ユ湡
+ var HProcExchBillNo = $("#HProcExchBillNo").val();
- sWhere = HEquipFileNo;
- get_Display(sWhere);
- //璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
- sWhere = "";
+
+ if (HEquipNumber != "" && HProcExchBillNo != "") {
+ sWhere = {
+ HEquipNumber: HEquipNumber
+ , HBeginDate: HBeginDate
+ , HEndDate: HEndDate
+ , HProcExchBillNo: HProcExchBillNo
+ }
+ get_Display(JSON.stringify(sWhere));
+ sWhere = "";//璋冪敤鎺ュ彛鍚庢竻绌簊Where缂撳瓨
+ } else {
+ set_Line();
+ }
+
}
//閲嶇疆杩囨护鏉′欢
--
Gitblit v1.9.1