三车间看板调整

wwwroot/main/Procedure/test12/demo.ashx

@@ -45,6 +45,7 @@ public class demo : IHttpHandler {
             {
                 string sqlStr = @"SELECT
 									CASE 
+									WHEN T.CREATETIME = 06 THEN '06-07'
 									WHEN T.CREATETIME = 07 THEN '07-08'
 									WHEN T.CREATETIME = 08 THEN '08-09'
 									WHEN T.CREATETIME = 09 THEN '09-10'
@@ -59,18 +60,24 @@ public class demo : IHttpHandler {
 									WHEN T.CREATETIME = 18 THEN '18-19'
 									WHEN T.CREATETIME = 19 THEN '19-20'
 									ELSE
-										'07-09'
+										'00-00'
 								END AS 日期,
 									CASE
 									WHEN TT.一检数量 IS NULL THEN
 										0
 									ELSE
 										TT.一检数量 
-								END  AS 一检产量
+								END  AS 一检产量,
+								TT2.预期产量
 								FROM
 									(
 									SELECT
 										0 半检数量,
+										'06' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
 										'07' AS CREATETIME 
 									FROM
 										DUAL UNION ALL
@@ -154,7 +161,79 @@ public class demo : IHttpHandler {
 										T2.CREATETIME 
 									ORDER BY
 									T2.CREATETIME 
-									) TT ON T.CREATETIME = TT.CREATETIME ";
+									) TT ON T.CREATETIME = TT.CREATETIME
+									FULL JOIN (
+									SELECT
+										0 预期产量,
+										'06' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'07' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'08' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'09' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'10' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'11' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										60 预期产量,
+										'12' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'13' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'14' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'15' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'16' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										60 预期产量,
+										'17' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'18' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'19' AS CREATETIME 
+									FROM
+										DUAL 
+									) TT2 ON T.CREATETIME = TT2.CREATETIME ";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();

wwwroot/main/Procedure/test12/demo.html

@@ -251,6 +251,21 @@
                     var BJ11 = parseFloat(json["rows"][10]["一检产量"]);
                     var BJ12 = parseFloat(json["rows"][11]["一检产量"]);
                     var BJ13 = parseFloat(json["rows"][12]["一检产量"]);
+                    var BJ14 = parseFloat(json["rows"][13]["一检产量"]);
+                    var YQ1 = parseFloat(json["rows"][0]["预期产量"]);
+                    var YQ2 = parseFloat(json["rows"][1]["预期产量"]);
+                    var YQ3 = parseFloat(json["rows"][2]["预期产量"]);
+                    var YQ4 = parseFloat(json["rows"][3]["预期产量"]);
+                    var YQ5 = parseFloat(json["rows"][4]["预期产量"]);
+                    var YQ6 = parseFloat(json["rows"][5]["预期产量"]);
+                    var YQ7 = parseFloat(json["rows"][6]["预期产量"]);
+                    var YQ8 = parseFloat(json["rows"][7]["预期产量"]);
+                    var YQ9 = parseFloat(json["rows"][8]["预期产量"]);
+                    var YQ10 = parseFloat(json["rows"][9]["预期产量"]);
+                    var YQ11 = parseFloat(json["rows"][10]["预期产量"]);
+                    var YQ12 = parseFloat(json["rows"][11]["预期产量"]);
+                    var YQ13 = parseFloat(json["rows"][12]["预期产量"]);
+                    var YQ14 = parseFloat(json["rows"][13]["预期产量"]);
                     var day1 = json["rows"][0]["日期"];
                     var day2 = json["rows"][1]["日期"];
                     var day3 = json["rows"][2]["日期"];
@@ -264,9 +279,11 @@
                     var day11 = json["rows"][10]["日期"];
                     var day12 = json["rows"][11]["日期"];
                     var day13 = json["rows"][12]["日期"];
+                    var day14 = json["rows"][13]["日期"];
 
-                    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.data.datasets[0].data = [BJ1, BJ2, BJ3, BJ4, BJ5, BJ6, BJ7, BJ8, BJ9, BJ10, BJ11, BJ12, BJ13, BJ14];
+                    window.DayCLH.data.datasets[1].data = [YQ1, YQ2, YQ3, YQ4, YQ5, YQ6, YQ7, YQ8, YQ9, YQ10, YQ11, YQ12, YQ13, YQ14];
+                    window.DayCLH.data.labels = [day1, day2, day3, day4, day5, day6, day7, day8, day9, day10, day11, day12, day13,day14];
                     window.DayCLH.update();
                 }
             });
@@ -669,8 +686,8 @@
                             stacked: false,
                             ticks: {
                                 min: 0,
-                                stepSize: 200,
-                                max: 1000
+                                stepSize: 100,
+                                max: 500
                             }
                         }]
                     }
@@ -684,7 +701,7 @@
             //每小时产量=========================================
             window.canvasHourCL = {
                 data: {
-                    labels: [],
+                    labels: [0,0,0,0,0,0],
                     datasets: [{
                         label: "实际产量",
                         fill: false,
@@ -692,8 +709,17 @@
                         borderColor: window.chartColors.blue,
                         borderWidth: 2,
                         pointRadius: 12,
-                        data: []
-                    }]
+                        data: [0,0,0,0,0,0]
+                    }, {
+                            label: "预期产量",
+                            fill: false,
+                            backgroundColor: color(window.chartColors.red).alpha(0.6).rgbString(),
+                            borderColor: window.chartColors.red,
+                            borderWidth: 2,
+                            pointRadius: 12,
+                            data: [0,0,0,0,0,0]
+                        }
+                    ]
                 },
                 type: 'line',
                 options: {

wwwroot/main/Procedure/test14/demo.ashx

@@ -30,9 +30,9 @@ public class demo : IHttpHandler {
 										COUNT( * ) count
 									FROM
 										TP_PM_INPRODUCTION TPI
-										LEFT JOIN TP_MST_GOODS TMG ON TPI.GOODSCODE = TMG.GOODSCODE 
+										LEFT JOIN TP_MST_GOODS TMG ON TPI.GOODSCODE = TMG.GOODSCODE
 									WHERE
-										TPI.PROCEDUREID = 97 
+										TPI.PROCEDUREID = 97
 									GROUP BY
 										TMG.GOODSTYPEID) T";
                 //直接获取不分页数据
@@ -445,19 +445,20 @@ CASE
 										to_char( TPPD.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
 									FROM
 										TP_PM_PRODUCTIONDATA TPPD
-										RIGHT JOIN (
+										LEFT JOIN (
 												SELECT
-													TPPD.BARCODE 
+													TPPD.BARCODE,TPPD.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 = 98 
-													AND TPPD.CREATETIME >= trunc( SYSDATE - 6 )
+													TPPD.PROCEDUREID IN (98) 
+													--AND TPPD.CREATETIME >= trunc( SYSDATE - 6 ) 
 													AND TPPD.VALUEFLAG = 1
 													AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
 													AND TPGL.TESTFLAG = 0 
+													AND TPPD.ISREFIRE = 0
 												) TPPB
 												ON TPPB.BARCODE = TPPD.BARCODE
 										LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
@@ -501,43 +502,43 @@ CASE
 											成检不合格数,
 											CREATETIME 
 										FROM
-											(--成检不合格
+											(
 											SELECT DISTINCT
-												NVL( COUNT( DISTINCT TPPD.BARCODE ), 0 ) 成检不合格数,--成检本烧最后一次检验判断为次品和重烧数
+												NVL( COUNT( DISTINCT TPPB.BARCODE ), 0 ) 成检不合格数,--成检本烧最后一次检验判断为次品和重烧数
 												to_char( TPPD.CREATETIME, 'yyyymmdd' ) AS CREATETIME 
 											FROM
 												TP_PM_PRODUCTIONDATA TPPD
-												RIGHT JOIN (
+												LEFT JOIN(
 												SELECT
 													DISTINCT
 													TPPD.BARCODE 
 												FROM
-													TP_PM_PRODUCTIONDATA TPPD
-													LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
-													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 = 98 
-													AND TPD.DEFECTNAME IS NOT NULL
-													AND TPPD.CREATETIME >= trunc( SYSDATE - 6 )
-													AND TPPD.VALUEFLAG = 1
-													AND TPGL.TESTFLAG = 0 
-													AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
-												) TPPB
-												ON TPPB.BARCODE = TPPD.BARCODE
+												TP_PM_PRODUCTIONDATA TPPD
 												LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
 												LEFT JOIN TP_PM_GROUTINGDAILYDETAIL PGD ON PGD.BARCODE = TPPD.BARCODE
 												LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID 
 											WHERE
 												 CHECKBATCHNO = 1
-												AND GOODSLEVELID IN (6,7)
+												AND TPPD.GOODSLEVELID IN (6,7)
 												AND TPD.DEFECTNAME IS NOT NULL
 												AND ISREFIRE IN (0)
-												AND TPPD.CREATETIME >= trunc( SYSDATE - 6 ) 
+												AND TPPD.CREATETIME >= trunc( SYSDATE - 6 )
 												AND TPGL.TESTFLAG = 0 
 												AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
 												AND TPPD.VALUEFLAG = 1 
-											GROUP BY
+												)TPPB
+												ON TPPB.BARCODE = TPPD.BARCODE
+												LEFT JOIN TP_PM_DEFECT TPD ON TPPD.BARCODE = TPD.BARCODE
+													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 = 98 
+													AND TPD.DEFECTNAME IS NOT NULL
+													--AND TPPD.CREATETIME >= trunc( SYSDATE - 6 )
+													AND TPPD.VALUEFLAG = 1
+													AND TPGL.TESTFLAG = 0 
+													AND ( SUBSTR( TPGL.GROUTINGLINENAME, 1, 3 ) = 'C05' OR SUBSTR( TPGL.GROUTINGLINECODE, 1, 3 ) = 'C06' ) 
+													GROUP BY
 												to_char( TPPD.CREATETIME, 'yyyymmdd' ) 
 											ORDER BY
 												to_char( TPPD.CREATETIME, 'yyyymmdd' ) DESC 

wwwroot/main/Procedure/test14/demo.html

@@ -10,7 +10,7 @@
     <script src="/Plugins/jquery-3.4.1/jquery-3.4.1.min.js"></script>
     <script src="/Plugins/animate/xanimate.js"></script>
     <script src="/Plugins/xrequest/xrequest.min.js"></script>
-    <title>东科软件</title>
+    <title>东科软件</title> 
 </head>
 <body style="background-color:black;">
 
@@ -79,7 +79,7 @@
                     <canvas id="canvasDayCC" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 280px; width: 100%;margin-top:-38px;"></canvas>
                 </div>
             </div>
-                
+             
 
              
             <!--缺陷统计-->
@@ -115,7 +115,7 @@
                 clearInterval(mainInterval);
                 //console.log("Interval Stop!");
             }
-            $.get("demo.ashx?m=MonthTable", function (data) {
+            $.get("demo.ashx?m=MonthTable", function (data){
                 var json = JSON.parse(data);
                 if (json["success"] == true) {
                     $("#dayTable").html("");
@@ -125,7 +125,7 @@
                         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]['施釉流量']);
@@ -183,8 +183,8 @@
         });
 
         //精坯库库存
-        function DataKC() {
-            $.get("demo.ashx?m=kc", function (data) {
+        function DataKC(){
+            $.get("demo.ashx?m=kc", function (data){
                 var json = JSON.parse(data);
                 if (json["success"] == true) {
                     var count1 = parseFloat(json["rows"][0]["数量"]);
@@ -199,8 +199,8 @@
         }
 
         //施釉七日趋势图
-        function ZxData() {
-            $.get("demo.ashx?m=zx", function (data) {
+        function ZxData(){
+            $.get("demo.ashx?m=zx", function (data){
                 var json = JSON.parse(data);
                 if (json["success"] == true) {
                     var BJ1 = parseFloat(json["rows"][0]["施釉合格率"]);

wwwroot/main/Procedure/test6/demo.html

@@ -122,11 +122,11 @@
         function loadMainTable() {
             if (mainInterval) {
                 clearInterval(mainInterval);
-                console.log("Interval Stop!");
+                console.log("Interval Stop!"); 
             }
-            $.get("demo.ashx?m=MonthTable", function (data) {
+            $.get("demo.ashx?m=MonthTable", function (data){
                 var json = JSON.parse(data);
-                if (json["success"] == true) {
+                if (json["success"] == true){
                     $("#dayTable").html("");
                     for (var i = 0; i < json["rows"].length; i++) {
                         var temp = $("#dayTable_template").html();
@@ -164,7 +164,7 @@
                         var rc1 = parseInt(rc.replace(/[^\d.]/g, ""));
                         //获取月半检合格率
                         var yb = document.getElementById("dayTable").rows[i].cells[17].innerHTML;
-                        var yb1 = parseInt(yb.replace(/[^\d.]/g, ""));
+                        var yb1 = parseInt(yb.replace(/[^\d.]/g, ""));  
                         //获取月成检合格率
                         var yc = document.getElementById("dayTable").rows[i].cells[20].innerHTML;
                         var yc1 = parseInt(yc.replace(/[^\d.]/g, ""));

wwwroot/main/Procedure/test7/demo.ashx

@@ -45,6 +45,7 @@ public class demo : IHttpHandler {
             {
                 string sqlStr = @"SELECT
 									CASE 
+									WHEN T.CREATETIME = 06 THEN '06-07'
 									WHEN T.CREATETIME = 07 THEN '07-08'
 									WHEN T.CREATETIME = 08 THEN '08-09'
 									WHEN T.CREATETIME = 09 THEN '09-10'
@@ -59,18 +60,24 @@ public class demo : IHttpHandler {
 									WHEN T.CREATETIME = 18 THEN '18-19'
 									WHEN T.CREATETIME = 19 THEN '19-20'
 									ELSE
-										'07-09'
+										'00-00'
 								END AS 日期,
 									CASE
 									WHEN TT.一检数量 IS NULL THEN
 										0
 									ELSE
 										TT.一检数量 
-								END  AS 一检产量
+								END  AS 一检产量,
+								TT2.预期产量
 								FROM
 									(
 									SELECT
 										0 半检数量,
+										'06' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										0 半检数量,
 										'07' AS CREATETIME 
 									FROM
 										DUAL UNION ALL
@@ -154,7 +161,79 @@ public class demo : IHttpHandler {
 										T2.CREATETIME 
 									ORDER BY
 									T2.CREATETIME 
-									) TT ON T.CREATETIME = TT.CREATETIME ";
+									) TT ON T.CREATETIME = TT.CREATETIME
+									FULL JOIN (
+									SELECT
+										0 预期产量,
+										'06' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'07' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'08' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'09' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'10' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'11' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										60 预期产量,
+										'12' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'13' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'14' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'15' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'16' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										60 预期产量,
+										'17' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'18' AS CREATETIME 
+									FROM
+										DUAL UNION ALL
+									SELECT
+										120 预期产量,
+										'19' AS CREATETIME 
+									FROM
+										DUAL 
+									) TT2 ON T.CREATETIME = TT2.CREATETIME";
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
@@ -297,13 +376,13 @@ FROM
 				
 			WHEN
 				COUNT( TPPD.BARCODE ) IS NULL THEN
-					0 ELSE COUNT( TPPD.BARCODE ) 
+					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 
+	LEFT JOIN TP_PC_GROUTINGLINE TPGL ON TPGL.GROUTINGLINEID = PGD.GROUTINGLINEID
 WHERE
 	TPPD.PROCEDUREID IN ( 118, 92, 88 ) 
 	AND PGD.TESTFLAG = 0 

wwwroot/main/Procedure/test7/demo.html

@@ -118,9 +118,9 @@
                 var json = JSON.parse(data);
                 if (json["success"] == true) {
                     $("#dayTable").html("");
-                    for (var i = 0; i < json["rows"].length; i++) {
+                    for (var i = 0; i < json["rows"].length; i++){
                         var temp = $("#dayTable_template").html();
-                        temp = temp.replace("<tbody>", "").replace("</tbody>", ""); 
+                        temp = temp.replace("<tbody>", "").replace("</tbody>", "");
                         temp = temp.replace('{产品型号}', json["rows"][i]['产品型号']);
                         temp = temp.replace('{成型产线}', json["rows"][i]['成型产线']);
                         temp = temp.replace('{检验数量}', json["rows"][i]['检验数量']);
@@ -139,7 +139,7 @@
                         var rb = document.getElementById("dayTable").rows[i].cells[9].innerHTML;
                         var rb1 = parseInt(rb.replace(/[^\d.]/g, ""));
                         //判断日成检合格率
-                        if (rb1 < 95) {
+                        if (rb1 < 95){
                             document.getElementById("dayTable").rows[i].cells[9].style.color = 'red';
                         }
                     }
@@ -169,7 +169,7 @@
             );
         }
 
-        $(document).ready(function () {
+        $(document).ready(function (){
             initData();
             doGetData = setInterval(function () { timeUpdate(); }, 5000);
             loadMainTable();
@@ -257,6 +257,20 @@
                     var BJ11 = parseFloat(json["rows"][10]["一检产量"]);
                     var BJ12 = parseFloat(json["rows"][11]["一检产量"]);
                     var BJ13 = parseFloat(json["rows"][12]["一检产量"]);
+                    var YQ1 = parseFloat(json["rows"][0]["预期产量"]);
+                    var YQ2 = parseFloat(json["rows"][1]["预期产量"]);
+                    var YQ3 = parseFloat(json["rows"][2]["预期产量"]);
+                    var YQ4 = parseFloat(json["rows"][3]["预期产量"]);
+                    var YQ5 = parseFloat(json["rows"][4]["预期产量"]);
+                    var YQ6 = parseFloat(json["rows"][5]["预期产量"]);
+                    var YQ7 = parseFloat(json["rows"][6]["预期产量"]);
+                    var YQ8 = parseFloat(json["rows"][7]["预期产量"]);
+                    var YQ9 = parseFloat(json["rows"][8]["预期产量"]);
+                    var YQ10 = parseFloat(json["rows"][9]["预期产量"]);
+                    var YQ11 = parseFloat(json["rows"][10]["预期产量"]);
+                    var YQ12 = parseFloat(json["rows"][11]["预期产量"]);
+                    var YQ13 = parseFloat(json["rows"][12]["预期产量"]);
+                    var YQ14 = parseFloat(json["rows"][13]["预期产量"]);
                     var day1 = json["rows"][0]["日期"];
                     var day2 = json["rows"][1]["日期"];
                     var day3 = json["rows"][2]["日期"];
@@ -272,6 +286,7 @@
                     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.datasets[1].data = [YQ1, YQ2, YQ3, YQ4, YQ5, YQ6, YQ7, YQ8, YQ9, YQ10, YQ11, YQ12, YQ13, YQ14];
                     window.DayCLH.data.labels = [day1, day2, day3, day4, day5, day6, day7, day8, day9, day10, day11, day12, day13];
                     window.DayCLH.update();
                 }
@@ -703,7 +718,15 @@
                         borderWidth: 2,
                         pointRadius: 12,
                         data: []
-                    }]
+                    }, {
+                            label: "预期产量",
+                            fill: false,
+                            backgroundColor: color(window.chartColors.red).alpha(0.6).rgbString(),
+                            borderColor: window.chartColors.red,
+                            borderWidth: 2,
+                            pointRadius: 12,
+                            data: []
+                        }]
                 },
                 type: 'line',
                 options: {