spc报表优化 流转卡增加模穴号 出站单列表行高增大

yangle

2024-07-12 75c6787ba7268c94a86b32e8f5c2f1c5dd3826cb

spc报表优化
流转卡增加模穴号
出站单列表行高增大

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

@@ -379,9 +379,21 @@
                            if (limit > data1.data.length - 3) {
                                layer.msg("取样数量超过实际数量!", { icon: 5 });
                            } else {
                                var data = [];//列字段数据
                                var col = [];
                                var totalArray = [];
                                //给空的数组赋值
                                for (var key in data1.list) {//循序遍历数组
                                    data.push({ "id": data1.list[key].ColmCols, "name": data1.list[key].ColmCols, "Type": data1.list[key].ColmType });//从每个对象中提取数据
                                }
                                for (var i = 0; i < data.length; i++) {//遍历data数组重的数据
                                    col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 120 });
                                }

                                option.cols = [col];
                                option.data = data1.data;
                                optionAVG = data1.data[limit + 1];
                                optionS = data1.data[limit + 2];
                                optionAVG[0] = data1.data[limit + 1];
                                optionS[0] = data1.data[limit + 2];
                                table.render(option);
                                set_Line();
                            }
@@ -409,49 +421,18 @@
                let HAvg = [];//平均值
                let HDifference = [];//差值

                //获取两个月期之间的相差
                var time1 = Date.parse(new Date($("#HBeginDate").val()));//开始时间
                var time2 = Date.parse(new Date($("#HEndDate").val()));//结束时间
                var Days = Math.abs(parseInt((time2 - time1) / 1000 / 3600 / 24));
                //获取年
                var yyyy = new Date($("#HBeginDate").val()).getFullYear();
                //获取月份
                var MM = new Date($("#HBeginDate").val()).getMonth() + 1;
                //获取开始月份的最大天数
                var SumMonth = new Date(yyyy, MM, 0).getDate(); //动态两月之差
                //获取开始日期的天数
                var HBEGINDATE = new Date(new Date($("#HBeginDate").val())).getDate(); //获取开始日期天数

                var k = 0;//收集循环次数
                for (var j = 0; j <= (Days - k); j++) {
                    /* columns.push({ field: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd'), title: Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'MM.dd'), width: 120 })*/
                    if (optionAVG != [] || optionS != []) {
                        HAvg.push(optionAVG[Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')]);
                        HDifference.push(optionS[Format(yyyy + '/' + MM + '/' + (HBEGINDATE + j), 'yyyy-MM-dd')]);
                for (var j = 1; j < option.cols[0].length; j++) {
                    if (optionAVG.length != 0 || optionS.length != 0) {
                        HAvg.push(optionAVG[0][option.cols[0][j].field]);
                        HDifference.push(optionS[0][option.cols[0][j].field]);
                    } else {
                        HAvg.push(0);
                        HDifference.push(0);
                    }
                 
                    //跨年的话 ä¼šä»Žä¸€æœˆä¸€å·å¼€å§‹
                    if (MM == 12 && (HBEGINDATE + j) == 31) {
                        yyyy += 1;
                        MM = 1;
                        SumMonth = new Date(yyyy, MM, 0).getDate();
                        HBEGINDATE = 0;
                        k += j;
                        j = 0;
                    } else if ((HBEGINDATE + j) == SumMonth) { //跨月 æœˆæ•°åŠ ä¸€  å¤©æ•°ä»Žä¸€å¼€å§‹
                        HBEGINDATE = 0;
                        MM += 1;
                        SumMonth = new Date(yyyy, MM, 0).getDate();
                        k += j;
                        j = 0;
                    }
                }

                for (let i = 0; i <= Days; i++) {
                    H_X.push(i + 1);
                for (let i = 1; i < option.cols[0].length; i++) {
                    H_X.push(option.cols[0][i].field);
                }

                option_ZXT_Avg = {
@@ -471,9 +452,9 @@
                    },
                    yAxis: {
                        type: 'value',
                        min: parseInt($("#HTargetVal").val()) + parseInt($("#HDownLimit").val()) - 1, // è®¾ç½®æœ€å°å€¼
                        max: parseInt($("#HTargetVal").val()) + parseInt($("#HUpLimit").val()) + 1, // è®¾ç½®æœ€å¤§å€¼
                        interval: 0.1, // è®¾ç½®é—´è·
                        min: parseFloat($("#HDownLimit").val()) != 0 ? (parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()) * 1.3) : 0, // è®¾ç½®æœ€å°å€¼
                        max: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()) * 1.3, // è®¾ç½®æœ€å¤§å€¼
                        interval: (parseFloat($("#HUpLimit").val()) - parseFloat($("#HDownLimit").val()))/10, // è®¾ç½®é—´è·
                    },
                    series: [
                        {
@@ -498,15 +479,15 @@
                            markLine: {
                                symbol: 'none',//去掉箭头
                                data: [
                                    { yAxis: $("#HUpLimit").val(), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } },
                                    { yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HUpLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 } },
                                    {
                                        yAxis: $("#HDownLimit").val(), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
                                        yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HDownLimit").val()), lineStyle: { color: '#FF1D00' }, label: { color: '#FF1D00', fontSize: 10 }
                                    },
                                    {
                                        yAxis: $("#HControlUpperLimit").val(), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
                                        yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HControlUpperLimit").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
                                    },
                                    {
                                        yAxis: $("#HControlLowerLimit").val(), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
                                        yAxis: parseFloat($("#HTargetVal").val()) + parseFloat($("#HControlLowerLimit").val()), lineStyle: { color: '#2cb615' }, label: { color: '#2cb615', fontSize: 10 }
                                    }
                                ]
                            },

 WebTM/views/³µ¼ä¹ÜÀí/¹¤Ðò³öÕ¾»ã±¨µ¥/Cj_StationOutBillList.html

@@ -587,7 +587,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , height: 'full-50'
                    , height: 700
                    , page: true
                    , totalRow: true
                    , cellMinWidth: 90
@@ -1694,7 +1694,7 @@
                                            col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, templet: "<div>{{d." + data[i].name + " ==null ?'':layui.util.toDateString(d." + data[i].name + ", 'yyyy-MM-dd HH:mm:ss')}}</div>", width: 200 });
                                            break;
                                        default:
                                            if (data[i].name == '数量' || data[i].name == '出站数量' || data[i].name == '报废数量') {
                                            if (data[i].name == '数量' || data[i].name == '出站数量' || data[i].name == '报废数量' || data[i].name == '取样数量') {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200, totalRow: true });
                                            } else {
                                                col.push({ field: data[i].id, title: data[i].name, align: 'center', sort: true, width: 200 });
@@ -1709,7 +1709,7 @@
                                , toolbar: '#toolbarDemo'
                                , cols: [col]
                                , data: data1.data
                                , height: 300
                                , height: 700
                                , page: true
                                , totalRow: true
                                , cellMinWidth: 90

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

@@ -2032,6 +2032,13 @@
                    }
                }

                var HMouldNum = $('#HMouldNum').val();

                if (HMouldNum == "") {
                    layer.msg("模穴号不能为空！");
                    return;
                }



                //删除子表数据时 ä¼šå ç”¨æ•°ç»„的位置,需要重新排一下顺序