新增成检包装看板、调整半成品检验车间看板、调整高压成型车间看板

wwwroot/main/Procedure/test11/warehouse.ashx

@@ -17,6 +17,181 @@ public class warehouse : IHttpHandler, IReadOnlySessionState
     public void ProcessRequest(HttpContext context)
     {
         context.Response.ContentType = "text/plain";
+        using (IDataAccess conn = DataAccess.Create())
+        {//成检缺陷位置扇形图
+            if (context.Request["m"].ToString() == "defectw")
+            {
+                string sqlStr = @"SELECT T.name AS 缺陷位置,T.count AS 缺陷数量 FROM(
+									SELECT
+										TMDP.S_NAME name,
+										COUNT( * ) count
+									FROM
+										TP_PM_DEFECT TPD
+										LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
+										LEFT JOIN TP_MST_DEFECTPOSITION TMDP ON TPD.DEFECTPOSITIONID = TMDP.DEFECTPOSITIONID
+									WHERE
+										TPD.CREATETIME >= TRUNC( SYSDATE ) 
+										AND TPD.VALUEFLAG = 1 
+										AND TPD.PROCEDUREID IN (125)
+									GROUP BY
+										TMDP.S_NAME
+									ORDER BY
+										COUNT( * ) DESC)T WHERE ROWNUM < 4";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+
+            //成检缺陷扇形图
+            if (context.Request["m"].ToString() == "defect")
+            {
+                string sqlStr = @"SELECT T.name as 缺陷名称,T.count as 数量 FROM(
+												SELECT
+													TMD.S_name name,
+													COUNT( * ) count
+												FROM
+													TP_PM_DEFECT TPD
+													LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
+												WHERE
+													TPD.CHECKTIME >= TRUNC( SYSDATE ) 
+													AND TPD.VALUEFLAG = 1 
+													AND TPD.PROCEDUREID IN (125)
+												GROUP BY
+													TMD.S_name 
+												ORDER BY
+													COUNT( * ) DESC)T WHERE ROWNUM < 4";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+            //车间设备状态扇形图
+            if (context.Request["m"].ToString() == "defectb")
+            {
+                string sqlStr = @"SELECT
+	                                    T.S_NAME AS 缺陷名称,
+	                                    T.数量 
+                                    FROM
+	                                    (
+	                                    SELECT
+		                                    TMD.S_NAME,
+		                                    count( * ) AS 数量 
+	                                    FROM
+		                                    TP_PM_DEFECT TPD
+		                                    LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTID = TMD.DEFECTID 
+	                                    WHERE
+		                                    TPD.CREATETIME >= TRUNC( SYSDATE )
+		                                    AND TMD.DEFECTTYPEID IN ( 15,16,18,4 ) 
+	                                    GROUP BY
+		                                    TMD.S_NAME 
+	                                    ORDER BY
+		                                    count( * ) DESC 
+	                                    ) T 
+                                    WHERE
+	                                    ROWNUM < 4";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+            //本烧合格率折线图
+            if (context.Request["m"].ToString() == "zx")
+            {
+                string sqlStr = @"SELECT
+							TO_CHAR(( T4.本烧合格 / T4.本烧数量 ) * 100, '99' ) || '%' AS 合格率,
+							T4.本烧合格 as 本烧合格数,
+							SUBSTR(T4.CREATETIME,7,2 ) AS 日期
+						FROM
+							(
+							SELECT
+								T1.本烧数量,
+								T2.本烧不合格数量,
+								T1.本烧数量 - T2.本烧不合格数量 AS 本烧合格,
+								T1.CREATETIME 
+							FROM
+								(
+									SELECT DISTINCT--本烧数量
+									COUNT( TPPD.BARCODE ) 本烧数量,
+									to_char( TPFD.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
+								FROM 
+									TP_PM_FINISHEDPRODUCT TPFD
+									LEFT JOIN TP_PM_PRODUCTIONDATA TPPD ON TPFD.BARCODE = TPPD.BARCODE
+									LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
+								WHERE
+									TPPD.PROCEDUREID IN ( 125 ) 
+									AND TPPD.ISREFIRE = 0 
+									AND PGD.TESTFLAG = 0 
+									AND TPPD.VALUEFLAG = 1 
+									AND TPFD.CREATETIME >= trunc( SYSDATE - 6 ) 
+								GROUP BY
+									to_char( TPFD.CREATETIME, 'yyyymmdd' ) 
+								ORDER BY
+									to_char( TPFD.CREATETIME, 'yyyymmdd' ) DESC 
+								) T1
+								LEFT JOIN (
+								SELECT DISTINCT--本烧数量
+									COUNT( TPPD.BARCODE ) 本烧不合格数量,
+									to_char( TPFD.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
+								FROM 
+									TP_PM_FINISHEDPRODUCT TPFD
+									LEFT JOIN TP_PM_PRODUCTIONDATA TPPD ON TPFD.BARCODE = TPPD.BARCODE
+									LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
+									LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
+									LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
+								WHERE
+									TPPD.PROCEDUREID IN ( 125 ) 
+									AND TPPD.ISREFIRE = 0 
+									AND PGD.TESTFLAG = 0 
+									AND TPPD.GOODSLEVELID IN ( 6, 7 ) 
+									AND TMD.DEFECTTYPEID <> 14 
+									AND TPPD.VALUEFLAG = 1 
+									AND TPFD.CREATETIME >= trunc( SYSDATE - 6 ) 
+								GROUP BY
+									to_char( TPFD.CREATETIME, 'yyyymmdd' ) 
+								ORDER BY
+									to_char( TPFD.CREATETIME, 'yyyymmdd' ) DESC 
+								) T2 ON T2.CREATETIME = T1.CREATETIME
+						ORDER BY
+							CREATETIME DESC)T4 ORDER BY T4.CREATETIME DESC";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+			//包装产线table
+			if (context.Request["m"].ToString() == "MonthTable")
+            {
+                string sqlStr = @"SELECT
+									1 包装工单号,
+									PACKINGLINE 包装产线,
+								CASE
+										WHEN STATUS = 2 THEN
+										'完成' 
+										WHEN STATUS = 3 THEN
+										'异常中止'
+										WHEN STATUS = -1 THEN
+										'未确认'
+										WHEN STATUS = 0 THEN
+										'未开始'
+										WHEN STATUS = 1 THEN
+										'执行中'
+									END AS 包装状态,
+									1 包装数量,
+									1 完成情况,
+									1 完成时间,
+									1 推送状态,
+									1 推送时间
+								FROM
+									TP_MST_PACKINGFORM
+											 ";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+
+        }
 
         //取产品库存列表
         if(context.Request["m"]=="isfull" && context.Request["isfull"] is object)

wwwroot/main/Procedure/test11/warehouse_chart.html

@@ -5,11 +5,27 @@
     <meta name="keywords" content="dongke,mes,ibossmes">
     <meta name="description" content="制造企业生产过程执行管理系统">
     <meta name="author" content="xuwei">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
     <title>东科软件</title>
     <script src="/plugins/xeasyui/xeasyui.min.js"></script>
     <script src="/plugins/chartjs/chart.min.js"></script>
     <script src="/plugins/chartjs/utils.js"></script>
     <script src="/plugins/xcountto/xcountTo.min.js"></script>
+    <script src="/Plugins/bootstrap-4.3.1/js/bootstrap.bundle.min.js"></script>
+    <script src="/Plugins/bootstrap-table/bootstrap-table.min.js"></script>
+    <script src="/Plugins/bootstrap-table/bootstrap-table-locale-all.min.js"></script>
+    <script src="/Plugins/sweetalert/sweetalert.min.js"></script>
+    <script src="/Plugins/chartjs-2.8.0/chart-2.8.min.js"></script>
+    <script src="/Plugins/chartjs-2.8.0/chartjs-plugin-datalabels.js"></script>
+    <script src="/Plugins/chartjs-2.8.0/utils.js"></script>
+    <script src="/Plugins/circleChart/circleChart.min.js"></script>
+    <link rel="shortcut icon" href="/img/logo.png" />
+    <link rel="bookmark" href="/img/logo.png" />
+    <link href="/Plugins/animate/animate.min.css" rel="stylesheet" />
+    <link rel="stylesheet" href="../DashBoard.css?v3" />
+    <!--<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>
     <style type="text/css">
         .panel-title {
             -webkit-text-size-adjust: none;
@@ -18,37 +34,70 @@
             -webkit-transform-origin-x: 0;
             -webkit-transform: scale(0.80);
         }
+
         .panel-body {
             background-color: #444;
         }
+
         @keyframes blink {
-            0% {opacity: 1;}
-            100% {opacity: 0;}
+            0% {
+                opacity: 1;
+            }
+
+            100% {
+                opacity: 0;
+            }
         }
+
         @-webkit-keyframes blink {
-            0% {opacity: 1;}
-            100% {opacity: 0;}
+            0% {
+                opacity: 1;
+            }
+
+            100% {
+                opacity: 0;
+            }
         }
+
         @-moz-keyframes blink {
-            0% {opacity: 1;}
-            100% {opacity: 0;}
+            0% {
+                opacity: 1;
+            }
+
+            100% {
+                opacity: 0;
+            }
         }
+
         @-ms-keyframes blink {
-            0% {opacity: 1;}
-            100% {opacity: 0;}
+            0% {
+                opacity: 1;
+            }
+
+            100% {
+                opacity: 0;
+            }
         }
+
         @-o-keyframes blink {
-            0% {opacity: 1;}
-            100% {opacity: 0;}
+            0% {
+                opacity: 1;
+            }
+
+            100% {
+                opacity: 0;
+            }
         }
+
         .blink {
-            background-color:red;
+            background-color: red;
             animation: blink 1s linear infinite;
             -webkit-animation: blink 1s linear infinite;
             -moz-animation: blink 1s linear infinite;
             -ms-animation: blink 1s linear infinite;
             -o-animation: blink 1s linear infinite;
         }
+
         .blinkwait {
             background-color: #444;
             animation: blink 1s linear infinite;
@@ -59,20 +108,152 @@
         }
     </style>
 </head>
-<body style="width:1200px;color:white;background-color:#666">
+<body style="width:100%;color:white;background-color:#666">
     <script type="text/javascript">
 
         var refreshTime = 60;
         var currentTime = 0;
         var doLoadData;
+        var mainInterval;
+        var mainRowCount = 0;
 
         $(document).ready(function () {
             //doLoadData = setInterval(function () { loadTime(); }, 1000);
-
+            initData();
+            loadMainTable();
             loadData();
-
+            DefectDataW();
+            setInterval(function () { DefectDataW(); }, 5000);
+            setInterval(function () { DdfectData(); }, 5000);
+            DdfectDataB();
+            setInterval(function () { DdfectDataB(); }, 5000);
+            ZxData();
+            setInterval(function () { ZxData(); }, 5000);
+           
         });
 
+        function loadMainTable() {
+            if (mainInterval) {
+                clearInterval(mainInterval);
+                //console.log("Interval Stop!");
+            }
+            $.get("warehouse.ashx?m=MonthTable", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    $("#dayTabletwo").html("");
+                    for (var i = 0; i < json["rows"].length; i++) {
+                        var temp = $("#dayTable_templatetwo").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]['推送时间']);
+                        $("#dayTabletwo").append(temp);
+                    }
+                    mainRowCount = json["rows"].length;
+                    mainInterval = setInterval(mainScroll, 3000);
+                }
+            });
+        }
+
+        function mainScroll() {
+            var scrollHeight = $("#dayTabletwo").find("tr").outerHeight();
+            $("#dayTabletwo").animate({ marginTop: -scrollHeight, }, 500,
+                function () {
+                    $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
+                    if (--mainRowCount == -1) loadMainTable();
+                }
+            );
+        }
+
+        function DefectDataW() {
+            $.get("warehouse.ashx?m=defectw", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    var defect1 = parseFloat(json["rows"][0]["缺陷数量"]);
+                    var defect2 = parseFloat(json["rows"][1]["缺陷数量"]);
+                    var defect3 = parseFloat(json["rows"][2]["缺陷数量"]);
+                    var defectname1 = json["rows"][0]["缺陷位置"];
+                    var defectname2 = json["rows"][1]["缺陷位置"];
+                    var defectname3 = json["rows"][2]["缺陷位置"];
+                    window.DefectW.data.datasets[0].data = [defect1, defect2, defect3];
+                    window.DefectW.data.labels = [defectname1, defectname2, defectname3]
+                    window.DefectW.update();
+                }
+            });
+        }
+
+        function DdfectData() {
+            $.get("warehouse.ashx?m=defect", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    var defect1 = parseFloat(json["rows"][0]["数量"]);
+                    var defect2 = parseFloat(json["rows"][1]["数量"]);
+                    var defect3 = parseFloat(json["rows"][2]["数量"]);
+                    var defectname1 = json["rows"][0]["缺陷名称"];
+                    var defectname2 = json["rows"][1]["缺陷名称"];
+                    var defectname3 = json["rows"][2]["缺陷名称"];
+                    window.DefectA.data.datasets[0].data = [defect1, defect2, defect3];
+                    window.DefectA.data.labels = [defectname1, defectname2, defectname3]
+                    window.DefectA.update();
+                }
+            });
+        }
+
+        function DdfectDataB() {
+            $.get("warehouse.ashx?m=defectb", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    var defect1 = parseFloat(json["rows"][0]["数量"]);
+                    var defect2 = parseFloat(json["rows"][1]["数量"]);
+                    var defect3 = parseFloat(json["rows"][2]["数量"]);
+                    var defectname1 = json["rows"][0]["缺陷名称"];
+                    var defectname2 = json["rows"][1]["缺陷名称"];
+                    var defectname3 = json["rows"][2]["缺陷名称"];
+                    window.DefectB.data.datasets[0].data = [defect1, defect2, defect3];
+                    window.DefectB.data.labels = [defectname1, defectname2, defectname3]
+                    window.DefectB.update();
+                }
+            });
+        }
+
+        function ZxData() {
+            $.get("warehouse.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 = parseFloat(json["rows"][0]["日期"]);
+                    var day2 = parseFloat(json["rows"][1]["日期"]);
+                    var day3 = parseFloat(json["rows"][2]["日期"]);
+                    var day4 = parseFloat(json["rows"][3]["日期"]);
+                    var day5 = parseFloat(json["rows"][4]["日期"]);
+                    var day6 = parseFloat(json["rows"][5]["日期"]);
+                    var day7 = parseFloat(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 loadTime() {
             if (currentTime > 0) {
                 $('#timer').html(" <font color='gray'>刷新倒计时：" + currentTime + " 秒</font>");
@@ -139,645 +320,1012 @@
                 });
             });
         }
-    </script>
 
-    <div style="float:left;">
-        <div style="float: left; padding:5px;">
-            <div id="t5_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_1" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_2" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_3" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_4" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_5" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_6" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_7" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_8" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_9" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_10" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_11" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_12" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_13" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_14" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_15" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t5_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p5_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div style="float:left;">
-        <div style="float: left; padding:5px;">
-            <div id="t4_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_1" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_2" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_3" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_4" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_5" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_6" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_7" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_8" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_9" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_10" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_11" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_12" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_13" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_14" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_15" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t4_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p4_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div style="float:left;">
-        <div style="float: left; padding:5px;">
-            <div id="t3_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_1" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_2" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_3" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_4" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_5" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_6" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_7" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_8" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_9" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_10" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_11" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_12" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_13" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_14" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_15" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t3_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p3_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div style="float:left;">
-        <div style="float: left; padding:5px;">
-            <div id="t2_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_1" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_2" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_3" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_4" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_5" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_6" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_7" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_8" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_9" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+        function initData() {
+            window.chartColors = {
+                red: 'rgb(255, 99, 132)',
+                orange: 'rgb(255, 159, 64)',
+                yellow: 'rgb(255, 250, 86)',
+                green: 'rgb(75, 192, 192)',
+                blue: 'rgb(54, 162, 250)',
+                purple: 'rgb(153, 102, 255)',
+                grey: 'rgb(231,233,237)'
+            };
+
+            var color = Chart.helpers.color;
+
+            window.randomScalingFactor = function (num) {
+                return Math.round(Math.random() * num);
+            }
+
+            Chart.defaults.global.defaultFontColor = 'white';
+            Chart.defaults.global.defaultFontSize = 18;
+            Chart.defaults.global.legend.display = false;
+
+            //成检合格率各项趋势图=====================================
+            window.configDayZL = {
+                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: [100, 100, 100, 100, 100, 100, 100],
+                        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: 1000,
+                                max: 5000
+                            }
+                        }
+                            , {
+                            display: true,
+                            id: 'A',
+                            name: 'A',
+                            scalePositionLeft: false,
+                            position: 'right',
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value2'
+                            },
+                            ticks: {
+                                min: 50,
+                                stepSize: 10,
+                                max: 100
+                            }
+                        }]
+                    }
+                }
+
+            };
+            var ctxDayZL = document.getElementById("canvasDayZL").getContext("2d");
+            window.DayZL = new Chart(ctxDayZL, configDayZL);
+            //===================================================
+
+            //成检缺陷TOP5===========================================
+            window.configDefectA = {
+                data: {
+                    labels: ['1', '2', '3'],
+                    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]
+                    }]
+                },
+                type: 'pie',
+                options: {
+                    legend: {
+                        display: true
+                    },
+                    title: {
+                        display: false,
+                        text: "甲班缺陷"
+                    },
+                    tooltips: {
+                        mode: 'point',
+                        intersect: false
+                    },
+                    responsive: true
+
+                }
+            };
+            var ctxDefectA = document.getElementById("canvasDefectA").getContext("2d");
+            window.DefectA = new Chart(ctxDefectA, configDefectA);
+            //===================================================
+            //成检缺陷位置TOP5===========================================
+            window.configDefectW = {
+                data: {
+                    labels: ['1', '2', '3'],
+                    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]
+                    }]
+                },
+                type: 'pie',
+                options: {
+                    legend: {
+                        display: true
+                    },
+                    title: {
+                        display: false,
+                        text: "甲班缺陷"
+                    },
+                    tooltips: {
+                        mode: 'point',
+                        intersect: false
+                    },
+                    responsive: true
+
+                }
+            };
+            var ctxDefectW = document.getElementById("canvasDefectW").getContext("2d");
+            window.DefectW = new Chart(ctxDefectW, configDefectW);
+            //===================================================
+
+
+            //成检缺陷TOP5===========================================
+            window.configDefectB = {
+                data: {
+                    labels: ['缺陷1', '缺陷2', '缺陷3'],
+                    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]
+                    }]
+                },
+                type: 'pie',
+                options: {
+                    legend: {
+                        display: true
+                    },
+                    title: {
+                        display: false,
+                        text: "甲班缺陷"
+                    },
+                    tooltips: {
+                        mode: 'point',
+                        intersect: false
+                    },
+                    responsive: true
+
+                }
+            };
+            var ctxDefectB = document.getElementById("canvasDefectB").getContext("2d");
+            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);
+            //===================================================
+        }
+    </script>
+    <div class="box_1920_1080">
+        <div class="box_title" style="display:flex;flex-direction:row;">
+            <div style="width:30%;text-align:left;"></div>
+            <div style="width: 40%; text-align: center; font-size: 38px; font-weight: 700">成检包装看板</div>
+            <div style="width:30%;text-align:right;"><span class="box_title_loading" style="font-size:32px;" id="报表加载"></span></div>
+        </div>
+        <!--<div class="box_body" style="display: flex; flex-direction: column;">-->
+        <div style="width:100%;height:560px;padding-left:30px;padding-top:10px;">
+            <div style="float:left;">
+                <div style="float: left; padding:5px;">
+                    <div id="t5_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_1" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              
+                <div style="float: left; padding:5px;">
+                    <div id="t5_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_2" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_3" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_4" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_5" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_6" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_7" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_8" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_9" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_10" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_11" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_12" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_13" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_14" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_15" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t5_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p5_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div style="float:left;">
+                <div style="float: left; padding:5px;">
+                    <div id="t4_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_1" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_2" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_3" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_4" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_5" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_6" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_7" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_8" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_9" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_10" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_11" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_12" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_13" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_14" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_15" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t4_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p4_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div style="float:left;">
+                <div style="float: left; padding:5px;">
+                    <div id="t3_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_1" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_2" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_3" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_4" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_5" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_6" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_7" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_8" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_9" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_10" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_11" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_12" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_13" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_14" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_15" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t3_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p3_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div style="float:left;">
+                <div style="float: left; padding:5px;">
+                    <div id="t2_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_1" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_2" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_3" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_4" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_5" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_6" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_7" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_8" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_9" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_10" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_11" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_12" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_13" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_14" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_15" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t2_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p2_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <div style="float:left;">
+                <div style="float: left; padding:5px;">
+                    <div id="t1_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_1" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_2" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_3" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_4" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_5" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_6" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_7" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_8" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_9" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_10" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_11" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_12" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_13" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_14" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_15" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
+                </div>
+                <div style="float: left; padding:5px;">
+                    <div id="t1_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
+                        <div style="padding:10px;text-align:center">
+                            <div id="p1_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                        </div>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_10" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+
+            <div style="float:left;padding:0;margin:0;font-size:6px;">
+                <div style="float:left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">1</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_11" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">2</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_12" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">3</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_13" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">4</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_14" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">5</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_15" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">6</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t2_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p2_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">7</div>
                 </div>
-            </div>
-        </div>
-    </div>
-    <div style="float:left;">
-        <div style="float: left; padding:5px;">
-            <div id="t1_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_1" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">8</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_2" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">9</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_3" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">10</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_4" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">11</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_5" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">12</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_6" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">13</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_7" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">14</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_8" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">15</div>
                 </div>
-            </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_9" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+                <div style="float: left; padding:0 5px 0 5px;">
+                    <div style="width:64px;text-align:center;color:darkgray">16</div>
                 </div>
             </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_10" data-speed="2000" style="font-size:32px;">&nbsp;</div>
+
+            <div style="width: 650px; height: 500px; position: absolute; right: 40px; ">
+                <table cellspacing="0" cellpadding="0" border="0" style="width:99.8%;">
+                    <!--<tr class="tr_title_warning">
+                        <td colspan="10" style="color: white;">修复产品外观检验统计</td>
+                    </tr>-->
+                    <tr class="tr_title_warning" style="height: 50px;">
+                        <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">包装工单号</td>
+                        <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">包装产线</td>
+                        <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">包装状态</td>
+                        <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">包装数量</td>
+                        <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">完成情况</td>
+                        <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px; ">完成时间</td>
+                        <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">推送状态</td>
+                        <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">推送时间</td>
+                    </tr>
+                </table>
+                <div style=" height: 522px; overflow: hidden; width: 100%;">
+                    <div>
+                        <table id="dayTable_templatetwo" style="display:none;">
+                            <tr class="tr_title_warning" style="height: 50px;">
+                                <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px; ">{包装工单号}</td>
+                                <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">{包装产线}</td>
+                                <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">{包装状态}</td>
+                                <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">{包装数量}</td>
+                                <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">{完成情况}</td>
+                                <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">{完成时间}</td>
+                                <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">{推送状态}</td>
+                                <td style="width: 10%; font-size: 10px; padding: 0px 0px 0px 0px;">{推送时间}</td>
+                            </tr>
+                        </table>
+                    </div>
+                    <table id="dayTabletwo" style="width: 100%; ">
+                    </table>
+                </div>
+            </div>
+        </div>
+        <div style="float:left;padding-bottom:10px;padding-left:30px;">
+            <div style="float: left; padding:5px;width:100%">
+                <div style="font-size:14px;">
+                    <span>数据汇总：</span><span id="all">0</span>，智能：<span id="zn" style="color:yellow">0</span>，连体：<span id="lt">0</span> <span id="timer"></span> <span> 【<a href="###" onclick="loadData()">点击刷新</a>】</span>
                 </div>
             </div>
         </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_11" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
+
+        <div style="float:left;">
+            <div style="float: left; padding:5px;">
+
             </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_12" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
+            <div style="float: left; padding:5px;">
+
             </div>
         </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_13" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
+        <div style="width:1840px;height:200px;display:flex;flex-direction:row;margin-top:100px;">
+            <div style="width: 30%; height: 200px;">
+                <div style="color:white;font-size:20px;font-weight:600; text-align:center">产成品质量七日趋势图</div> 
+                <canvas id="canvasDayZL" style="-moz-user-select: none; padding-left: 30px; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
             </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_14" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
+            <div style="width: 18%; height: 200px;">
+                <div style="color:white;font-size:20px;font-weight:600; text-align:center">品管巡检质量分析</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="float: left; padding:5px;">
-            <div id="t1_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_15" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
+            <div style="width: 18%; height: 200px;">
+                <div style="color:white;font-size:20px;font-weight:600; text-align:center">成检包装设备状态</div>
+                <canvas id="canvasDefectW" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
             </div>
-        </div>
-        <div style="float: left; padding:5px;">
-            <div id="t1_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64">
-                <div style="padding:10px;text-align:center">
-                    <div id="p1_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
-                </div>
+            <div style="width: 18%; height: 200px;">-
+                <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>
             </div>
-        </div>
-    </div>
-
-    <div style="float:left;padding:0;margin:0;font-size:6px;">
-        <div style="float:left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">1</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">2</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">3</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">4</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">5</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">6</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">7</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">8</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">9</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">10</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">11</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">12</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">13</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">14</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">15</div>
-        </div>
-        <div style="float: left; padding:0 5px 0 5px;">
-            <div style="width:64px;text-align:center;color:darkgray">16</div>
-        </div>
-    </div>
-
-    <div style="float:left;padding-bottom:10px;">
-        <div style="float: left; padding:5px;width:100%">
-            <div style="font-size:14px;">
-                <span>数据汇总：</span><span id="all">0</span>，智能：<span id="zn" style="color:yellow">0</span>，连体：<span id="lt">0</span> <span id="timer"></span> <span> 【<a href="###" onclick="loadData()">点击刷新</a>】</span>
+            <div style="width: 18%; height: 200px;">
+                <div style="color:white;font-size:20px;font-weight:600; text-align:center">包装工单进度</div>
+                <canvas id="canvasMonthCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
             </div>
         </div>
     </div>
-
-    <div style="float:left;">
-        <div style="float: left; padding:5px;">
-
-        </div>
-        <div style="float: left; padding:5px;">
-
-        </div>
-    </div>
 </body>
 </html>

wwwroot/main/Procedure/test6/demo.ashx

@@ -49,101 +49,252 @@ public class demo : IHttpHandler {
                 if (context.Request["m"].ToString() == "zx")
             {
                 string sqlStr = @"SELECT
-                                 TO_CHAR(ROUND(T4.半检合格/T4.半检数量,2)* 100,'9,990.00') || '%'  AS 半检合格率,
-                                 TO_CHAR(ROUND(T4.本烧合格/T4.本烧数量,2)* 100,'9,990.00') || '%'  AS 本烧合格率
-                                FROM(
-                                SELECT 
-                                  T.半检数量,
-                                  T.半检数量 - (CASE WHEN T2.半检不合格数量 IS NULL THEN 0 ELSE T2.半检不合格数量 END) AS 半检合格,
-	                                T1.本烧数量,
-	                                T3.本烧不合格数量,
-	                                T1.本烧数量 - T3.本烧不合格数量 AS 本烧合格,
-	                                T.CREATETIME
-                                FROM (
-                                --半检数量
-                                SELECT DISTINCT
-                                    COUNT( TPPD.BARCODE ) 半检数量,
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd')   as CREATETIME
-                                  FROM
-                                    TP_PM_PRODUCTIONDATA TPPD
-                                    LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
-                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
-                                  WHERE
-                                     TPPD.PROCEDUREID IN (118, 92, 88)
-	                                  AND PGD.TESTFLAG = 0
-		                                AND (SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06')
-                                    AND TPPD.CREATETIME >= trunc(sysdate-6)
-																		AND TPPD.VALUEFLAG = 1
-                                  GROUP BY
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd') 
-		                                ORDER BY to_char(TPPD.CREATETIME, 'yyyymmdd') desc) T
-		                                LEFT JOIN (
-		                                --半检不合格
-		                                SELECT DISTINCT
-                                    NVL(COUNT(TPS.BARCODE),0) 半检不合格数量,
-                                    to_char(TPS.CREATETIME, 'yyyymmdd')   as CREATETIME
-                                  FROM
-                                    TP_PM_SEMICHECK TPS
-                                    LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPS.BARCODE
-                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
-                                  WHERE
-				                               TPS.SEMICHECKTYPE =2
-																		AND TPS.PROCEDUREID IN ( 118, 92, 88) 
-																		AND TPS.CREATETIME >= trunc(sysdate-6)
-																		AND TPGL.TESTFLAG = 0 
-																		AND (SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06')
-																		AND TPS.VALUEFLAG = 1 
-                                  GROUP BY
-                                    to_char(TPS.CREATETIME, 'yyyymmdd') 
-		                                ORDER BY to_char(TPS.CREATETIME, 'yyyymmdd') desc
-		                                )T2 ON T2.CREATETIME = T.CREATETIME
-		                                LEFT JOIN (
-		                                SELECT DISTINCT
-		                                --本烧数量
-                                    COUNT( TPPD.BARCODE ) 本烧数量,
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd')   as CREATETIME
-                                  FROM
-                                    TP_PM_PRODUCTIONDATA TPPD
-                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
-                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
-                                  WHERE
-                                     TPGL.HIGHPRESSUREFLAG = 1
-	                                  AND TPPD.PROCEDUREID IN (104)
-		                                AND TPPD.ISREFIRE = 0
-	                                  AND PGD.TESTFLAG = 0
-		                                AND TPPD.VALUEFLAG = 1
-		                                AND TPPD.checkflag = '1'
-		                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
-                                    AND TPPD.CREATETIME >= trunc(sysdate-6)
-                                  GROUP BY
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd') 
-		                                ORDER BY to_char(TPPD.CREATETIME, 'yyyymmdd') desc) T1 ON T.CREATETIME = T1.CREATETIME
-		                                LEFT JOIN(
-		                                SELECT DISTINCT
-		                                --本烧不合格数量
-                                    COUNT( TPPD.BARCODE ) 本烧不合格数量,
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd')   as CREATETIME
-                                  FROM
-                                    TP_PM_PRODUCTIONDATA TPPD
-                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
-                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
-                                  WHERE
-                                     TPGL.HIGHPRESSUREFLAG = 1
-		                                AND PGD.TESTFLAG = 0
-		                                and TPPD.modeltype IN (-1, -4, -5)  
-		                                and TPPD.CHECKFLAG = 1 
-		                                AND TPPD.GOODSLEVELID IN (6,7)
-	                                  AND TPPD.PROCEDUREID IN (104)
-		                                AND TPPD.ISREFIRE = 0
-		                                AND TPPD.VALUEFLAG = 1
-		                                AND TPPD.checkflag = '1'
-		                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
-                                    AND TPPD.CREATETIME >= trunc(sysdate-6)
-                                  GROUP BY
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd') 
-		                                ORDER BY to_char(TPPD.CREATETIME, 'yyyymmdd') desc
-		                                ) T3 ON T3.CREATETIME = T.CREATETIME 
-                                )T4 ORDER BY CREATETIME DESC";
+									CASE
+		
+										WHEN
+											T4.半检数量 = 0 THEN
+												'100%' ELSE TO_CHAR( ROUND( T4.半检合格 / T4.半检数量, 2 ) * 100, '9,990.00' ) || '%' 
+												END AS 半检合格率,
+										CASE
+			
+												WHEN T4.本烧数量 = 0 THEN
+												'100%' ELSE TO_CHAR( ROUND( T4.本烧合格 / T4.本烧数量, 2 ) * 100, '9,990.00' ) || '%' 
+											END AS 本烧合格率,
+											SUBSTR( T4.CREATETIME, 7, 2 ) AS 日期 
+										FROM
+											(
+											SELECT
+												T.半检数量,
+												T.半检数量 - ( CASE WHEN T2.半检不合格数量 IS NULL THEN 0 ELSE T2.半检不合格数量 END ) AS 半检合格,
+												T1.本烧数量,
+												T3.本烧不合格数量,
+												T1.本烧数量 - T3.本烧不合格数量 AS 本烧合格,
+												T.CREATETIME 
+											FROM
+												(--半检数量
+												SELECT
+												CASE
+					
+													WHEN
+														T2.半检数量 IS NULL THEN
+															0 ELSE T2.半检数量 
+														END 半检数量,
+										T1.CREATETIME CREATETIME 
+									FROM
+										(
+										SELECT
+											0 半检数量,
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) AS CREATETIME 
+										FROM
+											DUAL CONNECT BY ROWNUM <= 7 
+										ORDER BY
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) DESC 
+										) T1
+										LEFT JOIN (
+										SELECT
+											半检数量,
+											CREATETIME 
+										FROM
+											(
+											SELECT DISTINCT
+											CASE
+				
+												WHEN
+													COUNT( TPPD.BARCODE ) IS NULL THEN
+														0 ELSE COUNT( TPPD.BARCODE ) 
+													END 半检数量,
+										to_char( TPPD.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
+									FROM
+										TP_PM_PRODUCTIONDATA TPPD
+										LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
+										LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
+									WHERE
+										TPPD.PROCEDUREID IN ( 118, 92, 88 ) 
+										AND PGD.TESTFLAG = 0 
+										AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+										AND TPPD.CREATETIME >= trunc( SYSDATE - 6 ) 
+										AND TPPD.VALUEFLAG = 1 
+									GROUP BY
+										to_char( TPPD.CREATETIME, 'yyyymmdd' ) 
+									ORDER BY
+										to_char( TPPD.CREATETIME, 'yyyymmdd' ) DESC 
+										) 
+										) T2 ON T1.CREATETIME = T2.CREATETIME 
+									ORDER BY
+										T1.CREATETIME DESC 
+										) T
+										LEFT JOIN (
+										SELECT
+										CASE
+			
+											WHEN
+												T2.半检不合格数量 IS NULL THEN
+													0 ELSE T2.半检不合格数量 
+												END 半检不合格数量,
+										T1.CREATETIME CREATETIME 
+									FROM
+										(
+										SELECT
+											0 半检不合格数量,
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) AS CREATETIME 
+										FROM
+											DUAL CONNECT BY ROWNUM <= 7 
+										ORDER BY
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) DESC 
+										) T1
+										LEFT JOIN (
+										SELECT
+											半检不合格数量,
+											CREATETIME 
+										FROM
+											(--半检不合格
+											SELECT DISTINCT
+												NVL( COUNT( TPS.BARCODE ), 0 ) 半检不合格数量,
+												to_char( TPS.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
+											FROM
+												TP_PM_SEMICHECK TPS
+												LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPS.BARCODE
+												LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
+											WHERE
+												TPS.SEMICHECKTYPE = 2 
+												AND TPS.PROCEDUREID IN ( 118, 92, 88 ) 
+												AND TPS.CREATETIME >= trunc( SYSDATE - 6 ) 
+												AND TPGL.TESTFLAG = 0 
+												AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+												AND TPS.VALUEFLAG = 1 
+											GROUP BY
+												to_char( TPS.CREATETIME, 'yyyymmdd' ) 
+											ORDER BY
+												to_char( TPS.CREATETIME, 'yyyymmdd' ) DESC 
+											) 
+										) T2 ON T1.CREATETIME = T2.CREATETIME 
+									ORDER BY
+										T1.CREATETIME DESC 
+										) T2 ON T2.CREATETIME = T.CREATETIME
+										LEFT JOIN (
+										SELECT
+										CASE
+			
+											WHEN
+												T2.本烧数量 IS NULL THEN
+													0 ELSE T2.本烧数量 
+												END 本烧数量,
+										T1.CREATETIME CREATETIME 
+									FROM
+										(
+										SELECT
+											0 本烧数量,
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) AS CREATETIME 
+										FROM
+											DUAL CONNECT BY ROWNUM <= 7 
+										ORDER BY
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) DESC 
+										) T1
+										LEFT JOIN (
+										SELECT
+											本烧数量,
+											CREATETIME 
+										FROM
+											(
+												SELECT DISTINCT--本烧数量
+												COUNT( TPPD.BARCODE ) 本烧数量,
+												to_char( TPPD.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
+											FROM
+												TP_PM_PRODUCTIONDATA TPPD
+												INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
+												LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
+											WHERE
+												TPPD.PROCEDUREID IN ( 104 ) 
+												AND TPPD.ISREFIRE = 0 
+												AND PGD.TESTFLAG = 0 
+												AND TPPD.VALUEFLAG = 1 
+												AND TPPD.checkflag = '1' 
+												AND TPPD.CREATETIME >= trunc( SYSDATE - 6 ) 
+												AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+											GROUP BY
+												to_char( TPPD.CREATETIME, 'yyyymmdd' ) 
+											ORDER BY
+												to_char( TPPD.CREATETIME, 'yyyymmdd' ) DESC 
+											) 
+										) T2 ON T1.CREATETIME = T2.CREATETIME 
+									ORDER BY
+										T1.CREATETIME DESC 
+										) T1 ON T.CREATETIME = T1.CREATETIME
+										LEFT JOIN (
+										SELECT
+										CASE
+			
+											WHEN
+												T2.本烧不合格数量 IS NULL THEN
+													0 ELSE T2.本烧不合格数量 
+												END 本烧不合格数量,
+										T1.CREATETIME CREATETIME 
+									FROM
+										(
+										SELECT
+											0 本烧不合格数量,
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) AS CREATETIME 
+										FROM
+											DUAL CONNECT BY ROWNUM <= 7 
+										ORDER BY
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) DESC 
+										) T1
+										LEFT JOIN (
+										SELECT
+											本烧不合格数量,
+											CREATETIME 
+										FROM
+											(
+											SELECT
+												to_char( T1.CREATETIME, 'yyyymmdd' ) AS CREATETIME,
+												COUNT( T1.BARCODE ) AS 本烧不合格数量 
+											FROM
+												(
+												SELECT DISTINCT
+													T.BARCODE,
+													TPPD.CREATETIME 
+												FROM
+													TP_PM_PRODUCTIONDATA TPPD
+													LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPPD.GROUTINGLINEID = TPGL.GROUTINGLINEID
+													LEFT JOIN (
+													SELECT
+														TPPD.BARCODE 
+													FROM
+														TP_PM_PRODUCTIONDATA TPPD
+														LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPPD.GROUTINGLINEID = TPGL.GROUTINGLINEID
+														LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
+														LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
+													WHERE
+														TPPD.CHECKTIME >= trunc( SYSDATE - 6 ) 
+														AND TPPD.GOODSLEVELID IN ( 6, 7 ) 
+														AND TPPD.CHECKBATCHNO = 1 
+														AND TPGL.TESTFLAG = 0 
+														AND TMD.DEFECTTYPEID <> 14 
+														AND TPPD.VALUEFLAG = 1 
+														AND TPPD.ISREFIRE = 0 
+														AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+													) T ON T.BARCODE = TPPD.BARCODE 
+												WHERE
+													TPPD.CHECKTIME >= trunc( SYSDATE - 6 ) 
+													AND TPPD.PROCEDUREID IN ( 104 ) 
+													AND length( TPPD.kilncarbatchno ) > 0 
+													AND TPGL.TESTFLAG = 0 
+													AND TPPD.VALUEFLAG = 1 
+													AND TPPD.ISREFIRE = 0 
+													AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+												) T1 
+											GROUP BY
+												to_char( T1.CREATETIME, 'yyyymmdd' ) 
+											ORDER BY
+												to_char( T1.CREATETIME, 'yyyymmdd' ) DESC 
+											) 
+										) T2 ON T1.CREATETIME = T2.CREATETIME 
+									ORDER BY
+										T1.CREATETIME DESC 
+										) T3 ON T3.CREATETIME = T.CREATETIME 
+										) T4 
+									ORDER BY
+										CREATETIME DESC";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/test6/demo.html

@@ -216,9 +216,17 @@
                     var BS5 = parseFloat(json["rows"][4]["本烧合格率"]);
                     var BS6 = parseFloat(json["rows"][5]["本烧合格率"]);
                     var BS7 = parseFloat(json["rows"][6]["本烧合格率"]);
+                    var day1 = parseFloat(json["rows"][0]["日期"]);
+                    var day2 = parseFloat(json["rows"][1]["日期"]);
+                    var day3 = parseFloat(json["rows"][2]["日期"]);
+                    var day4 = parseFloat(json["rows"][3]["日期"]);
+                    var day5 = parseFloat(json["rows"][4]["日期"]);
+                    var day6 = parseFloat(json["rows"][5]["日期"]);
+                    var day7 = parseFloat(json["rows"][6]["日期"]);
 
                     window.DayZL.data.datasets[0].data = [BJ1, BJ2, BJ3, BJ4, BJ5, BJ6, BJ7];
                     window.DayZL.data.datasets[1].data = [BS1, BS2, BS3, BS4, BS5, BS6, BS7];
+                    window.DayZL.data.labels = [day1, day2, day3, day4, day5, day6, day7];
                     window.DayZL.update();
                 }
             });

wwwroot/main/Procedure/test7/demo.ashx

@@ -74,101 +74,252 @@ public class demo : IHttpHandler {
                 if (context.Request["m"].ToString() == "zx")
             {
                 string sqlStr = @"SELECT
-                                 TO_CHAR(ROUND(T4.半检合格/T4.半检数量,2)* 100,'9,990.00') || '%'  AS 半检合格率,
-                                 TO_CHAR(ROUND(T4.本烧合格/T4.本烧数量,2)* 100,'9,990.00') || '%'  AS 本烧合格率
-                                FROM(
-                                SELECT 
-                                  T.半检数量,
-                                  T.半检数量 - (CASE WHEN T2.半检不合格数量 IS NULL THEN 0 ELSE T2.半检不合格数量 END) AS 半检合格,
-	                                T1.本烧数量,
-	                                T3.本烧不合格数量,
-	                                T1.本烧数量 - T3.本烧不合格数量 AS 本烧合格,
-	                                T.CREATETIME
-                                FROM (
-                                --半检数量
-                                SELECT DISTINCT
-                                    COUNT( TPPD.BARCODE ) 半检数量,
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd')   as CREATETIME
-                                  FROM
-                                    TP_PM_PRODUCTIONDATA TPPD
-                                    LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
-                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
-                                  WHERE
-                                     TPPD.PROCEDUREID IN (118, 92, 88)
-	                                  AND PGD.TESTFLAG = 0
-		                                AND (SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06')
-                                    AND TPPD.CREATETIME >= trunc(sysdate-6)
-																		AND TPPD.VALUEFLAG = 1
-                                  GROUP BY
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd') 
-		                                ORDER BY to_char(TPPD.CREATETIME, 'yyyymmdd') desc) T
-		                                LEFT JOIN (
-		                                --半检不合格
-		                                SELECT DISTINCT
-                                    NVL(COUNT(TPS.BARCODE),0) 半检不合格数量,
-                                    to_char(TPS.CREATETIME, 'yyyymmdd')   as CREATETIME
-                                  FROM
-                                    TP_PM_SEMICHECK TPS
-                                    LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPS.BARCODE
-                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
-                                  WHERE
-				                               TPS.SEMICHECKTYPE =2
-																		AND TPS.PROCEDUREID IN ( 118, 92, 88) 
-																		AND TPS.CREATETIME >= trunc(sysdate-6)
-																		AND TPGL.TESTFLAG = 0 
-																		AND (SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06')
-																		AND TPS.VALUEFLAG = 1 
-                                  GROUP BY
-                                    to_char(TPS.CREATETIME, 'yyyymmdd') 
-		                                ORDER BY to_char(TPS.CREATETIME, 'yyyymmdd') desc
-		                                )T2 ON T2.CREATETIME = T.CREATETIME
-		                                LEFT JOIN (
-		                                SELECT DISTINCT
-		                                --本烧数量
-                                    COUNT( TPPD.BARCODE ) 本烧数量,
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd')   as CREATETIME
-                                  FROM
-                                    TP_PM_PRODUCTIONDATA TPPD
-                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
-                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
-                                  WHERE
-                                     TPGL.HIGHPRESSUREFLAG = 1
-	                                  AND TPPD.PROCEDUREID IN (104)
-		                                AND TPPD.ISREFIRE = 0
-	                                  AND PGD.TESTFLAG = 0
-		                                AND TPPD.VALUEFLAG = 1
-		                                AND TPPD.checkflag = '1'
-		                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
-                                    AND TPPD.CREATETIME >= trunc(sysdate-6)
-                                  GROUP BY
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd') 
-		                                ORDER BY to_char(TPPD.CREATETIME, 'yyyymmdd') desc) T1 ON T.CREATETIME = T1.CREATETIME
-		                                LEFT JOIN(
-		                                SELECT DISTINCT
-		                                --本烧不合格数量
-                                    COUNT( TPPD.BARCODE ) 本烧不合格数量,
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd')   as CREATETIME
-                                  FROM
-                                    TP_PM_PRODUCTIONDATA TPPD
-                                    INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
-                                    LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
-                                  WHERE
-                                     TPGL.HIGHPRESSUREFLAG = 1
-		                                AND PGD.TESTFLAG = 0
-		                                and TPPD.modeltype IN (-1, -4, -5)  
-		                                and TPPD.CHECKFLAG = 1 
-		                                AND TPPD.GOODSLEVELID IN (6,7)
-	                                  AND TPPD.PROCEDUREID IN (104)
-		                                AND TPPD.ISREFIRE = 0
-		                                AND TPPD.VALUEFLAG = 1
-		                                AND TPPD.checkflag = '1'
-		                                AND SUBSTR(TPGL.GROUTINGLINENAME, 1, 4) = 'C05A'
-                                    AND TPPD.CREATETIME >= trunc(sysdate-6)
-                                  GROUP BY
-                                    to_char(TPPD.CREATETIME, 'yyyymmdd') 
-		                                ORDER BY to_char(TPPD.CREATETIME, 'yyyymmdd') desc
-		                                ) T3 ON T3.CREATETIME = T.CREATETIME 
-                                )T4 ORDER BY CREATETIME DESC";
+									CASE
+		
+										WHEN
+											T4.半检数量 = 0 THEN
+												'100%' ELSE TO_CHAR( ROUND( T4.半检合格 / T4.半检数量, 2 ) * 100, '9,990.00' ) || '%' 
+												END AS 半检合格率,
+										CASE
+			
+												WHEN T4.本烧数量 = 0 THEN
+												'100%' ELSE TO_CHAR( ROUND( T4.本烧合格 / T4.本烧数量, 2 ) * 100, '9,990.00' ) || '%' 
+											END AS 本烧合格率,
+											SUBSTR( T4.CREATETIME, 7, 2 ) AS 日期 
+										FROM
+											(
+											SELECT
+												T.半检数量,
+												T.半检数量 - ( CASE WHEN T2.半检不合格数量 IS NULL THEN 0 ELSE T2.半检不合格数量 END ) AS 半检合格,
+												T1.本烧数量,
+												T3.本烧不合格数量,
+												T1.本烧数量 - T3.本烧不合格数量 AS 本烧合格,
+												T.CREATETIME 
+											FROM
+												(--半检数量
+												SELECT
+												CASE
+					
+													WHEN
+														T2.半检数量 IS NULL THEN
+															0 ELSE T2.半检数量 
+														END 半检数量,
+										T1.CREATETIME CREATETIME 
+									FROM
+										(
+										SELECT
+											0 半检数量,
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) AS CREATETIME 
+										FROM
+											DUAL CONNECT BY ROWNUM <= 7 
+										ORDER BY
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) DESC 
+										) T1
+										LEFT JOIN (
+										SELECT
+											半检数量,
+											CREATETIME 
+										FROM
+											(
+											SELECT DISTINCT
+											CASE
+				
+												WHEN
+													COUNT( TPPD.BARCODE ) IS NULL THEN
+														0 ELSE COUNT( TPPD.BARCODE ) 
+													END 半检数量,
+										to_char( TPPD.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
+									FROM
+										TP_PM_PRODUCTIONDATA TPPD
+										LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
+										LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
+									WHERE
+										TPPD.PROCEDUREID IN ( 118, 92, 88 ) 
+										AND PGD.TESTFLAG = 0 
+										AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+										AND TPPD.CREATETIME >= trunc( SYSDATE - 6 ) 
+										AND TPPD.VALUEFLAG = 1 
+									GROUP BY
+										to_char( TPPD.CREATETIME, 'yyyymmdd' ) 
+									ORDER BY
+										to_char( TPPD.CREATETIME, 'yyyymmdd' ) DESC 
+										) 
+										) T2 ON T1.CREATETIME = T2.CREATETIME 
+									ORDER BY
+										T1.CREATETIME DESC 
+										) T
+										LEFT JOIN (
+										SELECT
+										CASE
+			
+											WHEN
+												T2.半检不合格数量 IS NULL THEN
+													0 ELSE T2.半检不合格数量 
+												END 半检不合格数量,
+										T1.CREATETIME CREATETIME 
+									FROM
+										(
+										SELECT
+											0 半检不合格数量,
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) AS CREATETIME 
+										FROM
+											DUAL CONNECT BY ROWNUM <= 7 
+										ORDER BY
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) DESC 
+										) T1
+										LEFT JOIN (
+										SELECT
+											半检不合格数量,
+											CREATETIME 
+										FROM
+											(--半检不合格
+											SELECT DISTINCT
+												NVL( COUNT( TPS.BARCODE ), 0 ) 半检不合格数量,
+												to_char( TPS.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
+											FROM
+												TP_PM_SEMICHECK TPS
+												LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPS.BARCODE
+												LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
+											WHERE
+												TPS.SEMICHECKTYPE = 2 
+												AND TPS.PROCEDUREID IN ( 118, 92, 88 ) 
+												AND TPS.CREATETIME >= trunc( SYSDATE - 6 ) 
+												AND TPGL.TESTFLAG = 0 
+												AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+												AND TPS.VALUEFLAG = 1 
+											GROUP BY
+												to_char( TPS.CREATETIME, 'yyyymmdd' ) 
+											ORDER BY
+												to_char( TPS.CREATETIME, 'yyyymmdd' ) DESC 
+											) 
+										) T2 ON T1.CREATETIME = T2.CREATETIME 
+									ORDER BY
+										T1.CREATETIME DESC 
+										) T2 ON T2.CREATETIME = T.CREATETIME
+										LEFT JOIN (
+										SELECT
+										CASE
+			
+											WHEN
+												T2.本烧数量 IS NULL THEN
+													0 ELSE T2.本烧数量 
+												END 本烧数量,
+										T1.CREATETIME CREATETIME 
+									FROM
+										(
+										SELECT
+											0 本烧数量,
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) AS CREATETIME 
+										FROM
+											DUAL CONNECT BY ROWNUM <= 7 
+										ORDER BY
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) DESC 
+										) T1
+										LEFT JOIN (
+										SELECT
+											本烧数量,
+											CREATETIME 
+										FROM
+											(
+												SELECT DISTINCT--本烧数量
+												COUNT( TPPD.BARCODE ) 本烧数量,
+												to_char( TPPD.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
+											FROM
+												TP_PM_PRODUCTIONDATA TPPD
+												INNER JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
+												LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
+											WHERE
+												TPPD.PROCEDUREID IN ( 104 ) 
+												AND TPPD.ISREFIRE = 0 
+												AND PGD.TESTFLAG = 0 
+												AND TPPD.VALUEFLAG = 1 
+												AND TPPD.checkflag = '1' 
+												AND TPPD.CREATETIME >= trunc( SYSDATE - 6 ) 
+												AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+											GROUP BY
+												to_char( TPPD.CREATETIME, 'yyyymmdd' ) 
+											ORDER BY
+												to_char( TPPD.CREATETIME, 'yyyymmdd' ) DESC 
+											) 
+										) T2 ON T1.CREATETIME = T2.CREATETIME 
+									ORDER BY
+										T1.CREATETIME DESC 
+										) T1 ON T.CREATETIME = T1.CREATETIME
+										LEFT JOIN (
+										SELECT
+										CASE
+			
+											WHEN
+												T2.本烧不合格数量 IS NULL THEN
+													0 ELSE T2.本烧不合格数量 
+												END 本烧不合格数量,
+										T1.CREATETIME CREATETIME 
+									FROM
+										(
+										SELECT
+											0 本烧不合格数量,
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) AS CREATETIME 
+										FROM
+											DUAL CONNECT BY ROWNUM <= 7 
+										ORDER BY
+											to_char( ( TRUNC( SYSDATE - 6 ) + ROWNUM - 1 ), 'yyyymmdd' ) DESC 
+										) T1
+										LEFT JOIN (
+										SELECT
+											本烧不合格数量,
+											CREATETIME 
+										FROM
+											(
+											SELECT
+												to_char( T1.CREATETIME, 'yyyymmdd' ) AS CREATETIME,
+												COUNT( T1.BARCODE ) AS 本烧不合格数量 
+											FROM
+												(
+												SELECT DISTINCT
+													T.BARCODE,
+													TPPD.CREATETIME 
+												FROM
+													TP_PM_PRODUCTIONDATA TPPD
+													LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPPD.GROUTINGLINEID = TPGL.GROUTINGLINEID
+													LEFT JOIN (
+													SELECT
+														TPPD.BARCODE 
+													FROM
+														TP_PM_PRODUCTIONDATA TPPD
+														LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPPD.GROUTINGLINEID = TPGL.GROUTINGLINEID
+														LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
+														LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTCODE = TMD.DEFECTCODE 
+													WHERE
+														TPPD.CHECKTIME >= trunc( SYSDATE - 6 ) 
+														AND TPPD.GOODSLEVELID IN ( 6, 7 ) 
+														AND TPPD.CHECKBATCHNO = 1 
+														AND TPGL.TESTFLAG = 0 
+														AND TMD.DEFECTTYPEID <> 14 
+														AND TPPD.VALUEFLAG = 1 
+														AND TPPD.ISREFIRE = 0 
+														AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+													) T ON T.BARCODE = TPPD.BARCODE 
+												WHERE
+													TPPD.CHECKTIME >= trunc( SYSDATE - 6 ) 
+													AND TPPD.PROCEDUREID IN ( 104 ) 
+													AND length( TPPD.kilncarbatchno ) > 0 
+													AND TPGL.TESTFLAG = 0 
+													AND TPPD.VALUEFLAG = 1 
+													AND TPPD.ISREFIRE = 0 
+													AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+												) T1 
+											GROUP BY
+												to_char( T1.CREATETIME, 'yyyymmdd' ) 
+											ORDER BY
+												to_char( T1.CREATETIME, 'yyyymmdd' ) DESC 
+											) 
+										) T2 ON T1.CREATETIME = T2.CREATETIME 
+									ORDER BY
+										T1.CREATETIME DESC 
+										) T3 ON T3.CREATETIME = T.CREATETIME 
+										) T4 
+									ORDER BY
+										CREATETIME DESC";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -221,7 +372,8 @@ public class demo : IHttpHandler {
 											B.检验 AS 检验数量,
 											B.检验 - B.返工 - B.一次不合格 AS 合格品数,
 											B.返工 AS 返工品数,
-											B.返工合格 AS 返工合格数,
+											B.返工不合格 AS 返工不合格数,
+											B.返工 - B.返工不合格 AS 返工合格数,
 											B.检验 - B.一次不合格 - B.二次不合格 AS 综合合格数 
 										FROM
 											(
@@ -241,9 +393,9 @@ public class demo : IHttpHandler {
 										END 一次不合格,
 									CASE
 	
-										WHEN BJFGH.count IS NULL THEN
-										0 ELSE BJFGH.count 
-										END 返工合格,
+										WHEN BJFGBH.count IS NULL THEN
+										0 ELSE BJFGBH.count 
+										END 返工不合格,
 									CASE
 	
 										WHEN BJFFP.count IS NULL THEN
@@ -280,7 +432,7 @@ public class demo : IHttpHandler {
 											T.GROUTINGLINECODE 
 										) BJFG ON BJFG.GOODSCODE = TPPD.GOODSCODE 
 										AND BJFG.GROUTINGLINECODE = TPGL.GROUTINGLINECODE
-										LEFT JOIN (--半检一检返工合格数
+										LEFT JOIN (--半检一检返工不合格数
 										SELECT
 											T.GOODSCODE,
 											T.GROUTINGLINECODE,
@@ -296,7 +448,7 @@ public class demo : IHttpHandler {
 												LEFT JOIN TP_PM_PRODUCTIONDATA TPPD ON TPS.BARCODE = TPPD.BARCODE
 												LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPPD.GROUTINGLINEID = TPGL.GROUTINGLINEID 
 											WHERE
-												TPS.RESEMICHECKTYPE = 1 
+												TPS.RESEMICHECKTYPE IN (2) 
 												AND TPPD.PROCEDUREID IN ( 118, 92, 88 ) 
 												AND TPS.CREATETIME >= TRUNC( SYSDATE ) 
 												AND TPGL.TESTFLAG = 0 
@@ -307,8 +459,8 @@ public class demo : IHttpHandler {
 											T.GROUTINGLINECODE 
 										ORDER BY
 											T.GOODSCODE 
-										) BJFGH ON BJFGH.GOODSCODE = TPPD.GOODSCODE 
-										AND BJFGH.GROUTINGLINECODE = TPGL.GROUTINGLINECODE
+										) BJFGBH ON BJFGBH.GOODSCODE = TPPD.GOODSCODE 
+										AND BJFGBH.GROUTINGLINECODE = TPGL.GROUTINGLINECODE
 										LEFT JOIN (--半检一次不合格
 										SELECT
 											T.GOODSCODE,
@@ -376,7 +528,7 @@ public class demo : IHttpHandler {
 										TPGL.GROUTINGLINECODE,
 										BJFG.count,
 										BJFP.count,
-										BJFGH.count,
+										BJFGBH.count,
 										BJFFP.count 
 									ORDER BY
 										TPPD.GOODSCODE 
@@ -437,7 +589,7 @@ public class demo : IHttpHandler {
 														B.检验 AS 检验数量,
 														B.检验 - B.返工 - B.一次不合格 AS 合格品数,
 														B.返工 AS 返工品数,
-														B.返工合格 AS 返工合格数,
+														B.返工 - B.二次不合格 AS 返工合格数,
 														B.检验 - B.一次不合格 - B.二次不合格 AS 综合合格数 
 													FROM
 														(
@@ -603,7 +755,6 @@ public class demo : IHttpHandler {
 											 ";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
-                   int a = 1;
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }

wwwroot/main/Procedure/test7/demo.html

@@ -201,7 +201,7 @@
                 function () {
                     $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
                     if (--mainRowCount == -1) loadMainTable();
-                }
+                }+                   
             );
         }
 
@@ -274,6 +274,13 @@
                     var BJ5 = parseFloat(json["rows"][4]["半检合格率"]);
                     var BJ6 = parseFloat(json["rows"][5]["半检合格率"]);
                     var BJ7 = parseFloat(json["rows"][6]["半检合格率"]);
+                    var day1 = parseFloat(json["rows"][0]["日期"]);
+                    var day2 = parseFloat(json["rows"][1]["日期"]);
+                    var day3 = parseFloat(json["rows"][2]["日期"]);
+                    var day4 = parseFloat(json["rows"][3]["日期"]);
+                    var day5 = parseFloat(json["rows"][4]["日期"]);
+                    var day6 = parseFloat(json["rows"][5]["日期"]);
+                    var day7 = parseFloat(json["rows"][6]["日期"]);
                     //var BS1 = parseFloat(json["rows"][0]["本烧合格率"]);
                     //var BS2 = parseFloat(json["rows"][1]["本烧合格率"]);
                     //var BS3 = parseFloat(json["rows"][2]["本烧合格率"]);
@@ -283,6 +290,7 @@
                     //var BS7 = parseFloat(json["rows"][6]["本烧合格率"]);
 
                     window.DayZL.data.datasets[0].data = [BJ1, BJ2, BJ3, BJ4, BJ5, BJ6, BJ7];
+                    window.DayZL.data.labels = [day1, day2, day3, day4, day5, day6, day7];
                     //window.DayZL.data.datasets[1].data = [BS1, BS2, BS3, BS4, BS5, BS6, BS7];
                     window.DayZL.update();
                 }