Merge branch 'master' of http://s.dev01.dkiboss.com:9001/DK-MES-2.0/HEGII.gt.mes.dashboard

wwwroot/main/Procedure/test13/GradingData.ashx

@@ -238,10 +238,41 @@ WHERE
 	AND TPPD.VALUEFLAG = 1 
 	AND TPPD.PROCEDUREID IN ( 10, 16 )) T
 	UNION ALL
+SELECT
+'Z23' usercode,
+0 num,
+MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE = 'Z23' AND TPPD.CREATETIME >= TRUNC( SYSDATE ) and tppd.valueflag = 1) ) AS countj,
+sum(T.countcg),
+sum(T.countyz),
+sum(T.countlj)
+FROM(
+SELECT
+	TPPD1.BARCODE countj,
+	CASE WHEN TPD.DEFECTCODE = 0148 THEN 1 ELSE 0 END countcg,
+	CASE WHEN TPD.DEFECTCODE = 0149 THEN 1 ELSE 0 END countyz,
+	CASE WHEN TPD.DEFECTCODE IN (0148,0149) THEN 1 ELSE 0 END countlj
+FROM
+	TP_PM_PRODUCTIONDATA TPPD
+	INNER JOIN (
+	SELECT
+				DISTINCT BARCODE 
+	FROM
+		TP_PM_PRODUCTIONDATA TPPD 
+	WHERE
+		TPPD.PROCEDUREID IN ( 9, 15,10,16 ) 
+		--AND TPPD.USERCODE = 'Z23' 
+		AND TPPD.CREATETIME >= TRUNC( SYSDATE ) 
+	) TPPD1 ON TPPD.BARCODE = TPPD1.BARCODE
+	LEFT JOIN TP_PM_DEFECT TPD ON TPD.PRODUCTIONDATAID = TPPD.PRODUCTIONDATAID AND TPD.DEFECTUSERCODE = 'Z23' AND TPD.VALUEFLAG = 1
+WHERE
+	TPPD.UPDATETIME >= TRUNC( SYSDATE ) 
+	AND TPPD.VALUEFLAG = 1 
+	AND TPPD.PROCEDUREID IN ( 10, 16 )) T
+	UNION ALL
   SELECT
 '汇总' usercode,
 1 num,
-MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE IN ('Z20','Z21','Z19','Z18','Z17','Z16') 
+MAX((SELECT COUNT(DISTINCT BARCODE)  FROM TP_PM_PRODUCTIONDATA TPPD  WHERE TPPD.PROCEDUREID IN (9, 15)  AND TPPD.USERCODE IN ('Z23','Z20','Z21','Z19','Z18','Z17','Z16') 
  AND TPPD.CREATETIME >= TRUNC( SYSDATE ) and tppd.valueflag = 1) ) AS countj,
 sum(T.countcg),
 sum(T.countyz),
@@ -261,10 +292,10 @@ FROM
 		TP_PM_PRODUCTIONDATA TPPD 
 	WHERE
 		TPPD.PROCEDUREID IN ( 9, 15,10,16 ) 
-		--AND TPPD.USERCODE IN ('Z20','Z21','Z19','Z18','Z17','Z16') 
+		--AND TPPD.USERCODE IN ('Z23','Z20','Z21','Z19','Z18','Z17','Z16') 
 		AND TPPD.CREATETIME >= TRUNC( SYSDATE ) 
 	) TPPD1 ON TPPD.BARCODE = TPPD1.BARCODE
-	LEFT JOIN TP_PM_DEFECT TPD ON TPD.PRODUCTIONDATAID = TPPD.PRODUCTIONDATAID AND TPD.DEFECTUSERCODE IN ('Z21','Z20','Z19','Z18','Z17','Z16') AND TPD.VALUEFLAG = 1
+	LEFT JOIN TP_PM_DEFECT TPD ON TPD.PRODUCTIONDATAID = TPPD.PRODUCTIONDATAID AND TPD.DEFECTUSERCODE IN ('Z23','Z21','Z20','Z19','Z18','Z17','Z16') AND TPD.VALUEFLAG = 1
 WHERE
 	TPPD.UPDATETIME >= TRUNC( SYSDATE ) 
 	AND TPPD.VALUEFLAG = 1 

wwwroot/main/Procedure/test13/GradingData.html

@@ -30,69 +30,77 @@
         <div style="width: 97.7%; height:65%">
             <table id="数据分级" class="table-hover  table-striped" style=" width: 100%; height: 5%; margin-left: 21px; margin-top: -17px;">
                 <thead style="border: 1px solid #38dcff ">
-                    <tr style="height: 112px; width: 1866px; ">
-                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 65px; color: #f8f9fa; text-align: center ">工 号</td>
-                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 65px; color: #f8f9fa; text-align: center ">检验数</td>
-                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 65px; color: #f8f9fa; text-align: center ">常规漏检</td>
-                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 65px; color: #f8f9fa; text-align: center ">严重漏检</td>
-                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 65px; color: #f8f9fa; text-align: center ">漏检数</td>
-                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 65px; color: #f8f9fa; text-align: center ">漏检率</td>
+                    <tr style="height: 100px; width: 1866px; ">
+                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 55px; color: #f8f9fa; text-align: center ">工 号</td>
+                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 55px; color: #f8f9fa; text-align: center ">检验数</td>
+                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 55px; color: #f8f9fa; text-align: center ">常规漏检</td>
+                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 55px; color: #f8f9fa; text-align: center ">严重漏检</td>
+                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 55px; color: #f8f9fa; text-align: center ">漏检数</td>
+                        <td colspan="2" scope="col" class="text-center" id="wd" style="width: 130px; font-size: 55px; color: #f8f9fa; text-align: center ">漏检率</td>
                     </tr>
-                    <tr style="height: 112px; width: 1866px; ">
-                        <td colspan="2" scope="col" class="text-center" id="usercode1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countj1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countcg1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countyz1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countlj1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="lv1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 65px; color: #f8f9fa; text-align: right "></td>
+                    <tr style="height: 100px; width: 1866px; ">
+                        <td colspan="2" scope="col" class="text-center" id="usercode1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countj1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countcg1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countyz1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countlj1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="lv1" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 55px; color: #f8f9fa; text-align: right "></td>
                     </tr>
-                    <tr style="height: 112px; width: 1866px; ">
-                        <td colspan="2" scope="col" class="text-center" id="usercode2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countj2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countcg2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countyz2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countlj2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="lv2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 65px; color: #f8f9fa; text-align: right "></td>
+                    <tr style="height: 100px; width: 1866px; ">
+                        <td colspan="2" scope="col" class="text-center" id="usercode2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countj2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countcg2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countyz2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countlj2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="lv2" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 55px; color: #f8f9fa; text-align: right "></td>
                     </tr>
-                    <tr style="height: 112px; width: 1866px; ">
-                        <td colspan="2" scope="col" class="text-center" id="usercode3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countj3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countcg3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countyz3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countlj3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="lv3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 65px; color: #f8f9fa; text-align: right "></td>
+                    <tr style="height: 100px; width: 1866px; ">
+                        <td colspan="2" scope="col" class="text-center" id="usercode3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countj3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countcg3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countyz3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countlj3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="lv3" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 55px; color: #f8f9fa; text-align: right "></td>
                     </tr>
-                    <tr style="height: 112px; width: 1866px; ">
-                        <td colspan="2" scope="col" class="text-center" id="usercode4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countj4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countcg4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countyz4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countlj4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="lv4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 65px; color: #f8f9fa; text-align: right "></td>
+                    <tr style="height: 100px; width: 1866px; ">
+                        <td colspan="2" scope="col" class="text-center" id="usercode4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countj4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countcg4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countyz4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countlj4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="lv4" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 55px; color: #f8f9fa; text-align: right "></td>
                     </tr>
-                    <tr style="height: 112px; width: 1866px; ">
-                        <td colspan="2" scope="col" class="text-center" id="usercode5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countj5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countcg5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countyz5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countlj5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="lv5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 65px; color: #f8f9fa; text-align: right "></td>
+                    <tr style="height: 100px; width: 1866px; ">
+                        <td colspan="2" scope="col" class="text-center" id="usercode5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countj5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countcg5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countyz5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countlj5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="lv5" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 55px; color: #f8f9fa; text-align: right "></td>
                     </tr>
-                    <tr style="height: 112px; width: 1866px; ">
-                        <td colspan="2" scope="col" class="text-center" id="usercode6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countj6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countcg6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countyz6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countlj6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="lv6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 65px; color: #f8f9fa; text-align: right "></td>
+                    <tr style="height: 100px; width: 1866px; ">
+                        <td colspan="2" scope="col" class="text-center" id="usercode6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countj6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countcg6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countyz6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countlj6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="lv6" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 55px; color: #f8f9fa; text-align: right "></td>
                     </tr>
-                    <tr style="height: 112px; width: 1866px; ">
-                        <td colspan="2" scope="col" class="text-center" id="usercode7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countj7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: center "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countcg7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countyz7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="countlj7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 70px; color: #f8f9fa; text-align: right "></td>
-                        <td colspan="2" scope="col" class="text-center" id="lv7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 65px; color: #f8f9fa; text-align: right "></td>
+                    <tr style="height: 100px; width: 1866px; ">
+                        <td colspan="2" scope="col" class="text-center" id="usercode7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countj7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countcg7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countyz7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countlj7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="lv7" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 55px; color: #f8f9fa; text-align: right "></td>
+                    </tr>
+                    <tr style="height: 100px; width: 1866px; ">
+                        <td colspan="2" scope="col" class="text-center" id="usercode8" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countj8" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: center "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countcg8" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countyz8" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="countlj8" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 60px; color: #f8f9fa; text-align: right "></td>
+                        <td colspan="2" scope="col" class="text-center" id="lv8" style="padding: 0px 0px 0px 0px; width: 130px; font-size: 55px; color: #f8f9fa; text-align: right "></td>
                     </tr>
                 </thead>
             </table>
@@ -228,6 +236,20 @@
                     else {
                         document.getElementById('lv7').style.color = '';
                     }
+                    $('#usercode8').text(json["rows"][7]["USERCODE"]);
+                    $('#countj8').text(json["rows"][7]["COUNTJ"]);
+                    $('#countcg8').text(json["rows"][7]["COUNTCG"]);
+                    $('#countyz8').text(json["rows"][7]["COUNTYZ"]);
+                    $('#countlj8').text(json["rows"][7]["COUNTLJ"]);
+                    $('#lv8').text(json["rows"][7]["LV"]);
+                    var a8 = json["rows"][7]["LV"];
+                    var lj8 = parseFloat(a8.replace(/[^\d.]/g, ""));
+                    if (lj8 > 0.8) {
+                        document.getElementById('lv8').style.color = 'red';
+                    }
+                    else {
+                        document.getElementById('lv8').style.color = '';
+                    }
                 }
             });
         }

wwwroot/main/Procedure/testHighPressure/HighPressureKanban.ashx

@@ -42,15 +42,58 @@ public class SmallKanban : IHttpHandler
                 string EndTime = string.Empty;
                 //注浆时间
                 string zujiangTime= string.Empty;
+                //当前时间大于6点
                 if (time >= new DateTime(time.Year, time.Month, time.Day, 6, 0, 0))
                 {
+                    //起始时间
                     StartTime = new DateTime(time.Year, time.Month, time.Day, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
-                    EndTime = time.Day== DateTime.DaysInMonth(time.Year, time.Month)?new DateTime(time.Year, time.Month + 1, 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss"): new DateTime(time.Year, time.Month, time.Day+1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    // EndTime = time.Day == DateTime.DaysInMonth(time.Year, time.Month) ? time.Month == 12 ? new DateTime(time.Year + 1, 1, 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss") : new DateTime(time.Year, time.Month + 1, 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss") : new DateTime(time.Year, time.Month, time.Day + 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    //当天为本月最后一天
+                    if (time.Day == DateTime.DaysInMonth(time.Year, time.Month))
+                    {
+                        //当本月为最后一月
+                        if (time.Month == 12)
+                        {
+                            //结束时间置为新年一月一日早6点(明早6点)
+                            EndTime = new DateTime(time.Year + 1, 1, 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                        }
+                        else
+                        {
+                            //结束时间置为下月一日早6点(明早6点)
+                            EndTime = new DateTime(time.Year, time.Month + 1, 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                        }
+                    }
+                    else
+                    {
+                        //结束时间置为明日早6点
+                        EndTime = new DateTime(time.Year, time.Month, time.Day + 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    }
+
                     zujiangTime = time.ToString("yyyy-MM-dd");
                 }
                 else
                 {
-                    StartTime =time.Day == 1?new DateTime(time.Year, time.Month - 1, DateTime.DaysInMonth(time.Year, time.Month - 1), 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss"): new DateTime(time.Year, time.Month, time.Day - 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    // StartTime = time.Day == 1 ? time.Month == 1 ? new DateTime(time.Year - 1, 12, DateTime.DaysInMonth(time.Year - 1, 12), 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss") : new DateTime(time.Year, time.Month - 1, DateTime.DaysInMonth(time.Year, time.Month - 1), 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss") : new DateTime(time.Year, time.Month, time.Day - 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    //今天为当月第一天
+                    if (time.Day == 1)
+                    {
+                        //本月为今年第一日
+                        if (time.Month == 1)
+                        {
+                            //起始时间置为去年最后一天早6点(昨天早6点)
+                            StartTime = new DateTime(time.Year - 1, 12, DateTime.DaysInMonth(time.Year - 1, 12), 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                        }
+                        else
+                        {
+                            //起始时间置为前一月最后一天早6点(昨天早6点)
+                            StartTime = new DateTime(time.Year, time.Month - 1, DateTime.DaysInMonth(time.Year, time.Month - 1), 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                        }
+                    }
+                    else
+                    {
+                        //起始时间置为昨天早6点
+                        StartTime = new DateTime(time.Year, time.Month, time.Day - 1, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
+                    }
                     EndTime = new DateTime(time.Year, time.Month, time.Day, 6, 0, 0).ToString("yyyy-MM-dd HH:mm:ss");
                     zujiangTime = time.AddDays(-1).ToString("yyyy-MM-dd");
                 }