| 
					
				 | 
			
			
				@@ -55,7 +55,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <tr><td>双棍刷毛次数(次)</td><td>{{ ReplaceNull(line1Data.qz.sm,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.sm,'-') }}</td></tr> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <tr><td>电(kWh)</td><td>{{ ReplaceNull(line1Data.qz.elect,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.elect,'-') }}</td></tr> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <tr><td>导热油(GJ)</td><td>{{ ReplaceNull(line1Data.qz.oil,'-') }}</td><td >{{ ReplaceNull(line2Data.qz.oil,'-') }}</td></tr> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                <tr style="background-color: transparent;"><td style="border-left: 1px solid #7DA2CD;width: 15%;">印染</td><td>印花次数(次)</td><td>{{ ReplaceNull(line1Data.yh,'-') }}</td><td >{{ ReplaceNull(line2Data.yh,'-') }}</td></tr> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                <tr style="background-color: transparent;"><td style="border-left: 1px solid #7DA2CD;width: 15%;">印染</td><td>印花次数(次)</td><td>{{ ReplaceNull(line1Data.yr.yh,'-') }}</td><td >{{ ReplaceNull(line2Data.yr.yh,'-') }}</td></tr> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <tr style="background-color: #016a7c;"><td rowspan="8" style="border-left: 1px solid #7DA2CD;width: 15%;">后整</td><td>定型次数(次)</td><td>{{ ReplaceNull(line1Data.hz.dx,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.dx,'-') }}</td></tr> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <tr><td>高梳次数(次)</td><td>{{ ReplaceNull(line1Data.hz.gs,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.gs,'-') }}</td></tr> 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 <tr><td>刷毛次数(次)</td><td>{{ ReplaceNull(line1Data.hz.sm,'-') }}</td><td >{{ ReplaceNull(line2Data.hz.sm,'-') }}</td></tr> 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -127,6 +127,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     line2Data.value=res.data[1]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     line1Data.value['qz'] = line1Data.value['qz']||{}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     line1Data.value['hz'] = line1Data.value['hz']||{}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    line1Data.value['yr'] = line1Data.value['yr']||{}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     var tmp={}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     /* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     for(var key in line2Data.value){ 
			 |