| 
					
				 | 
			
			
				@@ -304,6 +304,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         let required = {}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         let normal = {}; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         let chapter = {required: [],normal: []} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        let requiredkeys = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        let normalkeys = []; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         for( let i in list){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           let item = list[i]; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           if( item.required){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -311,19 +313,21 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               required[ item.chapterName] = required[ item.chapterName]+item.xs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               required[ item.chapterName ] = item.xs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              requiredkeys.push( item.chapterName ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             if( normal[ item.chapterName] ){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               normal[ item.chapterName] = normal[ item.chapterName]+item.xs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               normal[ item.chapterName ] = item.xs 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+              normalkeys.push( item.chapterName ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        for( let name in required){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        for( let name of requiredkeys){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           chapter.required.push({name: name, active: false, xs:required[name]}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-        for( let name in normal){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        for( let name of normalkeys){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           chapter.normal.push({name: name, active: false, xs:normal[name]}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         this.chapter = chapter; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -344,6 +348,8 @@ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               item.percent = getPercent(item)||0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				               return item; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            this.list.sort((i,j)=>{ return i.chapter-j.chapter?1:-1;}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            console.log( this.list ) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             this.calcChapter( this.list ); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             this.updateShowList() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				           } 
			 |