1.各工序质量趋势图 增加一个 事业部 选择框 2.设备工艺参数趋势图 在放大镜选择流转卡页面 质量要再搜索条件增加 一个 批次号 ...

zrg

2024-08-30 8a18b5274a7fbd6f0ff1354cca8aab5d3286142b

1.各工序质量趋势图   增加一个  事业部 选择框
2.设备工艺参数趋势图   在放大镜选择流转卡页面   质量要再搜索条件增加  一个  批次号 文本框筛选
3.设备工艺参数趋势分析图   日期改为   开始结束日期

 WebTM/layuiadmin/Scripts/webConfig.js

@@ -1,12 +1,12 @@

function GetWEBURL() {
    //var WEBURL = "http://47.96.97.237/API/";          //智云服务器
    var WEBURL = "http://localhost/API/";             //颜晓军本地配置
   /* var WEBURL = "http://localhost/API/";             //颜晓军本地配置*/
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //杨乐本地配置
    //var WEBURL = "http://localhost:8082/LuBaoAPI/";   //余思杰本地配置
    //var WEBURL = "http://localhost:8088/ARAPI/";      //余思杰本地配置(安瑞)
    //var WEBURL = "http://localhost:8082/API/";        //杜贺本地配置
    //var WEBURL = "http://localhost:8082/API/";        //张瑞广本地配置
    var WEBURL = "http://localhost:8082/API/";        //张瑞广本地配置
    //var WEBURL = "http://localhost:81/API/"           //翁涛涛本地配置
    //var WEBURL = "http://localhost:81/API/";          //王彬本地配置
    //var WEBURL = "http://localhost/API/";             //潘浙游本地配置

 WebTM/views/PublicPage/PowerInformation.html

@@ -347,6 +347,16 @@
                    treeData.push(it)
                }
            })
            // é€’归过滤掉没有子节点的项
            function filterTree(node) {
                if (!node.children || node.children.length === 0) {
                    return null; // è¿‡æ»¤æŽ‰æ²¡æœ‰å­èŠ‚点的项
                }
                node.children = node.children.map(filterTree).filter(n => n !== null);
                return node;
            }
            // å¯¹æ¯ä¸ªæ ¹èŠ‚点应用过滤
            treeData = treeData.map(filterTree).filter(n => n !== null);
            return treeData;
        }


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

@@ -67,9 +67,15 @@
                                        </div>
                                    </div>
                                    <div class="layui-inline">
                                        <label class="layui-form-label">日期</label>
                                        <label class="layui-form-label">开始日期</label>
                                        <div class="layui-input-block">
                                            <input type="date" class="layui-input ForFilteringSchemes" id="HDate" 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="HDate1" 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;">
@@ -273,6 +279,7 @@
            // åˆå§‹åŒ–界面
            function set_ClearBill() {
                $("#HDate").val(Format(new Date, "yyyy-MM-dd"));
                $("#HDate1").val(Format(new Date, "yyyy-MM-dd"));
                set_InitGrid(); //初始化表格
                get_FastQuery();
                ////加载折线图
@@ -380,7 +387,8 @@
                var HEquipName = $("#HEquipName").val();
                var HProcName = $("#HProcName").val();
                var HTechParamName = $("#HTechParamName").val();
                var HDate = $("#HDate").val();
                var HDate = $("#HDate").val(); //开始日期
                var HDate1 = $("#HDate1").val();//结束日期

                var ColName = $("#ColName").val();//复选框
                var Comparator = $("#Comparator").val()
@@ -465,7 +473,10 @@
                    sWhere += " and å·¥è‰ºäº§æ•° = '" + HTechParamName + "'";
                }
                if (HDate) {
                    sWhere += " and CONVERT(date, é‡‡é›†æ—¥æœŸ) = '" + HDate + "'";
                    sWhere += " and CONVERT(date, é‡‡é›†æ—¥æœŸ) >= '" + HDate + "'";
                }
                if (HDate1) {
                    sWhere += " and CONVERT(date, é‡‡é›†æ—¥æœŸ) <= '" + HDate1 + "'";
                }
                if (HEquipNumber != "" || HTechParamName!="") {
                    get_Display(sWhere);

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

@@ -476,15 +476,15 @@
                            },
                            itemStyle: {
                                normal: {
                                    color: '#808080', // ä¿®æ­£ä½ç½®ï¼Œå°†é¢œè‰²è®¾ç½®åœ¨è¿™é‡Œ  
                                    label: {
                                        show: true,        //开启显示                                       
                                        textStyle: {        //数值样式
                                        show: true,
                                        textStyle: {
                                            color: 'black',
                                            fontSize: 16
                                        }
                                    }
                                },
                                color: '#1E90FF' // è®¾ç½®æŸ±çŠ¶å›¾è“è‰²
                                }
                            },
                            data: HBackWorkQty
                        },
@@ -498,25 +498,25 @@
                            tooltip: {
                                valueFormatter: function (value) {
                                    return value;
                                }   
                                }
                            },
                            itemStyle: {
                                normal: {
                                    color: '#FF0000', // ä¿®æ­£ä½ç½®ï¼Œå°†é¢œè‰²è®¾ç½®åœ¨è¿™é‡Œ  
                                    label: {
                                        show: true,        //开启显示                                       
                                        textStyle: {        //数值样式
                                        show: true,
                                        textStyle: {
                                            color: 'black',
                                            fontSize: 16
                                        }
                                    }
                                },
                                color: '#FFFF00' // è®¾ç½®æŸ±çŠ¶å›¾é»„色
                                }
                            },
                            data: HWasterQty_Work
                        },
                        {
                            name: '料废',
                            type: 'bar',                           
                            type: 'bar',
                            stack: 'Ad',
                            emphasis: {
                                focus: 'series'
@@ -528,15 +528,15 @@
                            },
                            itemStyle: {
                                normal: {
                                    color: '#FFFF00', // ä¿®æ­£ä½ç½®ï¼Œå°†é¢œè‰²è®¾ç½®åœ¨è¿™é‡Œ  
                                    label: {
                                        show: true,        //开启显示                                       
                                        textStyle: {        //数值样式
                                        show: true,
                                        textStyle: {
                                            color: 'black',
                                            fontSize: 16
                                        }
                                    }
                                },
                                color: '#FF8C00' // è®¾ç½®æŸ±çŠ¶å›¾æ©™è‰²
                                }
                            },
                            data: HWasterQty_Mater
                        },

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

@@ -478,6 +478,7 @@
                        {
                            name: '合格率',
                            type: 'line',
                            yAxisIndex: 1, // ä½¿ç”¨ç¬¬äºŒä¸ª y è½´
                            label: {
                                show: true,
                                formatter: '{c}%'
@@ -496,10 +497,11 @@
                                }
                            },
                            data: Pass
                        },
                        },                       
                        {
                            name: '目标值',
                            type: 'line',
                            yAxisIndex: 1, // ä½¿ç”¨ç¬¬äºŒä¸ª y è½´
                            label: {
                                show: true,
                                formatter: '{c}%'

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

@@ -61,13 +61,21 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">事业部</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 185px;">
                                        <select name="HDivisionName" id="HDivisionName" class=" ForFilteringSchemes" lay-verify="HDivisionName">
                                            <!--动态渲染组织-->
                                        </select>
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <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="HMaterName" id="HMaterName">
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <label class="layui-form-label" style="width: 85px;">工序名称</label>                                   
                                    <label class="layui-form-label" style="width: 85px;">工序名称</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: 65%; display: inline-block;" readonly>
                                        <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnHProc" id="btnHProc" style="padding: 0 10px;float: right;margin-right: 3px;">
@@ -78,90 +86,7 @@
                                <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-colla-content" style="padding: 0px; margin-left: 6%;">
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName" id="ColName" class="ForFilteringSchemes" lay-filter="ColName" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator" id="Comparator" class="ForFilteringSchemes" lay-filter="Comparator" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input ForFilteringSchemes" value="" name="ColContent" id="ColContent">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName1" id="ColName1" lay-filter="ColName1" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator1" id="Comparator1" lay-filter="Comparator1" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent1" id="ColContent1">
                                        </div>
                                    </div>
                                    <div class="layui-row" style="margin-top:5px">
                                        <div class="layui-inline">
                                            <label class="layui-form-label">过滤</label>
                                            <div class="layui-input-block">
                                                <select name="ColName2" id="ColName2" lay-filter="ColName2" style="width:190px;">
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <select name="Comparator2" id="Comparator2" lay-filter="Comparator2" style="width:190px;">
                                                <option value="0" selected="selected"></option>
                                                <option value="=">=</option>
                                                <option value=">=">>=</option>
                                                <option value=">">></option>
                                                <option value="<="><=</option>
                                                <option value="<"><</option>
                                                <option value="<>"><></option>
                                                <option value="7">包含</option>
                                                <option value="8">左包含</option>
                                                <option value="9">右包含</option>
                                                <option value="10">不包含</option>
                                            </select>
                                        </div>
                                        <div class="layui-inline">
                                            <input type="text" class="layui-input" value="" name="ColContent2" id="ColContent2">
                                        </div>
                                    </div>
                                </div>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btnReSearch" id="btnReSearch" style="padding:0 5px">重置</button>                                
                            </div>
                        </div>
                        <div>
@@ -207,7 +132,7 @@
            var option = [];
            var HModName = "Sc_StationOutBil_HProc";
            //不需要显示的字段 å¯æ‰©å±•
            var titleData = ["å¹´", "月", "工序名称"];
            var titleData = ["å¹´", "月", "工序名称","注塑事业部","物料名称"];


            var ins;                        //用于导出excel
@@ -278,6 +203,7 @@
            // åˆå§‹åŒ–界面
            function set_ClearBill() {
                Year(); //初始化年
                GetGy_Division();//获取事业部
                set_InitGrid(); //初始化表格
                get_FastQuery();
                //加载柱状图
@@ -297,6 +223,7 @@

                };
            }

            //å¹´
            function Year() {
                var yyyy = new Date().getFullYear();
@@ -309,6 +236,32 @@
                $("#HMonth").val(new Date().getMonth() + 1);
                form.render('select');
            }

            //#region èŽ·å–事业部
            function GetGy_Division() {
                //获取事业部
                var HDivisionList = '<option value="" style="color:red;" selected></option>';
                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Gy_Material/Get_Gy_Division",
                    async: false,
                    data: { "HOrgID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            var data = result.data;
                            for (var i = 0; i < data.length; i++) {
                                HDivisionList += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                            }
                            $("#HDivisionName").append(HDivisionList);
                            form.render('select');

                        }
                        layer.closeAll("loading");
                    }
                })
            }
            //#endregion

            //查询
            function get_Display(sWhere) {
                var index = layer.load(0, { shade: false });
@@ -346,35 +299,19 @@
                                    }
                                }
                            }
                            if ($("#HMaterName").val() != "" && $("#HProcName").val() != "") {
                                //动态显示列名
                                option = {
                                    elem: '#mainTable'
                                    , toolbar: '#toolbarDemo'
                                    , cols: [col]
                                    , data: data1.data
                                    , height: 'full-80'
                                    , page: true
                                    , limits: [50, 500, 5000, 50000]
                                    , limit: 50
                                    , cellMinWidth: 90
                                }
                                ins = table.render(option);
                            } else {
                                //动态显示列名
                                option = {
                                    elem: '#mainTable'
                                    , toolbar: '#toolbarDemo'
                                    , cols: [col]
                                    , data: []
                                    , height: 'full-80'
                                    , page: true
                                    , limits: [50, 500, 5000, 50000]
                                    , limit: 50
                                    , cellMinWidth: 90
                                }
                                ins = table.render(option);
                            //动态显示列名
                            option = {
                                elem: '#mainTable'
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 'full-80'
                                , page: true
                                , limits: [50, 500, 5000, 50000]
                                , limit: 50
                                , cellMinWidth: 90
                            }
                            ins = table.render(option);
                           
                            //刷新按钮显示
                            var btns = document.getElementsByTagName("button");     //获取本页所有按钮对象
@@ -400,120 +337,37 @@
                });
                layer.close(index);
            }

            //快速查询
            function get_FastQuery() {
                var HYear = $("#HYear").val();
                var HMonth = $("#HMonth").val();
                var HDivisionName = $("#HDivisionName").val();//事业部
                var HProcName = $("#HProcName").val();
                var HMaterName = $("#HMaterName").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;
                var HMaterName = $("#HMaterName").val();             
                             
                sWhere = {
                    HYear: HYear
                    , HMonth: HMonth
                    , HDivisionName: HDivisionName
                    , HProcName: HProcName
                    , HMaterName: HMaterName
                }
                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 (HYear) {
                    sWhere += " and å¹´ = '" + HYear + "'";
                }
                if (HMonth) {
                    sWhere += " and æœˆ = '" + HMonth + "'";
                }
                if (HProcName) {
                    sWhere += " and å·¥åºåç§° like '%" + HProcName + "%'";
                }
                if (HMaterName) {
                    sWhere += " and ç‰©æ–™åç§° like '%" + HMaterName + "%'";
                }
                get_Display(sWhere);
                get_Display(JSON.stringify(sWhere));
                //加载柱状图
                set_Graphics();
                sWhere = "";//调用接口后清空sWhere缓存

            }

            //重置快速查询
            function set_ClearQuery() {
                $("#HYear").val(new Date().getFullYear());
                $("#HMonth").val(new Date().getMonth() + 1);
                $("#HProcName").val("");
                $("#HMaterName").val("");
                $("#btnSearch").click();
                $("#ColContent").val("");
                $("#ColName").val("0");
                $("#Comparator").val("0");
                $("#ColContent2").val("");
                $("#ColName2").val("0");
                $("#Comparator2").val("0");
                $("#ColContent1").val("");
                $("#ColName1").val("0");
                $("#Comparator1").val("0");
                $("#HDivisionName").val("");
                $("#btnSearch").click();               
                form.render('select');

                sWhere = "";

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -124,6 +124,12 @@
                                                </select>
                                            </div>
                                        </div>
                                        <div class="layui-inline">
                                            <label class="layui-form-label">批次号</label>
                                            <div class="layui-input-block">
                                                <input type="text" class="layui-input ForFilteringSchemes" name="HBatchNo" id="HBatchNo">
                                            </div>
                                        </div>
                                    </div>

                                    <div class="layui-row" style="margin-top: 10px; margin-bottom: 10px ">
@@ -656,6 +662,7 @@
                $("#HDate").val(Format(new Date(new Date() - 1000 * 60 * 60 * 24 * HInitTimeCycle), "yyyy-MM-dd")); //开始日期
                $("#HDate1").val(Format(new Date(), "yyyy-MM-dd"));  //结束日期
                $("#HProject").val("");//项目号
                $("#HBatchNo").val("");//批次号
                $("#HOrderProcNO").val("");//订单跟踪号
                $("#SHname").val("");//物料|子件名称|子件规格
                $("#HBillNo").val("");//单据号
@@ -699,6 +706,7 @@
                var Comparator2 = $("#Comparator2").val()
                var ColContent2 = $("#ColContent2").val();
                var HDeptName = $("#HDeptName").val();//车间
                var HBatchNo = $("#HBatchNo").val();//批次号

                if (ColName != 0 && Comparator != 0) {
                    var com = "";
@@ -805,6 +813,9 @@
                if (HErpID) {
                    sWhere += " and å”¯ä¸€ID like '%" + HErpID + "%'";
                }
                if (HBatchNo) {
                    sWhere += " and æ‰¹æ¬¡å· like '%" + HBatchNo + "%'";
                }
                if (number==2) {
                    if (HProject) {
                        sWhere += " and é¡¹ç›®å· like '%" + HProject + "%'";