From e37e050f953f9934896ea9b65f3c063bf4d8d45f Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期二, 17 十二月 2024 16:44:05 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI
---
WebTM/views/质量管理/质量报表/QC_EquipMentCollectionTechParam.html | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 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 d747960..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>
@@ -303,6 +303,7 @@
});
layer.close(index);
}
+
//蹇�熸煡璇�
function get_FastQuery() {
var HEquipNumber = $("#HEquipNumber").val();
@@ -326,6 +327,7 @@
}
}
+
//閲嶇疆蹇�熸煡璇�
function set_ClearQuery() {
$("#HEquipNumber").val("");
@@ -348,6 +350,7 @@
sWhere = "";
}
+
//鍒锋柊
function get_Refresh() {
$("#btnSearch").trigger('click');
@@ -379,6 +382,9 @@
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].鏍囧噯鍊�);
}
}
}
@@ -386,6 +392,8 @@
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: {
@@ -616,6 +624,7 @@
//宸ヨ壓鍙傛暟
form.on('submit(btnHTechParam)', function () {
+ var HEquipNumber = $("#HEquipNumber").val();
//椤甸潰灞�-鑷畾涔�
layer.open({
type: 2,
@@ -625,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