施釉看板 吹尘工号产量调整为近7日产量

wwwroot/main/Procedure/test14/demo.ashx

@@ -236,20 +236,29 @@ public class demo : IHttpHandler {
 				//吹尘工号产量柱状图
 				if (context.Request["m"].ToString() == "cc")
             {
-                string sqlStr = @"				SELECT
-													TPP.USERCODE 工号,
-													COUNT(*) 产量
-												FROM
-													TP_PM_PRODUCTIONDATA TPP
-													LEFT JOIN TP_MST_WORKSTATIONUSER TMWU ON TPP.USERCODE = TMWU.USERCODE
-													LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPP.BARCODE
-													LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
-												WHERE
-													TPP.PROCEDUREID IN ( 115 ) 
-													AND TPP.VALUEFLAG = 1 
-													AND TPGL.TESTFLAG = 0 
-													AND TPP.CREATETIME >= trunc( SYSDATE ) 
-													GROUP BY TPP.USERCODE";
+                string sqlStr = @"	SELECT
+										SUBSTR( T.日期, 6, 2 ) || '-' || SUBSTR( T.日期, 9, 2 ) 日期,
+										T.产量 
+									FROM
+										(
+										SELECT
+											SUBSTR( TO_CHAR( TPP.CREATETIME, 'yyyy-mm-dd hh24:mi:ss' ), 0, 10 ) 日期,
+											COUNT( * ) 产量 
+										FROM
+											TP_PM_PRODUCTIONDATA TPP
+											LEFT JOIN TP_MST_WORKSTATIONUSER TMWU ON TPP.USERCODE = TMWU.USERCODE
+											LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPP.BARCODE
+											LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
+										WHERE
+											TPP.PROCEDUREID IN ( 115 ) 
+											AND TPP.VALUEFLAG = 1 
+											AND TPGL.TESTFLAG = 0 
+											AND TPP.CREATETIME >= trunc( SYSDATE - 7 ) 
+										GROUP BY
+											SUBSTR( TO_CHAR( TPP.CREATETIME, 'yyyy-mm-dd hh24:mi:ss' ), 0, 10 ) 
+										ORDER BY
+										SUBSTR( TO_CHAR( TPP.CREATETIME, 'yyyy-mm-dd hh24:mi:ss' ), 0, 10 ) ASC 
+										) T";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/test14/demo.html

@@ -70,11 +70,11 @@
                         <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="width: 20%; 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="width: 28%; height: 380px; right: 40px; margin-top: 365px; ">
                     <div style="color:white;font-size:20px;font-weight:600; text-align:center">吹尘工号产量</div>
                     <canvas id="canvasDayCC" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 280px; width: 100%;margin-top:-38px;"></canvas>
                 </div>
@@ -328,7 +328,7 @@
                     var num = parseInt(json["rows"].length);
                     for (var i = 0; i < num; i++) {
                         a.push(parseInt(json["rows"][i]["产量"]));
-                        b.push(json["rows"][i]["工号"]);
+                        b.push(json["rows"][i]["日期"]);
                     }
                     window.DayCC.data.datasets[0].data = a;
                     window.DayCC.data.labels = b;