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

gavel/src/main/resources/templates/views/kmes/dashboard/first.html

@@ -314,6 +314,10 @@
         $(window).resize(function () {
             var whei = $(window).width();
             $("html").css({ fontSize: whei / 22 })
+			setTimeout(function(){
+				echartzsy()
+			},200)
+			
         });
         var myChartSdcl = echarts.init(document.getElementById('chartSdcl'));
         var chartRpcdcsj=echarts.init(document.getElementById("chartRpcdcsj"));
@@ -330,7 +334,14 @@
             speed: 60, //数值越大，速度越慢
             rowHeight: 46 //li的高度
         });
-		
+		function echartzsy(){
+			myChartSdcl.resize()
+			chartRpcdcsj.resize()
+			chartHgl.resize()
+			chartRjh.resize()
+			chartYjh.resize()
+			chartJdshCirle.resize()
+		}
 		/* 调用 */
 		function getAlldata(){
 			apisetTimeProductionEchart(myChartSdcl)

gavel/src/main/resources/templates/views/kmes/dashboard/fourth.html

@@ -338,6 +338,9 @@
         var whei = $(window).width()
         $("html").css({ fontSize: whei / 22 });
         $(window).resize(function () {
+			setTimeout(function(){
+				echartzsy()
+			},200)
             var whei = $(window).width();
             $("html").css({ fontSize: whei / 22 })
         });
@@ -361,6 +364,14 @@
 		getPdf(20000)
 		getVideo()
 		/*  */
+		function echartzsy(){
+			myChartSdcl.resize()
+			chartRpcdcsj.resize()
+			chartHgl.resize()
+			chartRjh.resize()
+			chartYjh.resize()
+			chartJdshCirle.resize()
+		}
 		function getAlldata(){
 			apisetTimeProductionEchart(myChartSdcl)
 			apisetDailyDataEchart(chartRpcdcsj)

gavel/src/main/resources/templates/views/kmes/dashboard/second.html

@@ -247,6 +247,9 @@
         var whei = $(window).width()
         $("html").css({ fontSize: whei / 22 });
         $(window).resize(function () {
+			setTimeout(function(){
+				echartzsy()
+			},200)
             var whei = $(window).width();
             $("html").css({ fontSize: whei / 22 })
         });
@@ -274,6 +277,13 @@
 			apisetHglEchart(chartHgl)
 			apiqueryWo()
 		}
+		function echartzsy(){
+			myChartSdcl.resize()
+			chartRpcdcsj.resize()
+			chartHgl.resize()
+			chartRjh.resize()
+			chartYjh.resize()
+		}
 		getAlldata()
 		setInterval(function(){
 			getAlldata()

gavel/src/main/resources/templates/views/kmes/dashboard/third.html

@@ -288,6 +288,9 @@
         var whei = $(window).width()
         $("html").css({ fontSize: whei / 22 });
         $(window).resize(function () {
+			setTimeout(function(){
+				echartzsy()
+			},200)
             var whei = $(window).width();
             $("html").css({ fontSize: whei / 22 })
         });
@@ -306,6 +309,13 @@
             rowHeight: 46 //li的高度
         });
 		/* 分割线 */
+		function echartzsy(){
+			myChartSdcl.resize()
+			chartRjh.resize()
+			chartYjh.resize()
+			chartHgl.resize()
+			chartJdshCirle.resize()
+		}
 		function getAlldata(){
 			apisetTimeProductionEchart(myChartSdcl)
 			apisetPieDailyChart(chartRjh)

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

@@ -123,27 +123,13 @@
 			}
 			gas.post('kmes/gphy/zpwl',{"snid":that.xlh,"mid":that.fkid,"fkid":that.fkid}, function(res){
 				if(res.data&&res.data.records){
-					if(res.data.records==100){
-						let msg="序列号:"+that.xlh+"已经扫描过"
-						zpfk_wrz(that,msg,"error")	
-					}
-					else if(res.data.records==230){
-						let msg="该物料已经装配完成"
-						zpfk_wrz(that,msg,"error")	
-					}
-					else if(res.data.records==200){
-						/* 表格加1 ok标志改变 日志 */
-						zpfk_queryKwellWoinfo2(that).then(function(s){
-							zpfk_queryWoBomByWoid(that,s)
-						})	
-					}
-					else{
-						let msg="查询装配物料:"+that.xlh+"失败"
-						that.xlh=""
-						zpfk_wrz(that,msg,"error")		
-					}
+				let msg="装配物料:"+that.xlh+"成功"
+				zpfk_wrz(that,msg)		
+				zpfk_queryKwellWoinfo2(that).then(function(s){
+					zpfk_queryWoBomByWoid(that,s)
+				})	
 				}else{
-				let msg="查询装配物料:"+that.xlh+"失败"
+				let msg=res.message||"查询装配物料:"+that.xlh+"失败"
 				that.xlh=""
 				zpfk_wrz(that,msg,"error")		
 				}
@@ -167,7 +153,7 @@
 					/* 日志操作 */
 					/* pdf地址 */
 					}else{
-					let msg="查询最新工单信息:"+that.cpsn+"失败"
+					let msg=res.message||"查询最新工单信息:"+that.cpsn+"失败"
 					that.xlh=""
 					zpfk_wrz(that,msg,'error')	
 					screenAlert(that.el,msg,2000)
@@ -195,7 +181,7 @@
 					/* 日志操作 */
 					/* pdf地址 */
 					}else{
-					let msg="查询工单信息:"+that.xlh+"失败"
+					let msg=res.message||"查询工单信息:"+that.xlh+"失败"
 					that.xlh=""
 					zpfk_wrz(that,msg,'error')	
 					screenAlert(that.el,msg,2000)
@@ -214,7 +200,7 @@
 					that.tabdata = res.data.records;
 					that.initpage()
 				}else{
-					let msg="查询装配表格:"+woid+"失败"
+					let msg=res.message||"查询装配表格:"+woid+"失败"
 					zpfk_wrz(that,msg,'error')
 					screenAlert(that.el,msg,2000)
 				}

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

@@ -119,7 +119,7 @@
 						/* 日志操作 */
 						/* pdf地址 */
 						}else{
-						let msg="查询工单信息:"+that.xlh+"失败"
+						let msg=res.message||"查询工单信息:"+that.xlh+"失败"
 						that.xlh=""
 						jyfk_wrz(that,msg,'error')	
 						screenAlert(that.el,msg,2000)

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

@@ -119,7 +119,7 @@
 						/* 日志操作 */
 						/* pdf地址 */
 						}else{
-						let msg="查询工单信息:"+that.xlh+"失败"
+						let msg=res.message||"查询工单信息:"+that.xlh+"失败"
 						that.xlh=""
 						wxfk_wrz(that,msg,'error')	
 						screenAlert(that.el,msg,2000)