热处理,干燥机曲线图增加全程追溯报表链接跳转,修复工艺参数其他页面打开时第一次搜索报错

zrg

2024-11-14 31027cccf50b6a87386ee22b7639f8324d633ce9

热处理,干燥机曲线图增加全程追溯报表链接跳转,修复工艺参数其他页面打开时第一次搜索报错

 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 />

 WebTM/views/»ù´¡×ÊÁÏ/¹«Óûù´¡×ÊÁÏ/Gy_TechnologyParameterList.html

@@ -156,6 +156,7 @@
                    HMaterName: HMaterName
                }
                get_Display1(JSON.stringify(sWhere));
                sWhere = "";
            } else {
                get_Display(sWhere);
            }

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/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);
                //调用接口后清空sWhere缓存
                sWhere = "";
            }

            //重置过滤条件
@@ -377,27 +363,29 @@
            }

            //全程追溯报表传入流转卡id  èŽ·å–设备编号
            //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>

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/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 = "";
        }

        //全程追溯报表传入流转卡id  èŽ·å–设备编号
        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>