李士越 1 год назад
Родитель
Сommit
36970b9f78
1 измененных файлов с 637 добавлено и 138 удалено
  1. 637 138
      wwwroot/main/Procedure/test14/demo.html

+ 637 - 138
wwwroot/main/Procedure/test14/demo.html

@@ -10,8 +10,20 @@
     <script src="/Plugins/jquery-3.4.1/jquery-3.4.1.min.js"></script>
     <script src="/Plugins/animate/xanimate.js"></script>
     <script src="/Plugins/xrequest/xrequest.min.js"></script>
-    <title>东科软件</title> 
+    <title>东科软件</title>
+    <style>
+        .container {
+            display: flex;
+            flex-direction: column; /* 设置子元素竖排排列 */
+            width: 500px;
+        }
+
+        .containerson {
+            height: 500px;
+        }
+    </style>
 </head>
+
 <body style="background-color:black;">
 
     <div class="box_1920_1080">
@@ -24,7 +36,8 @@
 
             <!--注浆数据表格-->
             <div style="width:1840px;height:680px;display:flex;flex-direction:row;">
-                <div style="width: 48%; height: 680px;">
+                <!--施釉设备重要数据-->
+                <!--<div style="width: 48%; height: 680px;">
                     <table cellspacing="0" cellpadding="0" border="0" style="width: 99.8%;">
                         <tr class="tr_title_warning">
                             <td colspan="10" style="color: white;">施釉设备重要数据</td>
@@ -62,36 +75,63 @@
                         <table id="dayTable" style="width: 100%; ">
                         </table>
                     </div>
+                </div>-->
+                <div class="container">
+                    <div class="containerson">
+                        <div style="color:white;font-size:20px;font-weight:600; text-align:center">施釉每日成品合格率</div>
+                        <canvas id="canvasDayZLA" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                    </div>
+                    <div class="containerson">
+                        <div style="color:white;font-size:20px;font-weight:600; text-align:center">施釉每月成品合格率</div>
+                        <canvas id="canvasDayZLB" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                    </div>
+                    <div class="containerson">
+                        <div style="color:white;font-size:20px;font-weight:600; text-align:center">施釉每日成品冷补缺陷率</div>
+                        <canvas id="canvasDayZLC" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                    </div>
+                    <div class="containerson">
+                        <div style="color:white;font-size:20px;font-weight:600; text-align:center">施釉每日半成品损坯率</div>
+                        <canvas id="canvasDayZL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                    </div>
                 </div>
-
-                <div style="width: 48%; height: 340px; position: absolute; right: 40px; ">
+                <div style="width: 70%; height: 340px; position: absolute; right: 40px; ">
                     <div class="d-flex justify-content-center">
                         <div style="color:white;font-size:20px;font-weight:600; text-align:center">施釉线24小时产量</div>
                         <canvas id="canvasHourCL" style="-moz-user-select: none;-webkit-user-select: none;-ms-user-select: none; height:340px;width:100%"></canvas>
                     </div>
                 </div>
-                <div style="width: 20%; height: 340px; margin-top:365px;margin-left:35px;">
+                <div style="width: 30%; height: 340px; margin-top:365px;margin-left:200px;">
                     <div style="color:white;font-size:20px;font-weight:600; text-align:center">施釉工号产量</div>
                     <canvas id="canvasDayCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 280px; width: 100%;margin-top:-38px;"></canvas>
                 </div>
-                <div style="width: 28%; height: 380px; right: 40px; margin-top: 365px; ">
+                <div style="width: 30%; height: 380px; right: 40px; margin-top: 365px; ">
                     <div style="color:white;font-size:20px;font-weight:600; text-align:center">施釉七日产量</div>
                     <canvas id="canvasDayCC" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 280px; width: 100%;margin-top:-38px;"></canvas>
                 </div>
             </div>
-             
 
-             
+
+
             <!--缺陷统计-->
-            <div style="width:1840px;height:230px;display:flex;flex-direction:row;">
-                <div style="width: 25%; height: 230px;">
+            <div style="max-width: 1340px; height: 230px; display: flex; flex-direction: row; margin-left: auto; ">
+                <!--<div style="width: 25%; height: 230px;">
                     <div style="color:white;font-size:20px;font-weight:600; text-align:center">施釉质量七日趋势图</div>
                     <canvas id="canvasDayZL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
-                </div>
+                </div>-->
                 <div style="width: 25%; height: 230px;">
                     <div style="color:white;font-size:20px;font-weight:600; text-align:center">归属施釉缺陷(今日TOP3)</div>
                     <canvas id="canvasDefectA" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
-                </div> 
+                </div>
+                <div style="width: 25%; height: 230px;">
+                    <div style="color:white;font-size:15px;font-weight:600; text-align:center">SSY001-SSY005</div>
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">日成品缺陷(今日TOP5)</div>
+                    <canvas id="canvasDefectC" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                </div>
+                <div style="width: 25%; height: 230px;">
+                    <div style="color:white;font-size:15px;font-weight:600; text-align:center">SSY002-SSY004</div>
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">日成品缺陷(今日TOP5)</div>
+                    <canvas id="canvasDefectD" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                </div>
                 <div style="width: 25%; height: 230px;">
                     <div style="color:white;font-size:20px;font-weight:600; text-align:center">釉坯库库存</div>
                     <canvas id="canvasDefectB" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
@@ -113,29 +153,29 @@
                 clearInterval(mainInterval);
                 //console.log("Interval Stop!");
             }
-            $.get("demo.ashx?m=MonthTable", function (data){
-                var json = JSON.parse(data);
-                if (json["success"] == true) {
-                    $("#dayTable").html("");
-                    for (var i = 0; i < json["rows"].length; i++) {
-                        var temp = $("#dayTable_template").html();
-                        temp = temp.replace("<tbody>", "").replace("</tbody>", ""); 
-                        temp = temp.replace('{产品条码}', json["rows"][i]['产品条码']);
-                        temp = temp.replace('{产品型号}', json["rows"][i]['产品型号']);
-                        temp = temp.replace('{施釉产线}', json["rows"][i]['施釉产线']);
-                        temp = temp.replace('{施釉前重}', json["rows"][i]['施釉前重']); 
-                        temp = temp.replace('{施釉后重}', json["rows"][i]['施釉后重']);
-                        temp = temp.replace('{施釉房号}', json["rows"][i]['施釉房号']);
-                        temp = temp.replace('{施釉流量}', json["rows"][i]['施釉流量']);
-                        temp = temp.replace('{施釉喷幅}', json["rows"][i]['施釉喷幅']);
-                        temp = temp.replace('{釉浆温度}', json["rows"][i]['釉浆温度']);
-                        temp = temp.replace('{施釉压力}', json["rows"][i]['施釉压力']);
-                        $("#dayTable").append(temp);
-                    }
-                    mainRowCount = json["rows"].length;
-                    mainInterval = setInterval(mainScroll, 3000);
-                }
-            });
+            //$.get("demo.ashx?m=MonthTable", function (data){
+            //    var json = JSON.parse(data);
+            //    if (json["success"] == true) {
+            //        $("#dayTable").html("");
+            //        for (var i = 0; i < json["rows"].length; i++) {
+            //            var temp = $("#dayTable_template").html();
+            //            //temp = temp.replace("<tbody>", "").replace("</tbody>", "");
+            //            temp = temp.replace('{产品条码}', json["rows"][i]['产品条码']);
+            //            temp = temp.replace('{产品型号}', json["rows"][i]['产品型号']);
+            //            temp = temp.replace('{施釉产线}', json["rows"][i]['施釉产线']);
+            //            temp = temp.replace('{施釉前重}', json["rows"][i]['施釉前重']);
+            //            temp = temp.replace('{施釉后重}', json["rows"][i]['施釉后重']);
+            //            temp = temp.replace('{施釉房号}', json["rows"][i]['施釉房号']);
+            //            temp = temp.replace('{施釉流量}', json["rows"][i]['施釉流量']);
+            //            temp = temp.replace('{施釉喷幅}', json["rows"][i]['施釉喷幅']);
+            //            temp = temp.replace('{釉浆温度}', json["rows"][i]['釉浆温度']);
+            //            temp = temp.replace('{施釉压力}', json["rows"][i]['施釉压力']);
+            //            $("#dayTable").append(temp);
+            //        }
+            //        mainRowCount = json["rows"].length;
+            //        mainInterval = setInterval(mainScroll, 3000);
+            //    }
+            //});
         }
 
         function mainScroll() {
@@ -156,21 +196,29 @@
             setInterval(function () { DdfectData(); }, 180000);
             DdfectDataB();
             setInterval(function () { DdfectDataB(); }, 180000);
-            ZxData();
-            setInterval(function () { ZxData(); }, 180000);
+            //ZxData();
+            //setInterval(function () { ZxData(); }, 180000);
             ClData();
             setInterval(function () { ClData(); }, 180000);
             ZxDataH();
             setInterval(function () { ZxDataH(); }, 180000);
             CCData();
             setInterval(function () { CCData(); }, 180000);
-            DataKC(); 
+            DataKC();
             setInterval(function () { DataKC(); }, 180000);
+            DailypassrateDayData();
+            setInterval(function () { DailypassrateDayData(); }, 180000);
+            DailypassrateMonthData();
+            setInterval(function () { DailypassrateMonthData(); }, 180000);
+            DailypassrateRepairData();
+            setInterval(function () { DailypassrateRepairData(); }, 180000);
+            DailypassrateSemifinishedData();
+            setInterval(function () { DailypassrateSemifinishedData(); }, 180000);
         });
 
         //精坯库库存
-        function DataKC(){
-            $.get("demo.ashx?m=kc", function (data){
+        function DataKC() {
+            $.get("demo.ashx?m=kc", function (data) {
                 var json = JSON.parse(data);
                 if (json["success"] == true) {
                     var count1 = parseFloat(json["rows"][0]["数量"]);
@@ -184,40 +232,153 @@
             });
         }
 
-        //施釉七日趋势图
-        function ZxData(){
-            $.get("demo.ashx?m=zx", function (data){
+        ////施釉七日趋势图
+        //function ZxData(){
+        //    $.get("demo.ashx?m=zx", function (data) {
+        //        var json = JSON.parse(data);
+        //        if (json["success"] == true) {
+        //            var BJ1 = parseFloat(json["rows"][0]["施釉合格率"]);
+        //            var BJ2 = parseFloat(json["rows"][1]["施釉合格率"]);
+        //            var BJ3 = parseFloat(json["rows"][2]["施釉合格率"]);
+        //            var BJ4 = parseFloat(json["rows"][3]["施釉合格率"]);
+        //            var BJ5 = parseFloat(json["rows"][4]["施釉合格率"]);
+        //            var BJ6 = parseFloat(json["rows"][5]["施釉合格率"]);
+        //            var BJ7 = parseFloat(json["rows"][6]["施釉合格率"]);
+        //            var day1 = json["rows"][0]["日期"];
+        //            var day2 = json["rows"][1]["日期"];
+        //            var day3 = json["rows"][2]["日期"];
+        //            var day4 = json["rows"][3]["日期"];
+        //            var day5 = json["rows"][4]["日期"];
+        //            var day6 = json["rows"][5]["日期"];
+        //            var day7 = json["rows"][6]["日期"];
+        //            var count1 = parseFloat(json["rows"][0]["出窑数"]);
+        //            var count2 = parseFloat(json["rows"][1]["出窑数"]);
+        //            var count3 = parseFloat(json["rows"][2]["出窑数"]);
+        //            var count4 = parseFloat(json["rows"][3]["出窑数"]);
+        //            var count5 = parseFloat(json["rows"][4]["出窑数"]);
+        //            var count6 = parseFloat(json["rows"][5]["出窑数"]);
+        //            var count7 = parseFloat(json["rows"][6]["出窑数"]);
+        //            window.DayZL.data.datasets[0].data = [BJ1, BJ2, BJ3, BJ4, BJ5, BJ6, BJ7];
+        //            window.DayZL.data.datasets[1].data = [count1, count2, count3, count4, count5, count6, count7];
+        //            window.DayZL.data.labels = [day1, day2, day3, day4, day5, day6, day7];
+        //            window.DayZL.update();
+        //        }
+        //    });
+        //}
+
+        //施釉每日成品合格率
+        function DailypassrateDayData() {
+            $.get("demo.ashx?m=Dailypassrate&type=day&repair=false", function (data) {
                 var json = JSON.parse(data);
                 if (json["success"] == true) {
-                    var BJ1 = parseFloat(json["rows"][0]["施釉合格率"]);
-                    var BJ2 = parseFloat(json["rows"][1]["施釉合格率"]);
-                    var BJ3 = parseFloat(json["rows"][2]["施釉合格率"]);
-                    var BJ4 = parseFloat(json["rows"][3]["施釉合格率"]);
-                    var BJ5 = parseFloat(json["rows"][4]["施釉合格率"]);
-                    var BJ6 = parseFloat(json["rows"][5]["施釉合格率"]);
-                    var BJ7 = parseFloat(json["rows"][6]["施釉合格率"]);
-                    var day1 = json["rows"][0]["日期"];
-                    var day2 = json["rows"][1]["日期"];
-                    var day3 = json["rows"][2]["日期"];
-                    var day4 = json["rows"][3]["日期"];
-                    var day5 = json["rows"][4]["日期"];
-                    var day6 = json["rows"][5]["日期"];
-                    var day7 = json["rows"][6]["日期"];
-                    var count1 = parseFloat(json["rows"][0]["出窑数"]);
-                    var count2 = parseFloat(json["rows"][1]["出窑数"]);
-                    var count3 = parseFloat(json["rows"][2]["出窑数"]);
-                    var count4 = parseFloat(json["rows"][3]["出窑数"]);
-                    var count5 = parseFloat(json["rows"][4]["出窑数"]);
-                    var count6 = parseFloat(json["rows"][5]["出窑数"]);
-                    var count7 = parseFloat(json["rows"][6]["出窑数"]);
-                    window.DayZL.data.datasets[0].data = [BJ1, BJ2, BJ3, BJ4, BJ5, BJ6, BJ7];
-                    window.DayZL.data.datasets[1].data = [count1, count2, count3, count4, count5, count6, count7];
-                    window.DayZL.data.labels = [day1, day2, day3, day4, day5, day6, day7];
+                    console.log(json, '施釉每日成品合格率')
+                    // 存储施釉合格率
+                    let bjRates = [];
+                    // 存储出窑数
+                    let counts = [];
+                    // 存储日期
+                    let days = [];
+                    for (let i = 0; i < json["rows"].length; i++) {
+                        let row = json["rows"][i];
+                        // 添加施釉合格率
+                        bjRates.push(parseFloat(row["施釉合格率"]));
+                        // 添加出窑数
+                        counts.push(parseFloat(row["出窑数"]));
+                        // 添加日期
+                        days.push(row["日期"]);
+                    }
+
+                    window.DayZLA.data.datasets[0].data = bjRates;
+                    window.DayZLA.data.datasets[1].data = counts;
+                    window.DayZLA.data.labels = days;
+                    window.DayZLA.update();
+                }
+            });
+        }
+        //施釉每月成品合格率
+        function DailypassrateMonthData() {
+            $.get("demo.ashx?m=Dailypassrate&type=month&repair=false", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    console.log(json, '施釉每月成品合格率')
+                    // 存储施釉合格率
+                    let bjRates = [];
+                    // 存储出窑数
+                    let counts = [];
+                    // 存储日期
+                    let days = [];
+                    for (let i = 0; i < json["rows"].length; i++) {
+                        let row = json["rows"][i];
+                        // 添加施釉合格率
+                        bjRates.push(parseFloat(row["施釉合格率"]));
+                        // 添加出窑数
+                        counts.push(parseFloat(row["出窑数"]));
+                        // 添加日期
+                        days.push(row["日期"]);
+                    }
+                    window.DayZLB.data.datasets[0].data = bjRates;
+                    window.DayZLB.data.datasets[1].data = counts;
+                    window.DayZLB.data.labels = days;
+                    window.DayZLB.update();
+                }
+            });
+        }
+        //施釉每日成品冷补缺陷率
+        function DailypassrateRepairData() {
+            $.get("demo.ashx?m=Dailypassrate&type=day&repair=true", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    console.log(json, '施釉每日成品冷补缺陷率')
+                    // 存储施釉合格率
+                    let bjRates = [];
+                    // 存储出窑数
+                    let counts = [];
+                    // 存储日期
+                    let days = [];
+                    for (let i = 0; i < json["rows"].length; i++) {
+                        let row = json["rows"][i];
+                        // 添加施釉合格率
+                        bjRates.push(parseFloat(row["施釉合格率"]));
+                        // 添加出窑数
+                        counts.push(parseFloat(row["出窑数"]));
+                        // 添加日期
+                        days.push(row["日期"]);
+                    }
+                    window.DayZLC.data.datasets[0].data = bjRates;
+                    window.DayZLC.data.datasets[1].data = counts;
+                    window.DayZLC.data.labels = days;
+                    window.DayZLC.update();
+                }
+            });
+        }
+        //施釉每日半成品损坯率
+        function DailypassrateSemifinishedData() {
+            $.get("demo.ashx?m=DailypassrateSemifinished", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    console.log(json, '施釉每日半成品损坯率')
+                    // 存储施釉合格率
+                    let bjRates = [];
+                    // 存储出窑数
+                    let counts = [];
+                    // 存储日期
+                    let days = [];
+                    for (let i = 0; i < json["rows"].length; i++) {
+                        let row = json["rows"][i];
+                        // 添加施釉合格率
+                        bjRates.push(parseFloat(row["损坯率"]));
+                        // 添加出窑数
+                        counts.push(parseFloat(row["出窑数"]));
+                        // 添加日期
+                        days.push(row["日期"]);
+                    }
+                    window.DayZL.data.datasets[0].data = bjRates;
+                    window.DayZL.data.datasets[1].data = counts;
+                    window.DayZL.data.labels = days;
                     window.DayZL.update();
                 }
             });
         }
-
         //每小时产量折线图
         function ZxDataH() {
             $.get("demo.ashx?m=h", function (data) {
@@ -342,25 +503,53 @@
                 }
             });
         }
+        /**
+         * 归属施釉缺陷(今日TOP3)
 
+* SY001 - SSY005 月成品缺陷(每月TOP5)
+* SSY002-SSY004 月成品缺陷(每月TOP5)
+* **/
         function DdfectData() {
             $.get("demo.ashx?m=defect", function (data) {
                 var json = JSON.parse(data);
+                let a1 = [];
+                let b1 = [];
+                let a2 = [];
+                let b2 = [];
+                let a3 = [];
+                let b3 = [];
                 if (json["success"] == true) {
-                    let a = [];
-                    let b = [];
-                    if (json["success"] == true) {
-                        //var num = parseInt(json["rows"][0]["ROWNUM"]);
-                        var num = parseInt(json["rows"].length);
-                        for (var i = 0; i < num; i++) {
-                            a.push(parseInt(json["rows"][i]["数量"]));
-                            b.push(json["rows"][i]["缺陷名称"]);
-                        }
-                        window.DefectA.data.datasets[0].data = a;
-                        window.DefectA.data.labels = b;
-                        window.DefectA.update();
+                    //var num = parseInt(json["rows"][0]["ROWNUM"]);
+                    //归属施釉缺陷(今日TOP3)数据装载
+                    var num1 = parseInt(json["rows"]["Table1"].length);
+                    for (var i = 0; i < num1; i++) {
+                        a1.push(parseInt(json["rows"]["Table1"][i]["数量"]));
+                        b1.push(json["rows"]["Table1"][i]["缺陷名称"]);
+                    }
+                    window.DefectA.data.datasets[0].data = a1;
+                    window.DefectA.data.labels = b1;
+                    window.DefectA.update();
+                    //SSY001-SSY005 月成品缺陷(每月TOP5)数据装载
+                    var num2 = parseInt(json["rows"]["Table2"].length);
+                    for (var i = 0; i < num2; i++) {
+                        a2.push(parseInt(json["rows"]["Table2"][i]["数量"]));
+                        b2.push(json["rows"]["Table2"][i]["缺陷名称"]);
                     }
+                    window.DefectC.data.datasets[0].data = a2;
+                    window.DefectC.data.labels = b2;
+                    window.DefectC.update();
+                    //SSY002-SSY004 月成品缺陷(每月TOP5)数据装载
+                    var num3 = parseInt(json["rows"]["Table3"].length);
+
+                    for (var i = 0; i < num3; i++) {
+                        a3.push(parseInt(json["rows"]["Table3"][i]["数量"]));
+                        b3.push(json["rows"]["Table3"][i]["缺陷名称"]);
+                    }
+                    window.DefectD.data.datasets[0].data = a3;
+                    window.DefectD.data.labels = b3;
+                    window.DefectD.update();
                 }
+
             });
         }
 
@@ -402,6 +591,272 @@
             Chart.defaults.global.legend.display = false;
 
             //半检一检各项趋势图=====================================
+
+            window.configDayZLA = {
+                data: {
+                    labels: ["01", "02", "03", "04", "05", "06", "07"],
+                    datasets: [{
+                        type: 'line',
+                        label: "合格率",
+                        yAxesGroup: 'A',
+                        yAxisID: 'A',
+                        backgroundColor: color(window.chartColors.red).alpha(0.5).rgbString(),
+                        borderColor: window.chartColors.red,
+                        borderWidth: 2,
+                        pointRadius: 15,
+                        data: [0, 0, 0, 0, 0, 0, 0],
+                        fill: false
+                    }, {
+                        label: '产量',
+                        yAxesGroup: 'B',
+                        yAxisID: 'B',
+                        backgroundColor: color(window.chartColors.blue).alpha(0.5).rgbString(),
+                        borderColor: window.chartColors.blue,
+                        borderWidth: 1,
+                        data: [0, 0, 0, 0, 0, 0, 0],
+                        fill: false
+                    }]
+                },
+                type: 'bar',
+                options: {
+                    legend: {
+                        display: true
+                    },
+                    title: {
+                        display: false,
+                        text: '质量统计'
+                    },
+                    tooltips: {
+                        mode: 'index',
+                        intersect: false,
+                    },
+                    hover: {
+                        mode: 'nearest',
+                        intersect: true
+                    },
+                    scales: {
+                        xAxes: [{
+                            display: true,
+                            scaleLabel: {
+                                display: false,
+                                labelString: ''
+                            }
+                        }],
+                        yAxes: [{
+                            display: true,
+                            id: 'B',
+                            name: 'B',
+                            scalePositionLeft: true,
+                            position: 'left',
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value'
+                            },
+                            ticks: {
+                                min: 0,
+                                stepSize: 500,
+                                max: 3000
+                            }
+                        }
+                            , {
+                            display: true,
+                            id: 'A',
+                            name: 'A',
+                            scalePositionLeft: false,
+                            position: 'right',
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value2'
+                            },
+                            ticks: {
+                                min: 80,
+                                stepSize: 5,
+                                max: 100
+                            }
+                        }]
+                    }
+                }
+
+            };
+            var ctxDayZLA = document.getElementById("canvasDayZLA").getContext("2d");
+            window.DayZLA = new Chart(ctxDayZLA, configDayZLA);
+            window.configDayZLB = {
+                data: {
+                    labels: ["01", "02", "03", "04", "05", "06", "07"],
+                    datasets: [{
+                        type: 'line',
+                        label: "合格率",
+                        yAxesGroup: 'A',
+                        yAxisID: 'A',
+                        backgroundColor: color(window.chartColors.red).alpha(0.5).rgbString(),
+                        borderColor: window.chartColors.red,
+                        borderWidth: 2,
+                        pointRadius: 15,
+                        data: [0, 0, 0, 0, 0, 0, 0],
+                        fill: false
+                    }, {
+                        label: '产量',
+                        yAxesGroup: 'B',
+                        yAxisID: 'B',
+                        backgroundColor: color(window.chartColors.blue).alpha(0.5).rgbString(),
+                        borderColor: window.chartColors.blue,
+                        borderWidth: 1,
+                        data: [0, 0, 0, 0, 0, 0, 0],
+                        fill: false
+                    }]
+                },
+                type: 'bar',
+                options: {
+                    legend: {
+                        display: true
+                    },
+                    title: {
+                        display: false,
+                        text: '质量统计'
+                    },
+                    tooltips: {
+                        mode: 'index',
+                        intersect: false,
+                    },
+                    hover: {
+                        mode: 'nearest',
+                        intersect: true
+                    },
+                    scales: {
+                        xAxes: [{
+                            display: true,
+                            scaleLabel: {
+                                display: false,
+                                labelString: ''
+                            }
+                        }],
+                        yAxes: [{
+                            display: true,
+                            id: 'B',
+                            name: 'B',
+                            scalePositionLeft: true,
+                            position: 'left',
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value'
+                            },
+                            ticks: {
+                                min: 0,
+                                stepSize: 15000,
+                                max: 90000
+                            }
+
+                        }
+                            , {
+                            display: true,
+                            id: 'A',
+                            name: 'A',
+                            scalePositionLeft: false,
+                            position: 'right',
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value2'
+                            },
+                            ticks: {
+                                min: 80,
+                                stepSize: 5,
+                                max: 100
+                            }
+                        }]
+                    }
+                }
+
+            };
+            var ctxDayZLB = document.getElementById("canvasDayZLB").getContext("2d");
+            window.DayZLB = new Chart(ctxDayZLB, configDayZLB);
+            window.configDayZLC = {
+                data: {
+                    labels: ["01", "02", "03", "04", "05", "06", "07"],
+                    datasets: [{
+                        type: 'line',
+                        label: "合格率",
+                        yAxesGroup: 'A',
+                        yAxisID: 'A',
+                        backgroundColor: color(window.chartColors.red).alpha(0.5).rgbString(),
+                        borderColor: window.chartColors.red,
+                        borderWidth: 2,
+                        pointRadius: 15,
+                        data: [0, 0, 0, 0, 0, 0, 0],
+                        fill: false
+                    }, {
+                        label: '产量',
+                        yAxesGroup: 'B',
+                        yAxisID: 'B',
+                        backgroundColor: color(window.chartColors.blue).alpha(0.5).rgbString(),
+                        borderColor: window.chartColors.blue,
+                        borderWidth: 1,
+                        data: [0, 0, 0, 0, 0, 0, 0],
+                        fill: false
+                    }]
+                },
+                type: 'bar',
+                options: {
+                    legend: {
+                        display: true
+                    },
+                    title: {
+                        display: false,
+                        text: '质量统计'
+                    },
+                    tooltips: {
+                        mode: 'index',
+                        intersect: false,
+                    },
+                    hover: {
+                        mode: 'nearest',
+                        intersect: true
+                    },
+                    scales: {
+                        xAxes: [{
+                            display: true,
+                            scaleLabel: {
+                                display: false,
+                                labelString: ''
+                            }
+                        }],
+                        yAxes: [{
+                            display: true,
+                            id: 'B',
+                            name: 'B',
+                            scalePositionLeft: true,
+                            position: 'left',
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value'
+                            },
+                            ticks: {
+                                min: 0,
+                                stepSize: 500,
+                                max: 3000
+                            }
+                        }
+                            , {
+                            display: true,
+                            id: 'A',
+                            name: 'A',
+                            scalePositionLeft: false,
+                            position: 'right',
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value2'
+                            },
+                            ticks: {
+                                min: 80,
+                                stepSize: 5,
+                                max: 100
+                            }
+                        }]
+                    }
+                }
+
+            };
+            var ctxDayZLC = document.getElementById("canvasDayZLC").getContext("2d");
+            window.DayZLC = new Chart(ctxDayZLC, configDayZLC);
             window.configDayZL = {
                 data: {
                     labels: ["01", "02", "03", "04", "05", "06", "07"],
@@ -423,7 +878,7 @@
                         backgroundColor: color(window.chartColors.blue).alpha(0.5).rgbString(),
                         borderColor: window.chartColors.blue,
                         borderWidth: 1,
-                        data: [100, 100, 100, 100, 100, 100, 100],
+                        data: [0, 0, 0, 0, 0, 0, 0],
                         fill: false
                     }]
                 },
@@ -492,7 +947,7 @@
             window.DayZL = new Chart(ctxDayZL, configDayZL);
             //===================================================
 
-            //成型缺陷TOP5===========================================
+            //归属施釉缺陷(今日TOP3===========================================
             window.configDefectA = {
                 data: {
                     labels: ['1', '2', '3'],
@@ -537,6 +992,96 @@
             };
             var ctxDefectA = document.getElementById("canvasDefectA").getContext("2d");
             window.DefectA = new Chart(ctxDefectA, configDefectA);
+            //SSY001-SSY005 月成品缺陷(每月TOP5)===========================================
+            window.configDefectC = {
+                data: {
+                    labels: ['1', '2', '3', '4', '5'],
+                    datasets: [{
+                        label: '工序',
+                        backgroundColor: [
+                            color(window.chartColors.red).alpha(0.35).rgbString(),
+                            color(window.chartColors.blue).alpha(0.35).rgbString(),
+                            color(window.chartColors.green).alpha(0.35).rgbString(),
+                            color(window.chartColors.orange).alpha(0.35).rgbString(),
+                            color(window.chartColors.purple).alpha(0.35).rgbString()
+                        ],
+                        fill: false,
+                        borderColor: [
+                            window.chartColors.red,
+                            window.chartColors.blue,
+                            window.chartColors.green,
+                            window.chartColors.orange,
+                            window.chartColors.purple
+                        ],
+                        borderWidth: 2,
+                        pointRadius: 30,
+                        data: [0, 0, 0, 0, 0]
+                    }]
+                },
+                type: 'pie',
+                options: {
+                    legend: {
+                        display: true
+                    },
+                    title: {
+                        display: false,
+                        text: "甲班缺陷"
+                    },
+                    tooltips: {
+                        mode: 'point',
+                        intersect: false
+                    },
+                    responsive: true
+
+                }
+            };
+            var ctxDefectC = document.getElementById("canvasDefectC").getContext("2d");
+            window.DefectC = new Chart(ctxDefectC, configDefectC);
+            //SSY002-SSY004 月成品缺陷(每月TOP5)==============================================
+            window.configDefectD = {
+                data: {
+                    labels: ['1', '2', '3', '4', '5'],
+                    datasets: [{
+                        label: '工序',
+                        backgroundColor: [
+                            color(window.chartColors.red).alpha(0.35).rgbString(),
+                            color(window.chartColors.blue).alpha(0.35).rgbString(),
+                            color(window.chartColors.green).alpha(0.35).rgbString(),
+                            color(window.chartColors.orange).alpha(0.35).rgbString(),
+                            color(window.chartColors.purple).alpha(0.35).rgbString()
+                        ],
+                        fill: false,
+                        borderColor: [
+                            window.chartColors.red,
+                            window.chartColors.blue,
+                            window.chartColors.green,
+                            window.chartColors.orange,
+                            window.chartColors.purple
+                        ],
+                        borderWidth: 2,
+                        pointRadius: 30,
+                        data: [0, 0, 0, 0, 0]
+                    }]
+                },
+                type: 'pie',
+                options: {
+                    legend: {
+                        display: true
+                    },
+                    title: {
+                        display: false,
+                        text: "甲班缺陷"
+                    },
+                    tooltips: {
+                        mode: 'point',
+                        intersect: false
+                    },
+                    responsive: true
+
+                }
+            };
+            var ctxDefectD = document.getElementById("canvasDefectD").getContext("2d");
+            window.DefectD = new Chart(ctxDefectD, configDefectD);
             //===================================================
 
             //成检缺陷TOP5===========================================
@@ -555,7 +1100,7 @@
                         fill: false,
                         borderColor: [
                             window.chartColors.red,
-                            window.chartColors.blue, 
+                            window.chartColors.blue,
                             window.chartColors.green,
                             window.chartColors.orange,
                             window.chartColors.purple
@@ -586,52 +1131,6 @@
             window.DefectB = new Chart(ctxDefectB, configDefectB);
             //===================================================
 
-            //甲班缺陷===========================================
-            //window.configMonthCL = {
-            //    data: {
-            //        labels: ['实际产量', '目标产量'],
-            //        datasets: [{
-            //            label: '工序',
-            //            backgroundColor: [
-            //                color(window.chartColors.red).alpha(0.35).rgbString(),
-            //                color(window.chartColors.blue).alpha(0.35).rgbString(),
-            //                color(window.chartColors.green).alpha(0.35).rgbString(),
-            //                color(window.chartColors.orange).alpha(0.35).rgbString(),
-            //                color(window.chartColors.purple).alpha(0.35).rgbString()
-            //            ],
-            //            fill: false,
-            //            borderColor: [
-            //                window.chartColors.red,
-            //                window.chartColors.blue,
-            //                window.chartColors.green,
-            //                window.chartColors.orange,
-            //                window.chartColors.purple
-            //            ],
-            //            borderWidth: 2,
-            //            pointRadius: 30,
-            //            data: [0, 0]
-            //        }]
-            //    },
-            //    type: 'doughnut',
-            //    options: {
-            //        legend: {
-            //            display: true
-            //        },
-            //        title: {
-            //            display: false,
-            //            text: ""
-            //        },
-            //        tooltips: {
-            //            mode: 'point',
-            //            intersect: false
-            //        },
-            //        responsive: true
-
-            //    }
-            //};
-            //var ctxMonthCL = document.getElementById("canvasMonthCL").getContext("2d");
-            //window.MonthCL = new Chart(ctxMonthCL, configMonthCL);
-            //===================================================
 
             //侧漏气产量柱状图=====================================
             window.canvasDayCL = {
@@ -666,7 +1165,7 @@
                     scales: {
                         xAxes: [{
                             stacked: false,
-                             barThickness: 40
+                            barThickness: 40
                         }],
                         yAxes: [{
                             display: true,
@@ -698,14 +1197,14 @@
                         pointRadius: 12,
                         data: []
                     }, {
-                            label: "施釉6+1",
-                            fill: false,
-                            backgroundColor: color(window.chartColors.blue).alpha(0.6).rgbString(),
-                            borderColor: window.chartColors.blue,
-                            borderWidth: 2,
-                            pointRadius: 12,
-                            data: []
-                        }]
+                        label: "施釉6+1",
+                        fill: false,
+                        backgroundColor: color(window.chartColors.blue).alpha(0.6).rgbString(),
+                        borderColor: window.chartColors.blue,
+                        borderWidth: 2,
+                        pointRadius: 12,
+                        data: []
+                    }]
                 },
                 type: 'line',
                 options: {