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

zrg

2024-07-01 43c633b50bc7dca4d78855e57546fe16e2e44562

 WebTM/views/³µ¼ä¹ÜÀí/±¨±í·ÖÎö/DefectiveDetailedYieldReport.html

@@ -175,6 +175,7 @@
                option = {
                    elem: '#mainTable'
                    , toolbar: '#toolbarDemo'
                    , totalRow: true
                    , cellMinWidth: 120
                    , limit: Number.MAX_VALUE // æ•°æ®è¡¨æ ¼é»˜è®¤å…¨éƒ¨æ˜¾ç¤º
                    , height: 'full-70'
@@ -191,6 +192,7 @@
                    success: function (data1) {
                        var col = [];
                        if (data1.count == 1) {
                            var totalArray = ["工时", "生产订单数量", "计划数量", "进站数量", "出站合格数量", "未进站数量", "出站良率","不合格数量", "不良数量"];
                            var data = [];
                            //给空的数组赋值
                            for (var key in data1.list) {
@@ -202,6 +204,9 @@
                                if (!patrn.test(data[i].name)) {
                                    col.push({ field: data[i].name, title: data[i].name, hide: true }); //隐藏列
                                }
                                else if ($.inArray(data[i].name, totalArray) > -1) {
                                    col.push({ field: data[i].name, title: data[i].name, align: 'center', sort: true, totalRow: true, width: 120 });
                                }
                                else {
                                    switch (data[i].Type) {
                                        case 'DateTime':