Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-LayUI

yxj

2024-12-17 e37e050f953f9934896ea9b65f3c063bf4d8d45f

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/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) {