| 
					
				 | 
			
			
				@@ -2146,13 +2146,16 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             //盘头数据处理 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             this.Pan = {};//先存储,设备详情时需要使用到 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if (data == null || data.length == 0) return; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            /* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             var alarmDev = {}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (var i = 0; i < this.AlarmData.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 alarmDev[this.AlarmData[i].code] = 1; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             for (var i = 0; i < data.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 var devCode = data[i].code; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 this.Pan[devCode] = data[i].panPercent 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                /* 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 if (alarmDev[devCode] == 1) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     continue; //该设备有告警,不处理盘头 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2173,7 +2176,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         is20 = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        this.PanAlarm[devCode] = 20 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        //this.PanAlarm[devCode] = 20 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         break 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2197,7 +2200,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         is50 = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        this.PanAlarm[devCode] = 50 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        //this.PanAlarm[devCode] = 50 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         break 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -2209,6 +2212,7 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     //盘头剩余比例正常,隐藏提示标签 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                     ChangeModelColor(devCode) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 |