新增二检车间看板 调整部分看板

wwwroot/main/Procedure/test11/warehouse_chart.html

@@ -626,113 +626,113 @@
         <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; background-color: #244270; ">
+                    <div id="t5_1"  class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t5_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <div style="padding: 10px; text-align: center;">
                             <div id="p5_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
                         </div>
                     </div>
@@ -740,113 +740,113 @@
             </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; background-color: #244270;">
+                    <div id="t4_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t4_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <div style="padding: 10px; text-align: center;">
                             <div id="p4_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
                         </div>
                     </div>
@@ -854,113 +854,113 @@
             </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; background-color: #244270;">
+                    <div id="t3_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t3_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <div style="padding: 10px; text-align: center;">
                             <div id="p3_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
                         </div>
                     </div>
@@ -968,113 +968,113 @@
             </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; background-color: #244270;">
+                    <div id="t2_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64"style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t2_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <div style="padding: 10px; text-align: center;">
                             <div id="p2_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
                         </div>
                     </div>
@@ -1082,113 +1082,113 @@
             </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; background-color: #244270;">
+                    <div id="t1_1" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_2" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_3" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_4" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_5" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_6" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_7" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_8" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_9" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_10" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_11" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_12" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_13" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_14" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_15" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <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; background-color: #244270;">
+                    <div id="t1_16" class="easyui-panel" title=" " data-options="collapsible:false,width:64" style="background-color: #244270;">
+                        <div style="padding: 10px; text-align: center; ">
                             <div id="p1_16" data-speed="2000" style="font-size:32px;">&nbsp;</div>
                         </div>
                     </div>
@@ -1252,8 +1252,8 @@
                         <td colspan="10" style="color: white;">修复产品外观检验统计</td>
                     </tr>-->
                     <tr class="tr_title_warning" style="height: 50px;">
-                        <td style="width: 80%; font-size: 10px; padding: 0px 0px 0px 0px;">物料描述</td>
-                        <td style="width: 20%; font-size: 10px; padding: 0px 0px 0px 0px;">产量</td>
+                        <td style="width: 80%; font-size: 10px; padding: 0px 0px 0px 0px;">包装出库产品名称</td>
+                        <td style="width: 20%; font-size: 10px; padding: 0px 0px 0px 0px;">包装产量</td>
                     </tr>
                 </table>
                 <div style=" height: 470px; overflow: hidden; width: 100%;">

wwwroot/main/Procedure/test12/demo.ashx

@@ -0,0 +1,698 @@
+<%@ WebHandler Language="C#" Class="demo" %>
+
+using Curtain.DataAccess;
+using DK.XuWei.WebMes;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Data;
+using System.Web;
+using System.Web.SessionState;
+
+public class demo : IHttpHandler {
+    
+    public void ProcessRequest (HttpContext context) {
+        context.Response.ContentType = "text/plain";
+        context.Response.ContentType = "text/plain";
+        using (IDataAccess conn = DataAccess.Create())
+        {
+				//毛坯库库存
+				if (context.Request["m"].ToString() == "kc")
+            {
+                string sqlStr = @"SELECT
+									CASE WHEN T.GOODSTYPEID = 3 THEN '连体'
+									 WHEN T.GOODSTYPEID = 18 THEN '智能'
+										ELSE '其他' END AS 产品类别,
+									T.count 数量
+									FROM (
+									SELECT
+										GOODSTYPEID,
+										COUNT( * ) count
+									FROM
+										TP_PM_INPRODUCTION TPI
+										LEFT JOIN TP_MST_GOODS TMG ON TPI.GOODSCODE = TMG.GOODSCODE 
+									WHERE
+										TPI.PROCEDUREID = 91 
+									GROUP BY
+										TMG.GOODSTYPEID) T";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+				//每小时产量折线图
+				if (context.Request["m"].ToString() == "h")
+            {
+                string sqlStr = @"SELECT
+									CASE 
+									WHEN T.CREATETIME = 07 THEN '07-08'
+									WHEN T.CREATETIME = 08 THEN '08-09'
+									WHEN T.CREATETIME = 09 THEN '09-10'
+									WHEN T.CREATETIME = 10 THEN '10-11'
+									WHEN T.CREATETIME = 11 THEN '11-12'
+									WHEN T.CREATETIME = 12 THEN '12-13'
+									WHEN T.CREATETIME = 13 THEN '13-14'
+									WHEN T.CREATETIME = 14 THEN '14-15'
+									WHEN T.CREATETIME = 15 THEN '15-16'
+									WHEN T.CREATETIME = 16 THEN '16-17'
+									WHEN T.CREATETIME = 17 THEN '17-18'
+									WHEN T.CREATETIME = 18 THEN '18-19'
+									WHEN T.CREATETIME = 19 THEN '19-20'
+									ELSE
+										'07-09'
+								END AS 日期,
+									CASE
+									WHEN TT.一检数量 IS NULL THEN
+										0
+									ELSE
+										TT.一检数量 
+								END  AS 一检产量
+								FROM
+									(
+									SELECT
+										0 半检数量,
+										'07' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'08' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'09' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'10' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'11' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'12' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'13' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'14' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'15' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'16' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'17' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'18' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'19' AS CREATETIME 
+									FROM
+										DUAL 
+									) T
+									FULL JOIN (
+									SELECT
+										T2.CREATETIME,
+										COUNT( * ) 一检数量 
+									FROM
+										(
+										SELECT
+											SUBSTR( TO_CHAR( TPP.CREATETIME, 'yyyy-mm-dd hh24:mi:ss' ), 12, 2 ) AS CREATETIME 
+										FROM
+											TP_PM_PRODUCTIONDATA TPP 
+										WHERE
+											TPP.PROCEDUREID IN (117) 
+											AND TPP.VALUEFLAG = 1 
+											AND TPP.CREATETIME >= trunc( SYSDATE ) 
+										) T2 
+									GROUP BY
+										T2.CREATETIME 
+									ORDER BY
+									T2.CREATETIME 
+									) TT ON T.CREATETIME = TT.CREATETIME ";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+				//工号产量柱状图
+				if (context.Request["m"].ToString() == "cl")
+            {
+                string sqlStr = @"SELECT
+										TMU.USERCODE 工号,
+										COUNT( * ) 产量 
+									FROM
+										TP_PM_PRODUCTIONDATA TPP
+										LEFT JOIN TP_MST_USER TMU ON TPP.CREATEUSERID = TMU.USERID 
+									WHERE
+										TPP.PROCEDUREID IN (117) 
+										AND TPP.CREATETIME >= trunc( SYSDATE ) 
+										AND TPP.VALUEFLAG = 1 
+									GROUP BY
+										TMU.USERCODE";
+                //直接获取不分页数据
+                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.S_NAME AS 缺陷名称,
+										T.count  AS 数量
+									FROM
+									(SELECT
+										TMD.S_NAME,
+										COUNT( * ) count
+									FROM
+										TP_PM_SEMICHECKDEFECT TPSD
+										LEFT JOIN TP_MST_DEFECT TMD ON TPSD.defectcode = TMD.defectcode 
+									WHERE
+										TPSD.CREATETIME >= TRUNC( SYSDATE ) 
+									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
+-- CASE	
+-- 	WHEN
+-- 		T4.半检数量 = 0 THEN
+-- 			'100%' ELSE TO_CHAR( TRUNC( T4.半检合格 / T4.半检数量, 4 ) * 100, '990.00' ) || '%' 
+-- 			END AS 一检合格率,
+	CASE
+			WHEN T4.二检数量 = 0 THEN
+			'100%' ELSE TO_CHAR( TRUNC( T4.二检合格 / T4.二检数量, 4 ) * 100, '990.00' ) || '%' 
+		END AS 二检合格率,
+		T4.二检数量,
+		SUBSTR( T4.CREATETIME, 7, 2 ) AS 日期 
+	FROM
+		(
+		SELECT
+			T.半检数量,
+			T.半检数量 - ( CASE WHEN T2.半检不合格数量 IS NULL THEN 0 ELSE T2.半检不合格数量 END ) AS 半检合格,
+			T1.二检数量,
+--T2.二检不合格数量,
+			T1.二检数量 - T2.二检不合格数量 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
+		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 ( 117 ) 
+	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 
+	) 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 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.RESEMICHECKTYPE = 2 
+			AND TPS.PROCEDUREID IN ( 117 ) 
+			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 T1.CREATETIME = T2.CREATETIME 
+ORDER BY
+	T1.CREATETIME DESC --) T3 ON T3.CREATETIME = T.CREATETIME
+	
+	) T4 --ON T4.CREATETIME = T.CREATETIME
+	
+ORDER BY
+	CREATETIME DESC";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+
+				//二检产线信息
+				 if (context.Request["m"].ToString() == "MonthTabletwo")
+            {
+                string sqlStr = @"				SELECT
+															B.产品型号 AS 产品型号,
+															B.成型产线 AS 成型产线,
+															B.检验数量 AS 检验数量,
+															B.合格品数 AS 合格品数,
+															B.返工品数 AS 返工品数,
+															B.返工合格数 AS 返工合格数,
+															B.综合合格数 AS 综合合格数,
+															TO_CHAR((B.合格品数/B.检验数量)* 100,'9,990.00') || '%' AS 一次合格率,
+															CASE WHEN B.返工合格数 = 0 AND B.返工品数 > 0 THEN '0%'
+																	 WHEN B.返工合格数 > 0 AND B.返工品数 = 0 THEN '100%' 
+																	 WHEN B.返工合格数 > 0 AND B.返工品数 > 0 THEN  TO_CHAR((B.返工合格数/B.返工品数)* 100,'9,990.00') || '%' ELSE '0%'  END AS 返工合格率,
+															TO_CHAR((B.综合合格数/B.检验数量)* 100,'9,990.00') || '%' AS 综合合格率
+															FROM(
+												SELECT
+													--decode( H.gid, 7, '总计', 3, '合计【' || H.产品型号 || '】', 0, H.产品型号, '--' ) 产品型号,
+													decode( H.gid, 1, '小计', 0, H.产品型号, '总计' ) 产品型号,
+													decode( H.gid, 1, '--', 0, H.成型产线, '--' ) 成型产线,
+													decode( H.gid, 1, H.检验数量, 0, H.检验数量, H.检验数量 ) 检验数量,
+													decode( H.gid, 1, H.合格品数, 0, H.合格品数, H.合格品数 ) 合格品数,
+													decode( H.gid, 1, H.返工品数, 0, H.返工品数, H.返工品数 ) 返工品数,
+													decode( H.gid, 1, H.返工合格数, 0, H.返工合格数, H.返工合格数 ) 返工合格数,
+													decode( H.gid, 1, H.综合合格数, 0, H.综合合格数, H.综合合格数 ) 综合合格数
+												FROM
+													(
+												SELECT
+													grouping_id(Z.产品型号, Z.成型产线) gid,
+													Z.产品型号,
+													Z.成型产线,
+													SUM(Z.检验数量) 检验数量,
+													SUM(Z.合格品数) 合格品数,
+													SUM(Z.返工品数) 返工品数,
+													SUM(Z.返工合格数) 返工合格数,
+													SUM(Z.综合合格数) 综合合格数
+												FROM
+													(
+													SELECT
+														B.GOODSCODE AS 产品型号,
+														B.GROUTINGLINECODE AS 成型产线,
+														B.检验 AS 检验数量,
+														B.检验 - B.返工 - B.一次不合格 AS 合格品数,
+														B.返工 AS 返工品数,
+														B.返工 - B.二次不合格 AS 返工合格数,
+														B.检验 - B.一次不合格 - B.二次不合格 AS 综合合格数 
+													FROM
+														(
+														SELECT
+															TPPD.GOODSCODE,
+															TPGL.GROUTINGLINECODE,
+															COUNT( TPPD.BARCODE ) 检验,
+														CASE
+				
+																WHEN BJFG.count IS NULL THEN
+																0 ELSE BJFG.count 
+															END 返工,
+												CASE
+	
+													WHEN BJFP.count IS NULL THEN
+													0 ELSE BJFP.count 
+													END 一次不合格,
+												CASE
+	
+													WHEN BJFGH.count IS NULL THEN
+													0 ELSE BJFGH.count 
+													END 返工合格,
+												CASE
+	
+													WHEN BJFFP.count IS NULL THEN
+													0 ELSE BJFFP.count 
+													END 二次不合格 
+												FROM
+													TP_PM_PRODUCTIONDATA TPPD
+													LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPPD.GROUTINGLINEID = TPGL.GROUTINGLINEID
+													LEFT JOIN (--半检一检返工数
+													SELECT
+														T.GOODSCODE,
+														T.GROUTINGLINECODE,
+														COUNT( T.BARCODE ) count 
+													FROM
+														(
+														SELECT DISTINCT
+															TPPD.GOODSCODE,
+															TPGL.GROUTINGLINECODE,
+															TPS.BARCODE 
+														FROM
+															TP_PM_SEMICHECK TPS
+															LEFT JOIN TP_PM_PRODUCTIONDATA TPPD ON TPS.BARCODE = TPPD.BARCODE
+															LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPPD.GROUTINGLINEID = TPGL.GROUTINGLINEID 
+														WHERE
+															TPS.SEMICHECKTYPE = 1 
+															AND TPS.PROCEDUREID IN ( 117 ) 
+															AND TPS.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPGL.TESTFLAG = 0 
+															AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+															AND TPS.VALUEFLAG = 1 
+														) T 
+													GROUP BY
+														T.GOODSCODE,
+														T.GROUTINGLINECODE 
+													) BJFG ON BJFG.GOODSCODE = TPPD.GOODSCODE 
+													AND BJFG.GROUTINGLINECODE = TPGL.GROUTINGLINECODE
+													LEFT JOIN (--半检二检返工合格数
+													SELECT
+														T.GOODSCODE,
+														T.GROUTINGLINECODE,
+														COUNT( T.BARCODE ) count 
+													FROM
+														(
+														SELECT DISTINCT
+															TPPD.GOODSCODE,
+															TPGL.GROUTINGLINECODE,
+															TPS.BARCODE 
+														FROM
+															TP_PM_SEMICHECK TPS
+															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 
+															AND TPS.PROCEDUREID IN ( 117 ) 
+															AND TPS.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPGL.TESTFLAG = 0 
+															AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+														) T 
+													GROUP BY
+														T.GOODSCODE,
+														T.GROUTINGLINECODE 
+													ORDER BY
+														T.GOODSCODE 
+													) BJFGH ON BJFGH.GOODSCODE = TPPD.GOODSCODE 
+													AND BJFGH.GROUTINGLINECODE = TPGL.GROUTINGLINECODE
+													LEFT JOIN (--半检一次不合格
+													SELECT
+														T.GOODSCODE,
+														T.GROUTINGLINECODE,
+														COUNT( T.BARCODE ) count 
+													FROM
+														(
+														SELECT DISTINCT
+															TPPD.GOODSCODE,
+															TPGL.GROUTINGLINECODE,
+															TPS.BARCODE 
+														FROM
+															TP_PM_SEMICHECK TPS
+															FULL JOIN TP_PM_PRODUCTIONDATA TPPD ON TPS.BARCODE = TPPD.BARCODE
+															LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPPD.GROUTINGLINEID = TPGL.GROUTINGLINEID 
+														WHERE
+															TPS.SEMICHECKTYPE =2
+															AND TPS.PROCEDUREID IN ( 117 ) 
+															AND TPS.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPGL.TESTFLAG = 0 
+															AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+															AND TPS.VALUEFLAG = 1 
+														) T 
+													GROUP BY
+														T.GOODSCODE,
+														T.GROUTINGLINECODE 
+													) BJFP ON BJFP.GOODSCODE = TPPD.GOODSCODE 
+													AND BJFP.GROUTINGLINECODE = TPGL.GROUTINGLINECODE
+													LEFT JOIN (--半检二次不合格
+													SELECT
+														T.GOODSCODE,
+														T.GROUTINGLINECODE,
+														COUNT( T.BARCODE ) count 
+													FROM
+														(
+														SELECT DISTINCT
+															TPPD.GOODSCODE,
+															TPGL.GROUTINGLINECODE,
+															TPS.BARCODE 
+														FROM
+															TP_PM_SEMICHECK TPS
+															FULL JOIN TP_PM_PRODUCTIONDATA TPPD ON TPS.BARCODE = TPPD.BARCODE
+															LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPPD.GROUTINGLINEID = TPGL.GROUTINGLINEID 
+															WHERE--TPS.GOODSLEVELID IN (13)
+															TPS.RESEMICHECKTYPE = 2 
+															AND TPS.PROCEDUREID IN ( 117 ) 
+															AND TPS.CREATETIME >= TRUNC( SYSDATE ) 
+															AND TPGL.TESTFLAG = 0 
+															AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+															AND TPS.VALUEFLAG = 1 
+														) T 
+													GROUP BY
+														T.GOODSCODE,
+														T.GROUTINGLINECODE 
+													) BJFFP ON BJFP.GOODSCODE = TPPD.GOODSCODE 
+													AND BJFFP.GROUTINGLINECODE = TPGL.GROUTINGLINECODE 
+													WHERE
+													TPPD.CREATETIME >= TRUNC( SYSDATE ) 
+																									AND TPPD.PROCEDUREID IN ( 117 ) 
+																									AND TPGL.TESTFLAG = 0 
+																									AND TPPD.VALUEFLAG = 1 
+																									AND ( SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+												GROUP BY
+													TPPD.GOODSCODE,
+													TPGL.GROUTINGLINECODE,
+													BJFG.count,
+													BJFP.count,
+													BJFGH.count,
+													BJFFP.count 
+												ORDER BY
+													TPPD.GOODSCODE 
+													) B 
+													) Z
+													GROUP BY GROUPING SETS((Z.产品型号),(Z.产品型号,Z.成型产线, Z.检验数量,Z.合格品数, Z.返工品数, Z.返工合格数,Z.综合合格数),())
+													)H) B
+											 ";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+        }
+    }
+ 
+    public bool IsReusable {
+        get {
+            return false;
+        }
+    }
+
+}

wwwroot/main/Procedure/test12/demo.html

@@ -0,0 +1,741 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <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>
+    <title>东科软件</title>
+</head>
+<body style="background-color:black;">
+
+    <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:1840px;height:680px;display:flex;flex-direction:row;">
+                <div style="width: 48%; height: 680px;">
+                    <table cellspacing="0" cellpadding="0" border="0" style="width: 99.8%;">
+                        <tr class="tr_title_warning">
+                            <td colspan="10" style="color: white;">半检二检检验统计</td>
+                        </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>
+                            <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_template" 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;">{成型产线}</td>
+                                    <td style="width: 10%; font-size: 10px; ">{检验数量}</td>
+                                    <td style="width: 10%; font-size: 10px; ">{合格品数}</td>
+                                    <td style="width: 10%; font-size: 10px; ">{返工品数}</td>
+                                    <td style="width: 10%; font-size: 10px; ">{返工合格数}</td>
+                                    <td style="width: 10%; font-size: 10px; ">{综合合格数}</td>
+                                    <td style="width: 10%; font-size: 10px; ">{一次合格率}</td>
+                                    <td style="width: 10%; font-size: 10px; ">{返工合格率}</td>
+                                    <td style="width: 10%; font-size: 10px; ">{综合合格率}</td>
+                                </tr>
+                            </table>
+                        </div>
+                        <table id="dayTable" style="width: 100%; ">
+                        </table>
+                    </div>
+                </div>
+
+                <div style="width: 48%; height: 340px; position: absolute; right: 40px; ">
+                    <div class="d-flex justify-content-center">
+                        <canvas id="canvasHourCL" style="-moz-user-select: none;-webkit-user-select: none;-ms-user-select: none; height:340px;width:100%"></canvas>
+                    </div>
+                </div>
+                <div style="width: 48%; height: 340px; margin-top:365px;margin-left:35px;">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">工号产量</div>
+                    <canvas id="canvasDayCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 280px; width: 100%;margin-top:-38px;"></canvas>
+                </div>
+            </div>
+                
+
+
+            <!--缺陷统计-->
+            <div style="width:1840px;height:230px;display:flex;flex-direction:row;">
+                <div style="width: 25%; height: 230px;">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">半检一检七日趋势图</div>
+                    <canvas id="canvasDayZL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                </div>
+                <div style="width: 25%; height: 230px;">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">成型缺陷（今日TOP3）</div>
+                    <canvas id="canvasDefectA" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                </div> 
+                <div style="width: 25%; height: 230px;">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">半检缺陷（今日TOP3）</div>
+                    <canvas id="canvasDefectB" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                </div>
+                <div style="width: 25%; height: 230px;">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">成型车间设备状态</div>
+                    <canvas id="canvasMonthCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <script>
+        var mainInterval;
+        var mainRowCount = 0;
+        var mainInterva2;
+        var mainRowCoun2 = 0;
+
+        function loadMainTable() {
+            if (mainInterval) {
+                clearInterval(mainInterval);
+                //console.log("Interval Stop!");
+            }
+            $.get("demo.ashx?m=MonthTabletwo", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    $("#dayTable").html("");
+                    for (var i = 0; i < json["rows"].length; i++) {
+                        var temp = $("#dayTable_template").html();
+                        temp = temp.replace("<tbody>", "").replace("</tbody>", ""); 
+                        temp = temp.replace('{产品型号}', json["rows"][i]['产品型号']);
+                        temp = temp.replace('{成型产线}', json["rows"][i]['成型产线']);
+                        temp = temp.replace('{检验数量}', json["rows"][i]['检验数量']);
+                        temp = temp.replace('{合格品数}', json["rows"][i]['合格品数']);
+                        temp = temp.replace('{返工品数}', json["rows"][i]['返工品数']);
+                        temp = temp.replace('{返工合格数}', json["rows"][i]['返工合格数']);
+                        temp = temp.replace('{综合合格数}', json["rows"][i]['综合合格数']);
+                        temp = temp.replace('{一次合格率}', json["rows"][i]['一次合格率']);
+                        temp = temp.replace('{返工合格率}', json["rows"][i]['返工合格率']);
+                        temp = temp.replace('{综合合格率}', json["rows"][i]['综合合格率']);
+                        $("#dayTable").append(temp);
+                    }
+                    mainRowCount = json["rows"].length;
+                    mainInterval = setInterval(mainScroll, 3000);
+                }
+            });
+        }
+
+        function mainScroll() {
+            var scrollHeight = $("#dayTable").find("tr").outerHeight();
+            $("#dayTable").animate({ marginTop: -scrollHeight, }, 500,
+                function () {
+                    $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
+                    if (--mainRowCount == -1) loadMainTable();
+                }
+            );
+        }
+
+        function mainScrol2() {
+            var scrollHeight = $("#dayTabletwo").find("tr").outerHeight();
+            $("#dayTabletwo").animate({ marginTop: -scrollHeight, }, 500,
+                function () {
+                    $(this).css({ marginTop: "0px", }).find("tr:first").appendTo(this);
+                    if (--mainRowCoun2 == -1) loadMainTable1();
+                }
+            );
+        }
+
+        $(document).ready(function () {
+            initData();
+            doGetData = setInterval(function () { timeUpdate(); }, 5000);
+            loadMainTable();
+            DdfectData();
+            setInterval(function () { DdfectData(); }, 5000);
+            DdfectDataB();
+            setInterval(function () { DdfectDataB(); }, 5000);
+            ZxData();
+            setInterval(function () { ZxData(); }, 5000);
+            ClData();
+            setInterval(function () { ClData(); }, 5000);
+            ZxDataH();
+            setInterval(function () { ZxDataH(); }, 5000);
+            ZxData()
+            setInterval(function () { ZxData(); }, 5000);
+        });
+
+        //半检一件七日趋势图
+        function ZxData() {
+            $.get("demo.ashx?m=zx", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    var BJ1 = parseFloat(json["rows"][0]["二检合格率"]);
+                    var BJ2 = parseFloat(json["rows"][1]["二检合格率"]);
+                    var BJ3 = parseFloat(json["rows"][2]["二检合格率"]);
+                    var BJ4 = parseFloat(json["rows"][3]["二检合格率"]);
+                    var BJ5 = parseFloat(json["rows"][4]["二检合格率"]);
+                    var BJ6 = parseFloat(json["rows"][5]["二检合格率"]);
+                    var BJ7 = parseFloat(json["rows"][6]["二检合格率"]);
+                    var day1 = 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 DataKC() {
+            $.get("demo.ashx?m=kc", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    var count1 = parseFloat(json["rows"][0]["数量"]);
+                    var count2 = parseFloat(json["rows"][1]["数量"]);
+                    var goodtype1 = json["rows"][0]["产品类别"];
+                    var goodtype2 = json["rows"][1]["产品类别"];
+                    window.Defectkc.data.datasets[0].data = [count1, count2];
+                    window.Defectkc.data.labels = [goodtype1, goodtype2]
+                    window.Defectkc.update();
+                }
+            });
+        }
+
+        //每小时产量折线图
+        function ZxDataH() {
+            $.get("demo.ashx?m=h", 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 BJ8 = parseFloat(json["rows"][7]["一检产量"]);
+                    var BJ9 = parseFloat(json["rows"][8]["一检产量"]);
+                    var BJ10 = parseFloat(json["rows"][9]["一检产量"]);
+                    var BJ11 = parseFloat(json["rows"][10]["一检产量"]);
+                    var BJ12 = parseFloat(json["rows"][11]["一检产量"]);
+                    var BJ13 = parseFloat(json["rows"][12]["一检产量"]);
+                    var day1 = json["rows"][0]["日期"];
+                    var day2 = json["rows"][1]["日期"];
+                    var day3 = json["rows"][2]["日期"];
+                    var day4 = json["rows"][3]["日期"];
+                    var day5 = json["rows"][4]["日期"];
+                    var day6 = json["rows"][5]["日期"];
+                    var day7 = json["rows"][6]["日期"];
+                    var day8 = json["rows"][7]["日期"];
+                    var day9 = json["rows"][8]["日期"];
+                    var day10 = json["rows"][9]["日期"];
+                    var day11 = json["rows"][10]["日期"];
+                    var day12 = json["rows"][11]["日期"];
+                    var day13 = json["rows"][12]["日期"];
+
+                    window.DayCLH.data.datasets[0].data = [BJ1, BJ2, BJ3, BJ4, BJ5, BJ6, BJ7, BJ8, BJ9, BJ10, BJ11, BJ12, BJ13];
+                    window.DayCLH.data.labels = [day1, day2, day3, day4, day5, day6, day7, day8, day9, day10, day11, day12, day13];
+                    window.DayCLH.update();
+                }
+            });
+        }
+
+        //一检工号产量
+        function ClData() {
+            $.get("demo.ashx?m=cl", function (data) {
+                var json = JSON.parse(data);
+                let a = [];
+                let b = [];
+                if (json["success"] == true) {
+                    //var num = parseInt(json["rows"][0]["ROWNUM"]);
+                    var num = parseInt(json["rows"].length);
+                    for (var i = 0; i < num; i++) {
+                        a.push(parseInt(json["rows"][i]["产量"]));
+                        b.push(json["rows"][i]["工号"]);
+                    }
+                    window.DayCL.data.datasets[0].data = a;
+                    window.DayCL.data.labels = b;
+                    window.DayCL.update();
+                }
+            });
+        }
+
+        function DdfectData() {
+            $.get("demo.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("demo.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 timeUpdate() {
+            loadData();
+
+        }
+
+        function loadData() {
+
+            //成型各项趋势图
+            //window.DayZL.data.datasets[0].data = [
+            //    randomScalingFactor(1) + 80,
+            //    randomScalingFactor(1) + 80,
+            //    randomScalingFactor(1) + 80,
+            //    randomScalingFactor(1) + 80,
+            //    randomScalingFactor(1) + 80,
+            //    randomScalingFactor(1) + 80,
+            //    randomScalingFactor(1) + 80
+            //];
+            //window.DayZL.data.datasets[1].data = [
+            //    randomScalingFactor(1) + 70,
+            //    randomScalingFactor(1) + 70,
+            //    randomScalingFactor(1) + 70,
+            //    randomScalingFactor(1) + 70,
+            //    randomScalingFactor(1) + 70,
+            //    randomScalingFactor(1) + 70,
+            //    randomScalingFactor(1) + 70
+            //];
+            //window.DayZL.update();
+
+            //成型缺陷top5
+            //window.DefectA.data.datasets[0].data = [
+            //    randomScalingFactor(8),
+            //    randomScalingFactor(8),
+            //    randomScalingFactor(8)
+            //];
+            //window.DefectA.update();
+            //成检缺陷top5
+            //window.DefectB.data.datasets[0].data = [
+            //    randomScalingFactor(8),
+            //    randomScalingFactor(8),
+            //    randomScalingFactor(8)
+            //];
+            //window.DefectB.update();
+
+            //产量计划达成
+            window.MonthCL.data.datasets[0].data = [
+                randomScalingFactor(1000),
+                randomScalingFactor(1000)
+            ];
+            window.MonthCL.update();
+        }
+
+        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: 500,
+                                max: 3000
+                            }
+                        }
+                            , {
+                            display: true,
+                            id: 'A',
+                            name: 'A',
+                            scalePositionLeft: false,
+                            position: 'right',
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value2'
+                            },
+                            ticks: {
+                                min: 90,
+                                stepSize: 2,
+                                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.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);
+            //===================================================
+
+            //侧漏气产量柱状图=====================================
+            window.canvasDayCL = {
+                data: {
+                    labels: ["01", "02", "03", "04", "05", "06", "07"],
+                    datasets: [
+                        {
+                            label: "产量",
+                            fill: false,
+                            backgroundColor: color(window.chartColors.blue).alpha(0.6).rgbString(),
+                            borderColor: window.chartColors.blue,
+                            borderWidth: 2,
+                            pointRadius: 15,
+                            data: [0, 0, 0, 0, 0, 0, 0, 0]
+                        }
+                    ]
+                },
+                type: 'bar',
+                options: {
+                    legend: {
+                        display: true
+                    },
+                    title: {
+                        display: true,
+                        text: ""
+                    },
+                    tooltips: {
+                        mode: 'point',
+                        intersect: false
+                    },
+                    responsive: true,
+                    scales: {
+                        xAxes: [{
+                            stacked: false
+                        }],
+                        yAxes: [{
+                            display: true,
+                            stacked: false,
+                            ticks: {
+                                min: 0,
+                                stepSize: 200,
+                                max: 1000
+                            }
+                        }]
+                    }
+
+                }
+            };
+            var ctxDayCL = document.getElementById("canvasDayCL").getContext("2d");
+            window.DayCL = new Chart(ctxDayCL, canvasDayCL);
+            //===================================================
+
+            //每小时产量=========================================
+            window.canvasHourCL = {
+                data: {
+                    labels: [],
+                    datasets: [{
+                        label: "实际产量",
+                        fill: false,
+                        backgroundColor: color(window.chartColors.blue).alpha(0.6).rgbString(),
+                        borderColor: window.chartColors.blue,
+                        borderWidth: 2,
+                        pointRadius: 12,
+                        data: []
+                    }]
+                },
+                type: 'line',
+                options: {
+                    responsive: true,
+                    title: {
+                        display: true,
+                        text: '每小时产量'
+                    },
+                    tooltips: {
+                        mode: 'index',
+                        intersect: false,
+                    },
+                    hover: {
+                        mode: 'nearest',
+                        intersect: true
+                    },
+                    scales: {
+                        xAxes: [{
+                            display: true,
+                            scaleLabel: {
+                                display: false,
+                                labelString: ''
+                            }
+                        }],
+                        yAxes: [{
+                            display: true,
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value'
+                            },
+                            ticks: {
+                                min: 0,
+                                stepSize: 50,
+                                max: 300
+                            }
+                        }]
+                    }
+                }
+            };
+            var ctxHourCL = document.getElementById("canvasHourCL").getContext("2d");
+            window.DayCLH = new Chart(ctxHourCL, canvasHourCL);
+            //===================================================
+
+        }
+
+
+
+    </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>
+</body>
+</html>

wwwroot/main/Procedure/test6/demo.ashx

@@ -16,6 +16,35 @@ public class demo : IHttpHandler {
         context.Response.ContentType = "text/plain";
         using (IDataAccess conn = DataAccess.Create())
         {
+				//成检缺陷扇形图
+                if (context.Request["m"].ToString() == "defectc")
+            {
+                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) 
+										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() == "cl")
             {
@@ -42,7 +71,7 @@ public class demo : IHttpHandler {
                 context.Response.Write(jsonStr);
             }
 
-                //成型缺陷扇形图
+                //半检缺陷扇形图
                 if (context.Request["m"].ToString() == "defect")
             {
                 string sqlStr = @"SELECT

wwwroot/main/Procedure/test6/demo.html

@@ -100,17 +100,17 @@
                     <canvas id="canvasDayZL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
                 </div>
                 <div style="width: 25%; height: 230px;">
-                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">成型缺陷（今日TOP3）</div>
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">半检缺陷（今日TOP3）</div>
                     <canvas id="canvasDefectA" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
                 </div>
+                <div style="width: 25%; height: 230px;">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">成检缺陷（今日TOP3）</div>
+                    <canvas id="canvasDefectC" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                </div>
                 <div style="width: 25%; height: 310px;">
                     <div style="color:white;font-size:20px;font-weight:600; text-align:center">成型工号产量</div>
                     <canvas id="canvasDayCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 280px; width: 100%;margin-top:-38px;"></canvas>
                 </div>
-                <div style="width: 25%; height: 230px;">
-                    <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>
@@ -180,8 +180,27 @@
             setInterval(function () { ZxData(); }, 5000);
             CLData();
             setInterval(function () { CLData(); }, 5000);
+            DdfectDataC();
+            setInterval(function () { DdfectDataC(); }, 5000);
         });
 
+        function DdfectDataC() {
+            $.get("demo.ashx?m=defectc", 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.DefectC.data.datasets[0].data = [defect1, defect2, defect3];
+                    window.DefectC.data.labels = [defectname1, defectname2, defectname3]
+                    window.DefectC.update();
+                }
+            });
+        }
+
         function CLData() {
             $.get("demo.ashx?m=cl", function (data) {
                 var json = JSON.parse(data);
@@ -504,10 +523,10 @@
             window.DayCL = new Chart(ctxDayCL, canvasDayCL);
             //===================================================
 
-            //甲班缺陷===========================================
-            window.configMonthCL = {
+            //成型缺陷TOP5===========================================
+            window.canvasDefectC = {
                 data: {
-                    labels: ['实际产量', '目标产量'],
+                    labels: ['1', '2', '3'],
                     datasets: [{
                         label: '工序',
                         backgroundColor: [
@@ -527,17 +546,17 @@
                         ],
                         borderWidth: 2,
                         pointRadius: 30,
-                        data: [0, 0]
+                        data: [0, 0, 0]
                     }]
                 },
-                type: 'doughnut',
+                type: 'pie',
                 options: {
                     legend: {
                         display: true
                     },
                     title: {
                         display: false,
-                        text: ""
+                        text: "甲班缺陷"
                     },
                     tooltips: {
                         mode: 'point',
@@ -547,8 +566,8 @@
 
                 }
             };
-            var ctxMonthCL = document.getElementById("canvasMonthCL").getContext("2d");
-            window.MonthCL = new Chart(ctxMonthCL, configMonthCL);
+            var ctxDefectC = document.getElementById("canvasDefectC").getContext("2d");
+            window.DefectC = new Chart(ctxDefectC, canvasDefectC);
             //===================================================
 
         }

wwwroot/main/Procedure/test7/demo.ashx

@@ -16,6 +16,170 @@ public class demo : IHttpHandler {
         context.Response.ContentType = "text/plain";
         using (IDataAccess conn = DataAccess.Create())
         {
+				//毛坯库库存
+				if (context.Request["m"].ToString() == "kc")
+            {
+                string sqlStr = @"SELECT
+									CASE WHEN T.GOODSTYPEID = 3 THEN '连体'
+									 WHEN T.GOODSTYPEID = 18 THEN '智能'
+										ELSE '其他' END AS 产品类别,
+									T.count 数量
+									FROM (
+									SELECT
+										GOODSTYPEID,
+										COUNT( * ) count
+									FROM
+										TP_PM_INPRODUCTION TPI
+										LEFT JOIN TP_MST_GOODS TMG ON TPI.GOODSCODE = TMG.GOODSCODE 
+									WHERE
+										TPI.PROCEDUREID = 91 
+									GROUP BY
+										TMG.GOODSTYPEID) T";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+				//每小时产量折线图
+				if (context.Request["m"].ToString() == "h")
+            {
+                string sqlStr = @"SELECT
+									CASE 
+									WHEN T.CREATETIME = 07 THEN '07-08'
+									WHEN T.CREATETIME = 08 THEN '08-09'
+									WHEN T.CREATETIME = 09 THEN '09-10'
+									WHEN T.CREATETIME = 10 THEN '10-11'
+									WHEN T.CREATETIME = 11 THEN '11-12'
+									WHEN T.CREATETIME = 12 THEN '12-13'
+									WHEN T.CREATETIME = 13 THEN '13-14'
+									WHEN T.CREATETIME = 14 THEN '14-15'
+									WHEN T.CREATETIME = 15 THEN '15-16'
+									WHEN T.CREATETIME = 16 THEN '16-17'
+									WHEN T.CREATETIME = 17 THEN '17-18'
+									WHEN T.CREATETIME = 18 THEN '18-19'
+									WHEN T.CREATETIME = 19 THEN '19-20'
+									ELSE
+										'07-09'
+								END AS 日期,
+									CASE
+									WHEN TT.一检数量 IS NULL THEN
+										0
+									ELSE
+										TT.一检数量 
+								END  AS 一检产量
+								FROM
+									(
+									SELECT
+										0 半检数量,
+										'07' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'08' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'09' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'10' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'11' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'12' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'13' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'14' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'15' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'16' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'17' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'18' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
+										'19' AS CREATETIME 
+									FROM
+										DUAL 
+									) T
+									FULL JOIN (
+									SELECT
+										T2.CREATETIME,
+										COUNT( * ) 一检数量 
+									FROM
+										(
+										SELECT
+											SUBSTR( TO_CHAR( TPP.CREATETIME, 'yyyy-mm-dd hh24:mi:ss' ), 12, 2 ) AS CREATETIME 
+										FROM
+											TP_PM_PRODUCTIONDATA TPP 
+										WHERE
+											TPP.PROCEDUREID IN ( 118, 92, 88 ) 
+											AND TPP.VALUEFLAG = 1 
+											AND TPP.CREATETIME >= trunc( SYSDATE ) 
+										) T2 
+									GROUP BY
+										T2.CREATETIME 
+									ORDER BY
+									T2.CREATETIME 
+									) TT ON T.CREATETIME = TT.CREATETIME ";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+				//工号产量柱状图
+				if (context.Request["m"].ToString() == "cl")
+            {
+                string sqlStr = @"SELECT
+										TMU.USERCODE 工号,
+										COUNT( * ) 产量 
+									FROM
+										TP_PM_PRODUCTIONDATA TPP
+										LEFT JOIN TP_MST_USER TMU ON TPP.CREATEUSERID = TMU.USERID 
+									WHERE
+										TPP.PROCEDUREID IN ( 118, 92, 88 ) 
+										AND TPP.CREATETIME >= trunc( SYSDATE ) 
+										AND TPP.VALUEFLAG = 1 
+									GROUP BY
+										TMU.USERCODE";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
                 //成型缺陷扇形图
                 if (context.Request["m"].ToString() == "defect")
             {
@@ -70,7 +234,7 @@ public class demo : IHttpHandler {
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }
-                //半成品折线图
+                //一检折线图
                 if (context.Request["m"].ToString() == "zx")
             {
                 string sqlStr = @"SELECT
@@ -79,12 +243,12 @@ CASE
 	WHEN
 		T4.半检数量 = 0 THEN
 			'100%' ELSE TO_CHAR( TRUNC( T4.半检合格 / T4.半检数量, 4 ) * 100, '990.00' ) || '%' 
-			END AS 半检合格率,
-	CASE
-			
-			WHEN T4.二检数量 = 0 THEN
-			'100%' ELSE TO_CHAR( TRUNC( T4.二检合格 / T4.二检数量, 4 ) * 100, '990.00' ) || '%' 
-		END AS 二检合格率,
+			END AS 一检合格率,
+-- 	CASE
+-- 			WHEN T4.二检数量 = 0 THEN
+-- 			'100%' ELSE TO_CHAR( TRUNC( T4.二检合格 / T4.二检数量, 4 ) * 100, '990.00' ) || '%' 
+-- 		END AS 二检合格率,
+		T4.半检数量,
 		SUBSTR( T4.CREATETIME, 7, 2 ) AS 日期 
 	FROM
 		(

wwwroot/main/Procedure/test7/demo.html

@@ -17,7 +17,7 @@
     <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: 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;">
@@ -64,53 +64,27 @@
                     </div>
                 </div>
 
-                <div style="width: 48%; height: 680px; 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>
-                            <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;">{成型产线}</td>
-                                    <td style="width: 10%; font-size: 10px;">{检验数量}</td>
-                                    <td style="width: 10%; font-size: 10px;">{合格品数}</td>
-                                    <td style="width: 10%; font-size: 10px;">{返工品数}</td>
-                                    <td style="width: 10%; font-size: 10px;">{返工合格数}</td>
-                                    <td style="width: 10%; font-size: 10px;">{综合合格数}</td>
-                                    <td style="width: 10%; font-size: 10px;">{一次合格率}</td>
-                                    <td style="width: 10%; font-size: 10px;">{返工合格率}</td>
-                                    <td style="width: 10%; font-size: 10px;">{综合合格率}</td>
-                                </tr>
-                            </table>
-                        </div>
-                        <table id="dayTabletwo" style="width: 100%; ">
-                        </table>
+                <div style="width: 48%; height: 340px; position: absolute; right: 40px; ">
+                    <div class="d-flex justify-content-center">
+                        <canvas id="canvasHourCL" style="-moz-user-select: none;-webkit-user-select: none;-ms-user-select: none; height:340px;width:100%"></canvas>
                     </div>
                 </div>
+                <div style="width: 24%; height: 340px; margin-top:365px;margin-left:35px;">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">工号产量</div>
+                    <canvas id="canvasDayCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 280px; width: 100%;margin-top:-38px;"></canvas>
+                </div>
+                <div style="width: 24%; height: 380px; right: 40px; margin-top: 365px; ">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center;">毛坯库库存</div>
+                    <canvas id="canvasDefectKC" style="margin-top:15px; -moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
+                </div>
             </div>
-
+                
 
 
             <!--缺陷统计-->
             <div style="width:1840px;height:230px;display:flex;flex-direction:row;">
                 <div style="width: 25%; height: 230px;">
-                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">半检各项趋势图</div>
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">半检一检七日趋势图</div>
                     <canvas id="canvasDayZL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
                 </div>
                 <div style="width: 25%; height: 230px;">
@@ -165,36 +139,6 @@
             });
         }
 
-        function loadMainTable1() {
-            if (mainInterva2) {
-                clearInterval(mainInterva2);
-                //console.log("Interval Stop!");
-            }
-            $.get("demo.ashx?m=MonthTabletwo", 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]['一次合格率']);
-                        temp = temp.replace('{返工合格率}', json["rows"][i]['返工合格率']);
-                        temp = temp.replace('{综合合格率}', json["rows"][i]['综合合格率']);
-                        $("#dayTabletwo").append(temp);
-                    }
-                    mainRowCoun2 = json["rows"].length;
-                    mainInterva2 = setInterval(mainScrol2, 3000);  
-                }
-            });
-        }
-
         function mainScroll() {
             var scrollHeight = $("#dayTable").find("tr").outerHeight();
             $("#dayTable").animate({ marginTop: -scrollHeight, }, 500,
@@ -219,15 +163,131 @@
             initData();
             doGetData = setInterval(function () { timeUpdate(); }, 5000);
             loadMainTable();
-            loadMainTable1();
             DdfectData();
             setInterval(function () { DdfectData(); }, 5000);
             DdfectDataB();
             setInterval(function () { DdfectDataB(); }, 5000);
             ZxData();
             setInterval(function () { ZxData(); }, 5000);
+            ClData();
+            setInterval(function () { ClData(); }, 5000);
+            ZxDataH();
+            setInterval(function () { ZxDataH(); }, 5000);
+            DataKC();
+            setInterval(function () { DataKC(); }, 5000);
+            ZxData()
+            setInterval(function () { ZxData(); }, 5000);
         });
 
+        //半检一件七日趋势图
+        function ZxData() {
+            $.get("demo.ashx?m=zx", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    var BJ1 = parseFloat(json["rows"][0]["一检合格率"]);
+                    var BJ2 = parseFloat(json["rows"][1]["一检合格率"]);
+                    var BJ3 = parseFloat(json["rows"][2]["一检合格率"]);
+                    var BJ4 = parseFloat(json["rows"][3]["一检合格率"]);
+                    var BJ5 = parseFloat(json["rows"][4]["一检合格率"]);
+                    var BJ6 = parseFloat(json["rows"][5]["一检合格率"]);
+                    var BJ7 = parseFloat(json["rows"][6]["一检合格率"]);
+                    var day1 = 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 DataKC() {
+            $.get("demo.ashx?m=kc", function (data) {
+                var json = JSON.parse(data);
+                if (json["success"] == true) {
+                    var count1 = parseFloat(json["rows"][0]["数量"]);
+                    var count2 = parseFloat(json["rows"][1]["数量"]);
+                    var goodtype1 = json["rows"][0]["产品类别"];
+                    var goodtype2 = json["rows"][1]["产品类别"];
+                    window.Defectkc.data.datasets[0].data = [count1, count2];
+                    window.Defectkc.data.labels = [goodtype1, goodtype2]
+                    window.Defectkc.update();
+                }
+            });
+        }
+
+        //每小时产量折线图
+        function ZxDataH() {
+            $.get("demo.ashx?m=h", 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 BJ8 = parseFloat(json["rows"][7]["一检产量"]);
+                    var BJ9 = parseFloat(json["rows"][8]["一检产量"]);
+                    var BJ10 = parseFloat(json["rows"][9]["一检产量"]);
+                    var BJ11 = parseFloat(json["rows"][10]["一检产量"]);
+                    var BJ12 = parseFloat(json["rows"][11]["一检产量"]);
+                    var BJ13 = parseFloat(json["rows"][12]["一检产量"]);
+                    var day1 = json["rows"][0]["日期"];
+                    var day2 = json["rows"][1]["日期"];
+                    var day3 = json["rows"][2]["日期"];
+                    var day4 = json["rows"][3]["日期"];
+                    var day5 = json["rows"][4]["日期"];
+                    var day6 = json["rows"][5]["日期"];
+                    var day7 = json["rows"][6]["日期"];
+                    var day8 = json["rows"][7]["日期"];
+                    var day9 = json["rows"][8]["日期"];
+                    var day10 = json["rows"][9]["日期"];
+                    var day11 = json["rows"][10]["日期"];
+                    var day12 = json["rows"][11]["日期"];
+                    var day13 = json["rows"][12]["日期"];
+
+                    window.DayCLH.data.datasets[0].data = [BJ1, BJ2, BJ3, BJ4, BJ5, BJ6, BJ7, BJ8, BJ9, BJ10, BJ11, BJ12, BJ13];
+                    window.DayCLH.data.labels = [day1, day2, day3, day4, day5, day6, day7, day8, day9, day10, day11, day12, day13];
+                    window.DayCLH.update();
+                }
+            });
+        }
+
+        //一检工号产量
+        function ClData() {
+            $.get("demo.ashx?m=cl", function (data) {
+                var json = JSON.parse(data);
+                let a = [];
+                let b = [];
+                if (json["success"] == true) {
+                    //var num = parseInt(json["rows"][0]["ROWNUM"]);
+                    var num = parseInt(json["rows"].length);
+                    for (var i = 0; i < num; i++) {
+                        a.push(parseInt(json["rows"][i]["产量"]));
+                        b.push(json["rows"][i]["工号"]);
+                    }
+                    window.DayCL.data.datasets[0].data = a;
+                    window.DayCL.data.labels = b;
+                    window.DayCL.update();
+                }
+            });
+        }
+
         function DdfectData() {
             $.get("demo.ashx?m=defect", function (data) {
                 var json = JSON.parse(data);
@@ -262,48 +322,6 @@
             });
         }
 
-        function ZxData() {
-            $.get("demo.ashx?m=zx", function (data) {
-                var json = JSON.parse(data);
-                if (json["success"] == true) {
-                    var BJ1 = parseFloat(json["rows"][0]["半检合格率"]);
-                    var BJ2 = parseFloat(json["rows"][1]["半检合格率"]);
-                    var BJ3 = parseFloat(json["rows"][2]["半检合格率"]);
-                    var BJ4 = parseFloat(json["rows"][3]["半检合格率"]);
-                    var BJ5 = parseFloat(json["rows"][4]["半检合格率"]);
-                    var BJ6 = parseFloat(json["rows"][5]["半检合格率"]);
-                    var BJ7 = parseFloat(json["rows"][6]["半检合格率"]);
-                    var J1 = parseFloat(json["rows"][0]["二检合格率"]);
-                    var J2 = parseFloat(json["rows"][1]["二检合格率"]);
-                    var J3 = parseFloat(json["rows"][2]["二检合格率"]);
-                    var J4 = parseFloat(json["rows"][3]["二检合格率"]);
-                    var J5 = parseFloat(json["rows"][4]["二检合格率"]);
-                    var J6 = parseFloat(json["rows"][5]["二检合格率"]);
-                    var J7 = 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]["本烧合格率"]);
-                    //var BS4 = parseFloat(json["rows"][3]["本烧合格率"]);
-                    //var BS5 = parseFloat(json["rows"][4]["本烧合格率"]);
-                    //var BS6 = parseFloat(json["rows"][5]["本烧合格率"]);
-                    //var BS7 = parseFloat(json["rows"][6]["本烧合格率"]);
-
-                    window.DayZL.data.datasets[0].data = [BJ1, BJ2, BJ3, BJ4, BJ5, BJ6, BJ7];
-                    window.DayZL.data.datasets[1].data = [J1, J2, J3, J4, J5, J6, J7];
-                    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();
-                }
-            });
-        }
-
         function timeUpdate() {
             loadData();
 
@@ -376,31 +394,34 @@
             Chart.defaults.global.defaultFontSize = 18;
             Chart.defaults.global.legend.display = false;
 
-            //成型各项趋势图=====================================
+            //半检一检各项趋势图=====================================
             window.configDayZL = {
                 data: {
                     labels: ["01", "02", "03", "04", "05", "06", "07"],
                     datasets: [{
-                        label: "半检",
-                        backgroundColor: color(window.chartColors.red).alpha(0.35).rgbString(),
+                        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,
+                        fill: false
                     }, {
-                        label: "二检",
-                        backgroundColor: color(window.chartColors.blue).alpha(0.35).rgbString(),
+                        label: '产量',
+                        yAxesGroup: 'B',
+                        yAxisID: 'B',
+                        backgroundColor: color(window.chartColors.blue).alpha(0.5).rgbString(),
                         borderColor: window.chartColors.blue,
-                        borderWidth: 2,
-                        pointRadius: 15,
-                        data: [0, 0, 0, 0, 0, 0, 0],
-                        fill: false,
-                        }]
+                        borderWidth: 1,
+                        data: [100, 100, 100, 100, 100, 100, 100],
+                        fill: false
+                    }]
                 },
-                type: 'line',
+                type: 'bar',
                 options: {
-                    responsive: true,
                     legend: {
                         display: true
                     },
@@ -426,18 +447,39 @@
                         }],
                         yAxes: [{
                             display: true,
+                            id: 'B',
+                            name: 'B',
+                            scalePositionLeft: true,
+                            position: 'left',
                             scaleLabel: {
                                 display: false,
                                 labelString: 'Value'
                             },
                             ticks: {
-                                min: 95,
-                                stepSize: 1,
+                                min: 0,
+                                stepSize: 500,
+                                max: 3000
+                            }
+                        }
+                            , {
+                            display: true,
+                            id: 'A',
+                            name: 'A',
+                            scalePositionLeft: false,
+                            position: 'right',
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value2'
+                            },
+                            ticks: {
+                                min: 90,
+                                stepSize: 2,
                                 max: 100
                             }
                         }]
                     }
                 }
+
             };
             var ctxDayZL = document.getElementById("canvasDayZL").getContext("2d");
             window.DayZL = new Chart(ctxDayZL, configDayZL);
@@ -584,6 +626,159 @@
             window.MonthCL = new Chart(ctxMonthCL, configMonthCL);
             //===================================================
 
+            //侧漏气产量柱状图=====================================
+            window.canvasDayCL = {
+                data: {
+                    labels: ["01", "02", "03", "04", "05", "06", "07"],
+                    datasets: [
+                        {
+                            label: "产量",
+                            fill: false,
+                            backgroundColor: color(window.chartColors.blue).alpha(0.6).rgbString(),
+                            borderColor: window.chartColors.blue,
+                            borderWidth: 2,
+                            pointRadius: 15,
+                            data: [0, 0, 0, 0, 0, 0, 0, 0]
+                        }
+                    ]
+                },
+                type: 'bar',
+                options: {
+                    legend: {
+                        display: true
+                    },
+                    title: {
+                        display: true,
+                        text: ""
+                    },
+                    tooltips: {
+                        mode: 'point',
+                        intersect: false
+                    },
+                    responsive: true,
+                    scales: {
+                        xAxes: [{
+                            stacked: false
+                        }],
+                        yAxes: [{
+                            display: true,
+                            stacked: false,
+                            ticks: {
+                                min: 0,
+                                stepSize: 200,
+                                max: 1000
+                            }
+                        }]
+                    }
+
+                }
+            };
+            var ctxDayCL = document.getElementById("canvasDayCL").getContext("2d");
+            window.DayCL = new Chart(ctxDayCL, canvasDayCL);
+            //===================================================
+
+            //每小时产量=========================================
+            window.canvasHourCL = {
+                data: {
+                    labels: [],
+                    datasets: [{
+                        label: "实际产量",
+                        fill: false,
+                        backgroundColor: color(window.chartColors.blue).alpha(0.6).rgbString(),
+                        borderColor: window.chartColors.blue,
+                        borderWidth: 2,
+                        pointRadius: 12,
+                        data: []
+                    }]
+                },
+                type: 'line',
+                options: {
+                    responsive: true,
+                    title: {
+                        display: true,
+                        text: '每小时产量'
+                    },
+                    tooltips: {
+                        mode: 'index',
+                        intersect: false,
+                    },
+                    hover: {
+                        mode: 'nearest',
+                        intersect: true
+                    },
+                    scales: {
+                        xAxes: [{
+                            display: true,
+                            scaleLabel: {
+                                display: false,
+                                labelString: ''
+                            }
+                        }],
+                        yAxes: [{
+                            display: true,
+                            scaleLabel: {
+                                display: false,
+                                labelString: 'Value'
+                            },
+                            ticks: {
+                                min: 0,
+                                stepSize: 50,
+                                max: 300
+                            }
+                        }]
+                    }
+                }
+            };
+            var ctxHourCL = document.getElementById("canvasHourCL").getContext("2d");
+            window.DayCLH = new Chart(ctxHourCL, canvasHourCL);
+            //===================================================
+
+            //毛坯库库存===========================================
+            window.canvasDefectKC = {
+                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 ctxDefectKc = document.getElementById("canvasDefectKC").getContext("2d");
+            window.Defectkc = new Chart(ctxDefectKc, canvasDefectKC);
+            //===================================================
         }
 
 

wwwroot/main/Procedure/test8/demo.ashx

@@ -16,6 +16,23 @@ public class demo : IHttpHandler {
         context.Response.ContentType = "text/plain";
         using (IDataAccess conn = DataAccess.Create())
         {
+
+				//测漏气产量柱状图
+				if (context.Request["m"].ToString() == "clq")
+            {
+                string sqlStr = @"SELECT
+										SUBSTR( T.REMARKS, 4, 3 ) 工位,
+										T.count 产量 
+									FROM
+										( SELECT REMARKS, COUNT( * ) count FROM TP_PM_GOODSLEAK WHERE CREATETIME >= trunc( SYSDATE ) GROUP BY REMARKS ) T 
+									ORDER BY
+										SUBSTR( T.REMARKS, 4, 3 ) ASC";
+                //直接获取不分页数据
+                DataTable dt = conn.ExecuteDatatable(sqlStr);
+                string jsonStr = new JsonResult(dt).ToJson();
+                context.Response.Write(jsonStr);
+            }
+
 				//成检缺陷位置扇形图
                 if (context.Request["m"].ToString() == "defectw")
             {
@@ -93,12 +110,12 @@ public class demo : IHttpHandler {
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
             }
-                //本烧合格率折线图
+                //烧成合格率折线图
                 if (context.Request["m"].ToString() == "zx")
             {
                 string sqlStr = @"SELECT
 							TO_CHAR( TRUNC( T4.本烧合格 / T4.本烧数量,4) * 100, '9,999.99' ) || '%' AS 合格率,
-							T4.本烧合格 as 本烧合格数, 
+							T4.本烧合格 as 烧成合格数, 
 							SUBSTR(T4.CREATETIME,7,2 ) AS 日期  
 						FROM
 							(

wwwroot/main/Procedure/test8/demo.html

@@ -110,24 +110,20 @@
             <!--缺陷统计-->
             <div style="width:1840px;height:230px;display:flex;flex-direction:row;">
                 <div style="width: 30%; height: 230px;">
-                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">外观检验七日趋势图</div>
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">成品检验七日趋势图</div>
                     <canvas id="canvasDayZL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
                 </div>
-                <div style="width: 18%; height: 230px;">
-                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">外观检验缺陷TOP3</div>
+                <div style="width: 21%; height: 230px;">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">成品检验缺陷TOP3</div>
                     <canvas id="canvasDefectA" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
                 </div>
-                <div style="width: 18%; height: 230px;">
-                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">外观检验缺陷位置TOP3</div>
+                <div style="width: 21%; height: 230px;">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">成品检验缺陷位置TOP3</div>
                     <canvas id="canvasDefectW" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
                 </div>
-                <div style="width: 18%; height: 230px;">
-                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">外观检验车间设备状态</div>
-                    <canvas id="canvasDefectB" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
-                </div>
-                <div style="width: 18%; height: 230px;">
-                    <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 style="width: 30%; height: 310px;">
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">测漏机产量</div>
+                    <canvas id="canvasDayCLQ" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 280px; width: 100%;margin-top:-38px;"></canvas>
                 </div>
             </div>
         </div>
@@ -224,6 +220,8 @@
             doGetData = setInterval(function () { timeUpdate(); }, 5000);
             loadMainTable();
             loadMainTable1();
+            CLQData()
+            setInterval(function () { CLQData(); }, 5000);
             DefectDataW();
             setInterval(function () { DefectDataW(); }, 5000);
             setInterval(function () { DdfectData(); }, 5000);
@@ -233,6 +231,25 @@
             setInterval(function () { ZxData(); }, 5000);
         });
 
+        //测漏气产量
+        function CLQData() {
+            $.get("demo.ashx?m=clq", function (data) {
+                var json = JSON.parse(data);
+                let a = [];
+                let b = [];
+                if (json["success"] == true) {
+                    //var num = parseInt(json["rows"][0]["ROWNUM"]);
+                    var num = parseInt(json["rows"].length);
+                    for (var i = 0; i < num; i++) {
+                        a.push(parseInt(json["rows"][i]["产量"]));
+                        b.push(json["rows"][i]["工位"]);
+                    }
+                    window.DayCLQ.data.datasets[0].data = a;
+                    window.DayCLQ.data.labels = b;
+                    window.DayCLQ.update();
+                }
+            });
+        }
         
         function DefectDataW() {
             $.get("demo.ashx?m=defectw", function (data) {
@@ -303,13 +320,13 @@
                     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]["本烧合格数"]);
+                    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];
@@ -575,98 +592,55 @@
             //===================================================
             
 
-            //成检缺陷TOP5===========================================
-            window.configDefectB = {
+            //侧漏气产量柱状图=====================================
+            window.canvasDayCLQ = {
                 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]
-                    }]
+                    labels: ["01", "02", "03", "04", "05", "06", "07"],
+                    datasets: [
+                        {
+                            label: "测漏量",
+                            fill: false,
+                            backgroundColor: color(window.chartColors.blue).alpha(0.6).rgbString(),
+                            borderColor: window.chartColors.blue,
+                            borderWidth: 2,
+                            pointRadius: 15,
+                            data: [0, 0, 0, 0, 0, 0, 0, 0]
+                        }
+                    ]
                 },
-                type: 'doughnut',
+                type: 'bar',
                 options: {
                     legend: {
                         display: true
                     },
                     title: {
-                        display: false,
+                        display: true,
                         text: ""
                     },
                     tooltips: {
                         mode: 'point',
                         intersect: false
                     },
-                    responsive: true
+                    responsive: true,
+                    scales: {
+                        xAxes: [{
+                            stacked: false
+                        }],
+                        yAxes: [{
+                            display: true,
+                            stacked: false,
+                            ticks: {
+                                min: 0,
+                                stepSize: 100,
+                                max: 500
+                            }
+                        }]
+                    }
 
                 }
             };
-            var ctxMonthCL = document.getElementById("canvasMonthCL").getContext("2d");
-            window.MonthCL = new Chart(ctxMonthCL, configMonthCL);
+            var ctxDayCLQ = document.getElementById("canvasDayCLQ").getContext("2d");
+            window.DayCLQ = new Chart(ctxDayCLQ, canvasDayCLQ);
             //===================================================
 
         }

wwwroot/main/Procedure/test9/demo.ashx

@@ -113,29 +113,31 @@ public class demo : IHttpHandler {
                 if (context.Request["m"].ToString() == "zx")
             {
                 string sqlStr = @"SELECT
-							TO_CHAR( (TRUNC(T4.烧成合格 / T4.烧成数量, 4) ) * 100, '9,999.99' ) || '%' AS 合格率,
-							T4.烧成合格 as 烧成合格数,
-							SUBSTR(T4.CREATETIME,7,2 ) AS 日期
+							TO_CHAR( TRUNC( T4.本烧合格 / T4.本烧数量,4) * 100, '9,999.99' ) || '%' AS 合格率,
+							T4.本烧合格 as 烧成合格数, 
+							SUBSTR(T4.CREATETIME,7,2 ) AS 日期  
 						FROM
 							(
 							SELECT
-								T1.烧成数量,
-								T2.不合格数量,
-								T1.烧成数量 - T2.不合格数量 AS 烧成合格,
+								T1.本烧数量,
+								T2.本烧不合格数量,
+								T1.本烧数量 - T2.本烧不合格数量 AS 本烧合格,
 								T1.CREATETIME 
 							FROM
 								(
-									SELECT DISTINCT--烧成数量
-									COUNT( TPPD.BARCODE ) 烧成数量,
-									to_char( TPPD.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
+									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
+									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 ( 125 ) 
+									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 ) 
 								GROUP BY
 									to_char( TPPD.CREATETIME, 'yyyymmdd' ) 
@@ -145,7 +147,7 @@ public class demo : IHttpHandler {
 								LEFT JOIN (
 								SELECT
 									to_char( T1.CREATETIME, 'yyyymmdd' ) AS CREATETIME,
-									COUNT( T1.BARCODE ) AS 不合格数量 
+									COUNT( T1.BARCODE ) AS 本烧不合格数量 
 								FROM
 									(
 									SELECT DISTINCT
@@ -173,11 +175,11 @@ public class demo : IHttpHandler {
 										) T ON T.BARCODE = TPPD.BARCODE 
 									WHERE
 										TPPD.CHECKTIME >= trunc( SYSDATE - 6 ) 
-										AND TPPD.PROCEDUREID IN ( 125 ) 
+										AND TPPD.PROCEDUREID IN ( 104 ) 
 										AND length( TPPD.kilncarbatchno ) > 0 
 										AND TPGL.TESTFLAG = 0 
 										AND TPPD.VALUEFLAG = 1 
-										--AND TPPD.ISREFIRE = 0 
+										AND TPPD.ISREFIRE = 0 
 									) T1 
 								GROUP BY
 									to_char( T1.CREATETIME, 'yyyymmdd' ) 

wwwroot/main/Procedure/test9/demo.html

@@ -110,15 +110,15 @@
             <!--缺陷统计-->
             <div style="width:1840px;height:230px;display:flex;flex-direction:row;">
                 <div style="width: 30%; height: 230px;">
-                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">外观检验七日趋势图</div>
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">成品检验七日趋势图</div>
                     <canvas id="canvasDayZL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
                 </div>
                 <div style="width: 18%; height: 230px;">
-                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">外观检验缺陷TOP3</div>
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">成品检验缺陷TOP3</div>
                     <canvas id="canvasDefectA" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
                 </div>
                 <div style="width: 18%; height: 230px;">
-                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">外观检验缺陷位置TOP3</div>
+                    <div style="color:white;font-size:20px;font-weight:600; text-align:center">成品检验缺陷位置TOP3</div>
                     <canvas id="canvasDefectW" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%"></canvas>
                 </div>
                 <div style="width: 36%; height: 310px;">