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

yusijie

2026-03-09 43542a9ba09b4103c82c46f088cb7566a69acf58

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

@@ -43,28 +43,26 @@
                                    </div>
                                </div>
                                <div class="layui-inline">
                                    <!--<label class="layui-form-label">生产车间</label>
                                    <label class="layui-form-label">生产车间</label>
                                    <div class="layui-input-block">
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">-->
                                        <select name="HDeptName" id="HDeptName" lay-verify="required" lay-search class="layui-input">
                                    <!--动态渲染车间-->
                                    <!--</select>
                                    </div>-->
                                    </select>
                                    </div>

                                    <label class="layui-form-label" style="width: 85px;">生产车间</label>
                                    <!--<label class="layui-form-label" style="width: 85px;">生产车间</label>
                                    <div class="layui-input-block" style="margin-left: 120px; width: 120px;">
                                        <select name="HDeptName" id="HDeptName" lay-verify="HDeptName">
                                            <option style="color:blue;" value="线包车间">线包车间</option>
                                            <option style="color:blue;" value="同步车间">同步车间</option>
                                            <option style="color:blue;" value="同步车间">同步车间</option>-->
                                            <!--<option style="color:blue;" value="平板车间">平板车间</option>-->
                                        </select>
                                    </div>
                                        <!--</select>
                                    </div>-->
                                </div>
                                <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>
                                <!--<button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="btn-exit" id="btn-exit" style="padding:0 5px">退出</button>
                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HideColumn" id="HideColumn" style="padding:0 5px">隐藏列设置</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>
@@ -133,7 +131,7 @@
                var HProcSumNum = [];//生产总数量
                var HQualifiedNum = [];//合格总数量
                var HFirstPassRate = [];//直通率
                var HTitle = "";//图形标题
                var HTitle = $("#HDeptName").val() + "直通率趋势图";//图形标题
                if (option.data.length > 0) {
                    for (let i = 0; i < option.data.length; i++) {
                        H_X.push(option.data[i].周 + "周");
@@ -141,16 +139,7 @@
                        HFirstPassRate.push(option.data[i].直通率)
                    }                   
                }

                switch ($("#HDeptName").val()) {
                    case '线包车间':
                        HTitle = '线包绕线直通率趋势图';
                        break;
                    case '同步车间':
                        HTitle = '同步电机直通率趋势图';
                        break;
                }

                
                option_ZZT = {
                    title: {
                        text: HTitle,
@@ -291,6 +280,7 @@
                $("#HEndDate").val(Format(new Date(), "yyyy-MM-dd"));
                //初始化表格
                set_InitGrid();
                DeptName();
                //加载数据到网格
                get_FastQuery();
                //DisPlay_HideColumn();
@@ -333,9 +323,9 @@
                            } else {
                                for (var i = 0; i < data.length; i++) {
                                    if (i == 0)
                                        HDeptName += '<option  style="color:blue;"  value="' + data[i].HItemID + '" >' + data[i].HName + '</option>';
                                        HDeptName += '<option  style="color:blue;"  value="' + data[i].HName + '" >' + data[i].HName + '</option>';
                                    else
                                        HDeptName += '<option  style="color:blue;" value="' + data[i].HItemID + '">' + data[i].HName + '</option>';
                                        HDeptName += '<option  style="color:blue;" value="' + data[i].HName + '">' + data[i].HName + '</option>';

                                }
                            }
@@ -352,13 +342,6 @@

            //初始化表格
            function set_InitGrid() {
                //option = {
                //    elem: '#mainTable'
                //    , toolbar: '#toolbarDemo'
                //    , cellMinWidth: 120
                //    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                //    , height: 'full-70'
                //};
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'