质量报表增加过滤条件

zrg

2024-10-15 527e5517eb5b42434fe09eb354355081eddd1673

质量报表增加过滤条件

 WebTM/WebTM.csproj.user

@@ -3,7 +3,7 @@
  <PropertyGroup>
    <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_WorkCenter.html

@@ -684,6 +684,7 @@
                if (HOrgID) {
                    sWhere += " and HUSEORGID = '" + HOrgID + "'";
                }
                sWhere += " and ç¦ç”¨æ ‡è®° != 'Y'";
                get_Display(sWhere);
                sWhere = "";//调用接口后清空sWhere缓存
            }

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/Í깤/Sc_Add_MESEndStepWorkBillList.html

@@ -868,7 +868,7 @@
            //退出
            form.on('submit(Exit)', function (data) {
                Pub_Close(1);
                window.parent.location.reload();
                //window.parent.location.reload();
            });

            //#endregion

 WebTM/views/Éú²ú¹ÜÀí/±¨¹¤Ì¨¹¤Ðò/¿ª¹¤/Sc_SwipeCardStart.html

@@ -207,7 +207,7 @@
                        if (result.code == "2") {
                            layer.close(index);
                            layer.msg(result.Message, { time: 1 * 3000, icon: 5 }, function (index) {
                                parent.GetSwipeCardStart({ "data": 0 });
                                parent.GetSwipeCardStart({ "data": 0, "HName": "" });
                                setTimeout(function () {
                                    var index2 = parent.layer.getFrameIndex(window.name);
                                    parent.layer.close(index2);
@@ -246,7 +246,7 @@

                        if (result.code == "1") {
                            layer.msg("匹配!", { time: 1 * 1000, icon: 1 }, function (index) {
                                parent.GetSwipeCardStart({ "data": 1 });
                                parent.GetSwipeCardStart({ "data": 1, "HName": $("#HEmpName").val() });
                                setTimeout(function () {
                                    var index2 = parent.layer.getFrameIndex(window.name);
                                    parent.layer.close(index2);
@@ -254,7 +254,7 @@
                            })
                        } else {
                            layer.msg(result.Message, { time: 1 * 3000, icon: 5 }, function (index) {
                                parent.GetSwipeCardStart({ "data": 0 });
                                parent.GetSwipeCardStart({ "data": 0, "HName": $("#HEmpName").val() });
                                setTimeout(function () {
                                    var index2 = parent.layer.getFrameIndex(window.name);
                                    parent.layer.close(index2);

 WebTM/views/Éú²ú¹ÜÀí/Éú²ú¿ª¹¤µ¥/Sc_Add_MESBeginWorkBillList.html

@@ -679,7 +679,7 @@
            });

            //审核提交
            function SaveVerify()
            function SaveVerify(HName)
            {
                var InterID = $("#HInterID").val();
                if (!AllowLoadData())//数据验证
@@ -690,7 +690,7 @@
                    type: "GET",
                    url: GetWEBURL() + "/Sc_MESBeginWorkBill/AuditProcessReportList", //方法所在页面和方法名
                    async: true,
                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": sessionStorage["HUserName"] },
                    data: { "HInterID": InterID, "IsAudit": 0, "CurUserName": HName },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
@@ -1268,6 +1268,7 @@
                                    end: function () {
                                        if (OptionData.length > 0) {
                                            if (OptionData[0]["data"] == "1") {
                                                data2.field["HMaker"] = OptionData[0]["HName"];
                                                save(data2);
                                            } else if (OptionData[0]["data"] == "0") {
                                                layer.msg("因为技能不匹配,无法保存!")
@@ -1304,7 +1305,8 @@
                    num.push(table.cache["mainTable"][i])
                }
            }

            //更新审核人为刷卡人
            var HName = data.field["HMaker"];
            //子表数据序列化
            var sSubStr = JSON.stringify(num);
            var sMainStr = JSON.stringify(data.field);
@@ -1328,7 +1330,7 @@
                            if (data.Verify == "Y") //自动审核
                            {
                                layer.close(index);
                                SaveVerify(); //审核
                                SaveVerify(HName); //审核
                            }
                            else {
                                layer.close(index);

 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>
@@ -379,6 +379,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].标准值);
                        }
                    }
                }

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_FiveMenOneRingList.html

@@ -168,7 +168,7 @@
            //
            var HModName = "QC_FiveMenOneRingList";
            //不需要显示的字段 å¯æ‰©å±• ï¼ˆäººï¼‰
            var titleData = ["流转卡id", "生产订单", "物料代码", "规格型号", "单据主id","物料id","生产资源id","职员id","模具id"];
            var titleData = ["流转卡id", "生产订单", "物料代码", "规格型号", "单据主id","物料id","生产资源id","职员id","模具id","设备id"];
            //初始化界面
            set_ClearBill();
            //#endregion
@@ -230,79 +230,6 @@
                var HMaterModel = $("#HMaterModel").val();//规格型号
                var HProcExchBillNo = $("#HProcExchBillNo").val();//主流转卡号
                var HICMOBillNo = $("#HICMOBillNo").val();//生产订单号
                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
                var ColContent = $("#ColContent").val();
                var ColName1 = $("#ColName1").val();//复选框
                var Comparator1 = $("#Comparator1").val()
                var ColContent1 = $("#ColContent1").val();
                var ColName2 = $("#ColName2").val();//复选框
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
                    switch (Comparator) {
                        case "7":
                            com = "like'%" + ColContent + "%'";
                            break;
                        case "8":
                            com = "like'%" + ColContent + "'";
                            break;
                        case "9":
                            com = "like'" + ColContent + "%'";
                            break;
                        case "10":
                            com = "not like'%" + ColContent + "%'";
                            break;
                        default:
                            com = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName + " " + com;
                }
                if (ColName1 != 0 && Comparator1 != 0) {
                    var com1 = "";
                    switch (Comparator1) {
                        case "7":
                            com1 = "like'%" + ColContent1 + "%'";
                            break;
                        case "8":
                            com1 = "like'%" + ColContent1 + "'";
                            break;
                        case "9":
                            com1 = "like'" + ColContent1 + "%'";
                            break;
                        case "10":
                            com1 = "not like'%" + ColContent1 + "%'";
                            break;
                        default:
                            com1 = "" + Comparator1 + "'" + ColContent1 + "'";
                            break;
                    }
                    sWhere += " and " + ColName1 + " " + com1;
                }
                if (ColName2 != 0 && Comparator2 != 0) {
                    var com2 = "";
                    switch (Comparator2) {
                        case "7":
                            com2 = "like'%" + ColContent2 + "%'";
                            break;
                        case "8":
                            com2 = "like'%" + ColContent2 + "'";
                            break;
                        case "9":
                            com2 = "like'" + ColContent2 + "%'";
                            break;
                        case "10":
                            com2 = "not like'%" + ColContent2 + "%'";
                            break;
                        default:
                            com2 = "" + Comparator + "'" + ColContent + "'";
                            break;
                    }
                    sWhere += " and " + ColName2 + " " + com2;
                }

                
                //if (SN) {
@@ -375,12 +302,10 @@
                option_Man = {
                    elem: '#mainTable_Man'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                    , data: []
                };                
@@ -391,12 +316,10 @@
                option_Machine = {
                    elem: '#mainTable_Machine'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                    , data: []
                };
@@ -407,12 +330,10 @@
                option_Material = {
                    elem: '#mainTable_Material'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                    , data: []
                };
@@ -423,12 +344,10 @@
                option_Method = {
                    elem: '#mainTable_Method'
                    , toolbar: '#toolbarDemo'
                    , page: true
                    , totalRow: true
                    , height: 600
                    , cellMinWidth: 90
                    , limit: 50
                    , limits: [50, 500, 5000, 20000]
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                    , data: []
                };
@@ -438,10 +357,8 @@
            function set_InitGrid_Environments() {
                option_Environments = {
                    elem: '#mainTable_Environments'
                    , page: false
                    , height: 600
                    , totalRow: true
                    , cellMinWidth: 90
                    , limit: Number.MAX_VALUE//默认显示全部
                    , cols: []
                    , data: []
@@ -487,17 +404,10 @@
                                    if ($.inArray(data[j].name, titleData) > -1) {
                                        col.push({ field: data[j].id, title: data[j].name, align: 'center', hide: true }); //隐藏id列
                                    }
                                    else if (data[j].name == '配件流转卡') {//添加超链接
                                    else if (data[j].name == '流转卡') {//添加超链接
                                        col.push({
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '配件流转卡', templet: function (d) {
                                                return '<span style="color: blue;">' + d.配件流转卡 + '</span>'
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
                                    else if (data[j].name == '主流转卡') {//添加超链接
                                        col.push({
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '主流转卡', templet: function (d) {
                                                return '<span style="color: blue;">' + d.主流转卡 + '</span>'
                                            field: data[j].id, title: data[j].name, align: 'center', sort: true, width: 200, event: '流转卡', templet: function (d) {
                                                return '<span style="color: blue;">' + d.流转卡 + '</span>'
                                            }, style: 'cursor: pointer;'
                                        });
                                    }
@@ -587,11 +497,11 @@
                            }
                            table.render(option_Measure);
                                                 
                            $("#HMaterNumber").val(data1.data.h_p_QC_FiveMenOneRingList[0].成品物料代码);
                            $("#HMaterName").val(data1.data.h_p_QC_FiveMenOneRingList[0].成品物料);
                            $("#HMaterModel").val(data1.data.h_p_QC_FiveMenOneRingList[0].成品规格型号);
                            $("#HProcExchBillNo").val(data1.data.h_p_QC_FiveMenOneRingList[0].主流转卡);
                            $("#HICMOBillNo").val(data1.data.h_p_QC_FiveMenOneRingList[0].主生产订单);
                            $("#HMaterNumber").val(data1.data.h_p_QC_FiveMenOneRingList[0].物料代码);
                            $("#HMaterName").val(data1.data.h_p_QC_FiveMenOneRingList[0].物料名称);
                            $("#HMaterModel").val(data1.data.h_p_QC_FiveMenOneRingList[0].规格型号);
                            $("#HProcExchBillNo").val(data1.data.h_p_QC_FiveMenOneRingList[0].流转卡);
                            $("#HICMOBillNo").val(data1.data.h_p_QC_FiveMenOneRingList[0].生产订单);

                            layer.close(ajaxLoad);
                           
@@ -687,6 +597,8 @@
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , limit: Number.MAX_VALUE//默认显示全部
                                ,page: false
                            }
                            table.render(option_Man);
                            //机
@@ -697,6 +609,8 @@
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query1
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , limit: Number.MAX_VALUE//默认显示全部
                                , page: false
                            }
                            table.render(option_Machine);
                            //料
@@ -707,6 +621,8 @@
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query2
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , limit: Number.MAX_VALUE//默认显示全部
                                , page: false
                            }
                            table.render(option_Material);
                            //法
@@ -717,6 +633,7 @@
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query3
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , page: false
                            }
                            table.render(option_Method);
                            //环
@@ -727,6 +644,7 @@
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query4
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , page: false
                            }
                            table.render(option_Environments);
                            //测
@@ -737,6 +655,7 @@
                                , data: data1.data.h_p_QC_FiveMenOneRingList_Query5
                                , height: 'full-80'
                                , cellMinWidth: 90
                                , page: false
                            }
                            table.render(option_Measure);
                            layer.close(ajaxLoad);
@@ -1076,6 +995,133 @@
                }
            });

            //测
            table.on('tool(mainTable_Measure)', function (obj) {
                var data = obj.data;
                if (obj.event == '单据号') {
                    var linterid = data.单据主id;
                    if (data.单据类型 =="首件检验单") {
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看首件检验单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../首件检验单/QC_Add_Edit_FirstPieceCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }
                    else if (data.单据类型 == "巡检检验单") {
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看巡检记录单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../巡检记录单/QC_Add_Edit_PatrolProcCheckOtherill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }
                    else if (data.单据类型 == "末检检验单") {
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看末检检验单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../工序检验单/QC_ProcessCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }
                    else if (data.单据类型 == "车间自检单") {
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看车间自检单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../车间自检单/QC_Add_Edit_WorkSelfCheckBill.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }
                    else if (data.单据类型 == "生产质量汇报单") {
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看生产质量汇报单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../../生产管理/报工台工序/不良采集/Sc_QualityReportStepBill_New.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }
                    else if (data.单据类型 == "不良品处理单") {
                        layer.open({
                            type: 2
                            , area: ['100%', '100%']
                            , title: '查看不良品处理单'
                            , closeBtn: 1
                            , shade: 0.6 //遮罩透明度
                            , maxmin: true //允许全屏最小化
                            , anim: 0 //0-6的动画形式，-1不开启
                            , content: '../生产工序管理/增加不良评审单/QC_NoPassProdDisposeBillMain.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                            , resize: false,
                            end: function () {
                            }
                            , cancel: function () {
                            }
                        })
                    }                   
                } else if (obj.event == '职员') {
                    var linterid = data.职员id;
                    layer.open({
                        type: 2
                        , area: ['100%', '100%']
                        , title: '查看职员档案'
                        , closeBtn: 1
                        , shade: 0.6 //遮罩透明度
                        , maxmin: true //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: '../../基础资料/公用基础资料/Gy_Employee_Add_Edit_.html?OperationType=3&linterid=' + linterid + '&HSouceBillType=0'
                        , resize: false,
                        end: function () {
                        }
                        , cancel: function () {
                        }
                    })
                }
            });

            //#endregion     
           
            //#region éšè—åˆ—设置

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ProcessPerformanceFirstPass.html

@@ -63,9 +63,12 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料编码</label>
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料编码</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -174,6 +177,12 @@
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });

            //#region äº§å“ç¼–码
            form.on('submit(btnHMaterID)', function (data) {
                btnHMaterID();
            });
            //#endregion
            //#endregion

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
@@ -933,6 +942,32 @@
            }
            //#endregion

            //物料列表
            function btnHMaterID() {
                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , area: ['90%', '90%']//大小
                    , title: '物料列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Material.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);
                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }


            //以上是layui模块
        });
    </script>

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_ProcessPerformancePass.html

@@ -63,9 +63,12 @@
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>
                                <div class="layui-row" style="margin-top:5px;margin-left:82px;margin-bottom:5px;">
                                    <div class="layui-inline">
                                        <label class="layui-form-label" style="width: 85px;">物料编码</label>
                                        <label class="layui-form-label" style="width: 85px;padding: 9px 18px;">物料编码</label>
                                        <div class="layui-input-block" style="margin-left: 120px;">
                                            <input type="text" class="layui-input ForFilteringSchemes" name="HMaterNumber" id="HMaterNumber">
                                            <input type="text" class="layui-input" name="HMaterNumber" id="HMaterNumber" style="background-color:#efefef4d;width: 60%;display: inline-block;" readonly>
                                            <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHMaterID" id="btnHMaterID" style="padding: 0 10px; margin-right: 3px;">
                                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>
                                            </button>
                                        </div>
                                    </div>
                                    <div class="layui-inline">
@@ -174,6 +177,12 @@
            form.on('submit(btnReSearch)', function (data) {
                set_ClearQuery();
            });

            //#region äº§å“ç¼–码
            form.on('submit(btnHMaterID)', function (data) {
                btnHMaterID();
            });
            //#endregion
            //#endregion

            //#region ç‚¹å‡»è¡Œé€‰ä¸­é«˜äº®
@@ -459,7 +468,7 @@
                                }
                            },
                            itemStyle: {
                                color: '#33CCFF' // è®¾ç½®æŸ±çŠ¶å›¾è“è‰²
                                color: '#FF0000' // è®¾ç½®æŸ±çŠ¶å›¾çº¢è‰²
                            },
                            data: HBackCount
                        },
@@ -752,6 +761,31 @@
            }
            //#endregion

            //物料列表
            function btnHMaterID() {
                layer.open({
                    type: 2 //类型
                    , skin: 'layui-layer-rim'//加上边框
                    , area: ['90%', '90%']//大小
                    , title: '物料列表'//标题
                    , shift: 2//弹出动画
                    , content: ['../../基础资料/公用基础资料/Gy_Material.html', 'yes']
                    , btn: ['确定', '取消']
                    , btn1: function (index, layero) {//按钮【按钮一】的回调
                        var iframeWindow = window['layui-layer-iframe' + index]  //获取弹框页面
                        var checkStatus = iframeWindow.layui.table.checkStatus('mainTable');//获取table的elem:"#test"
                        if (checkStatus.data.length === 0) {
                            return layer.msg('请选择数据');
                        }
                        //获取数据
                        $("#HMaterNumber").val(checkStatus.data[0].物料代码);
                        $("#HMaterName").val(checkStatus.data[0].物料名称);
                        layer.close(index); //它获取的始终是最新弹出的某个层，值是由layer内部动态递增计算的
                    }
                    , btn2: function (index, layero) { }
                })
            }

            //以上是layui模块
        });
    </script>

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/QC_QualityMonthSumReport.html

@@ -733,7 +733,7 @@
                        }
                    },
                    legend: {
                        data: ['质量门逃逸率', '上限值'],
                        data: ['质量门逃逸率', '目标上限值'],
                        top: 'bottom',  // å°†å›¾ä¾‹æ”¾ç½®åœ¨å›¾è¡¨çš„下方
                        left: 'center'  // æˆ–者 'right'，根据需要调整水平位置
                    },
@@ -802,15 +802,15 @@
                            itemStyle: {
                                normal: {
                                    lineStyle: {
                                        color: '#8E8E8E' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç°è‰²
                                        color: '#1E90FF' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºè“è‰²
                                    },
                                    color: '#8E8E8E' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºç°è‰²
                                    color: '#1E90FF' // è®¾ç½®çº¿æ¡é¢œè‰²ä¸ºè“è‰²
                                }
                            },
                            data: HAverage
                        },
                        {
                            name: '上限值',
                            name: '目标上限值',
                            type: 'line',
                            barWidth: 10,
                            barGap: 0,

 WebTM/views/ÖÊÁ¿¹ÜÀí/ÖÊÁ¿±¨±í/Sc_StationOutBil_HProc.html

@@ -525,7 +525,12 @@
                var FistPass = [];//一次合格
                var HProcTarGetVal = [];//各工序目标值
                var Pass = [];//合格
                var HTitle = "各工序趋势图";//图形标题
                var HTitle = "";//图形标题
                if ($("#HProcName").val() == "") {
                    HTitle = "各工序趋势图";
                } else {
                    HTitle = $("#HProcName").val() + "趋势图";
                }
                if (option.data.length > 0) {                 
                    for (let i = 0; i < option.data.length; i++) {
                        H_X.push(option.data[i].日期);