Merge branch 'master' of gitlab.gavelinfo.com:gavelinfo/kwell-mes

gavel/src/main/java/com/gavel/kwell/dao/impl/GpfkcxDaoImpl.java

@@ -156,17 +156,20 @@ public class GpfkcxDaoImpl extends BaseDaoImpl implements GpfkcxDao {
         sqlMap.append("from GPFKJG  ");
         sqlMap.append("  left join WOGYLX on WOGYLX_ID = GPFKJG_FKGX ");
         sqlMap.append("  left join BZGX on BZGX_ID = WOGYLX_BZGXID  ");
-        sqlMap.append("where (GPFKJG_FKSJ >= :pStart and GPFKJG_FKSJ < :pEnd) and  (WOGYLX_GXBZ = :pDGxbz or WOGYLX_GXBZ = :pMGxbz) ");
-        sqlMap.setParamValue("pStart", DateUtils.beginOfDay(DateUtils.getCurrentWeekDateBegin(date)));
-        sqlMap.setParamValue("pEnd", DateUtils.endOfDay(DateUtils.getCurrentWeekDateEnd(date)));
+        sqlMap.append("where (GPFKJG_FKSJ >= :pKsrq and GPFKJG_FKSJ < :pJsrq) and  (WOGYLX_GXBZ = :pDGxbz or WOGYLX_GXBZ = :pMGxbz) ");
         sqlMap.setParamValue("pDGxbz", GxlxGxbzEnum.ONLY.getId());
         sqlMap.setParamValue("pMGxbz", GxlxGxbzEnum.LAST.getId());
         if(StringUtils.isNotEmpty(woid)){
             sqlMap.append("  and WOGYLX_WOID = :pWoid ");
             sqlMap.setParamValue("pWoid", woid);
         }else {
-            sqlMap.append("  and isnull(WOGYLX_WOID,'') <> '' ");
+            sqlMap.append(" and  exists(select 1 from PCJHMX where PCJHMX_WOID = WOGYLX_WOID ");
+            sqlMap.append(" and( ( :pKsrq <= PCJHMX_JHRQ and U_PCJHMX_JSRQ <= :pJsrq ) ");
+            sqlMap.append(" or ( PCJHMX_JHRQ < :pKsrq  and U_PCJHMX_JSRQ > :pKsrq ) ");
+            sqlMap.append(" or ( PCJHMX_JHRQ < :pJsrq  and U_PCJHMX_JSRQ > :pJsrq))) ");
         }
+        sqlMap.setParamValue("pKsrq", DateUtils.beginOfDay(DateUtils.getCurrentWeekDateBegin(date)));
+        sqlMap.setParamValue("pJsrq", DateUtils.endOfDay(DateUtils.getCurrentWeekDateEnd(date)));
         return sqlMap.queryEntity(Gpfkjg.class);
     }
 

gavel/src/main/resources/static/js/dashboard/echarts.js

@@ -2018,11 +2018,11 @@ function oaechart(chart) {
 						},
 						labelLine: {
 							show: true,
-							
+
 						}
 					}
 				},
-			
+
 		}
 	]
 };
@@ -2075,7 +2075,7 @@ function setproduceEchart(chart,apidata) {
 		splitLine:{
 		   show:false
 		}
-		
+
 	  },
 	  yAxis: {
 	    type: 'value',
@@ -2207,9 +2207,9 @@ function setTimeProductionEchart(chart, apidata) {
 				color: 'rgba(255,255,255,0.6)',
 				formatter: function(value) {
 					var str = "";
-					var num = 6; //每行显示字数 
-					var valLength = value.length; //该项x轴字数  
-					var rowNum = Math.ceil(valLength / num); // 行数  
+					var num = 6; //每行显示字数
+					var valLength = value.length; //该项x轴字数
+					var rowNum = Math.ceil(valLength / num); // 行数
 
 					if (rowNum > 1) {
 						for (var i = 0; i < rowNum; i++) {
@@ -2525,9 +2525,13 @@ function setPieDailyChart(chart, cerpent, pdata) {
 	apidata.wgsl = 0
 	if (pdata) {
 		apidata = pdata
-		if(apidata.wgsl>apidata.jhsl){
-			apidata.wgsl=pidata.jhsl
-		}
+        console.log("apidata")
+		console.log(apidata)
+	}
+	if((apidata.jhsl-apidata.wgsl)<0){
+		var wwcsl=0
+	}else{
+        var wwcsl=apidata.jhsl-apidata.wgsl
 	}
 	var ops = {
 		color: ["#A2E9FF", "#409eff"],
@@ -2569,7 +2573,7 @@ function setPieDailyChart(chart, cerpent, pdata) {
 				}
 			},
 			data: [{
-					value: (apidata.jhsl - apidata.wgsl) || 0,
+					value: wwcsl || 0,
 					name: '未完工'
 				},
 				{
@@ -2846,7 +2850,7 @@ function setRclHglEchart(chart, apidata1, apidata2) {
 					},
 					splitLine: {
 						show: false,
-			
+
 					},
 					axisTick: {
 						show: true,
@@ -2859,7 +2863,7 @@ function setRclHglEchart(chart, apidata1, apidata2) {
 						lineStyle: {
 							color: 'white',
 						}
-			
+
 					},
 					axisLabel: {
 						show: true,

gavel/src/main/resources/templates/views/kmes/gphy/index.html

@@ -183,6 +183,7 @@
 				return
 			}
 			zpfk_apizpfk(that).then(function(s){
+						zpfk_pdfshow(that,s)
 						zpfk_queryWoBomByWoid(that,s)
 						zpfk_apigetjs(that)
 					})
@@ -207,7 +208,6 @@
 		}
 		/* pdfshow gxid登录页传进来 */
 		function zpfk_pdfshow(e,woid){
-			console.log("pdf")
 			let that=e
 			let newpdfurl=pdfUr+"/"+woid+"/"+window.bzlx
 			if (newpdfurl!=that.pdfurl){
@@ -215,11 +215,9 @@
 				if(that.sivpdf){
 					clearInterval(that.sivpdf)
 				}
-				/*
-				 老pdf禁用
 				 pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
 					that.sivpdf = e
-				}) */
+				})
 			}
 		}
 		/* 初始化表格 */
@@ -534,11 +532,10 @@
 				},
 				methods: {
 					scroll(){
-						console.log(urlo)
 						/* test */
-						pdfshow(urlo,'kwrkb01pdf', 10000).then(e => {
-							that.sivpdf = e
-						})
+						// pdfshow(urlo,'kwrkb01pdf', 10000).then(e => {
+						// 	that.sivpdf = e
+						// })
 						/* test */
 						pdfshow(urlt,'kwrkb01rpdf', 10000).then(e => {
 							that.sivrpdf = e

gavel/src/main/resources/templates/views/kmes/gpjy/index.html

@@ -155,6 +155,7 @@
 				}
 				jyfk_wrz(that,"正在查询序列号:"+that.xlh)
 				jyfk_apijyfk(that).then(function(s){
+							jyfk_pdfshow(that,s)
 							jyfk_apigetjs(that)
 						})
 			}
@@ -183,7 +184,15 @@
 			function jyfk_pdfshow(e,woid){
 				let that=e
 				let newpdfurl=pdfUr+"/"+woid+"/"+window.bzlx
-				/* 作废 */
+				if (newpdfurl!=that.pdfurl){
+					that.pdfurl=newpdfurl
+					if(that.sivpdf){
+						clearInterval(that.sivpdf)
+					}
+					 pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
+						that.sivpdf = e
+					})
+				}
 			}
 
 		</script>
@@ -477,9 +486,9 @@
 			methods:{
 				scroll(){
 					/* test */
-					pdfshow(urlo,'gpjypdf', 10000).then(e => {
-						that.sivpdf = e
-					})
+					// pdfshow(urlo,'gpjypdf', 10000).then(e => {
+					// 	that.sivpdf = e
+					// })
 					/* test */
 					pdfshow(urlt,'gpjyrpdf', 10000).then(e => {
 						that.sivrpdf = e

gavel/src/main/resources/templates/views/kmes/gpwx/index.html

@@ -92,16 +92,16 @@
 			function wxfk_pdfshow(e,woid){
 				let that=e
 				let newpdfurl=pdfUr+"/"+woid+"/"+window.bzlx
-				// that.pdf=""
-				// if (newpdfurl!=that.pdfurl){
-				// 	that.pdfurl=newpdfurl
-				// 	if(that.sivpdf){
-				// 		clearInterval(that.sivpdf)
-				// 	}
-				// 	pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
-				// 		that.sivpdf = e
-				// 	})
-				// }
+				that.pdf=""
+				if (newpdfurl!=that.pdfurl){
+					that.pdfurl=newpdfurl
+					if(that.sivpdf){
+						clearInterval(that.sivpdf)
+					}
+					pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
+						that.sivpdf = e
+					})
+				}
 			}
 			/* 反馈技计数 */
 			function wxfk_apigetjs(s){
@@ -172,6 +172,7 @@
 				
 				wxfk_wrz(that,"正在查询序列号:"+that.xlh)
 				wxfk_apiwxfk(that).then(function(s){
+							wxfk_pdfshow(that,s)
 							wxfk_apigetjs(that)
 						})
 			}
@@ -486,9 +487,9 @@
 			methods:{
 				scroll(){
 					/* test */
-					pdfshow(urlo,'gpwxpdf', 10000).then(e => {
-						that.sivpdf = e
-					})
+					// pdfshow(urlo,'gpwxpdf', 10000).then(e => {
+					// 	that.sivpdf = e
+					// })
 					/* test */
 					pdfshow(urlt,'gpwxrpdf', 10000).then(e => {
 						that.sivrpdf = e

gavel/src/main/resources/templates/views/kmes/jgfk/index.html

@@ -167,6 +167,7 @@
 			}
 			
 			jgfk_apijgfk(that).then(function(s){
+				jgfk_pdfshow(that,s)
 				jgfk_apigetjs(that)
 				jgfk_queryWoBomByWoid(that,s)
 				})
@@ -199,11 +200,9 @@
 				if(that.sivpdf){
 					clearInterval(that.sivpdf)
 				}
-				/*
-				 老pdf禁用
 				 pdfshow(that.pdfurl, that.pdfdom, 10000).then(e => {
 					that.sivpdf = e
-				}) */
+				})
 			}
 		}
 		/* 初始化表格 */