bug修改
This commit is contained in:
		
							parent
							
								
									4344c389b0
								
							
						
					
					
						commit
						045dc56d59
					
				| @ -317,7 +317,7 @@ struct Index { | |||||||
|       } |       } | ||||||
|       if (no1 == 6) { |       if (no1 == 6) { | ||||||
|         const name = decodeURI(systemParm.txt1) |         const name = decodeURI(systemParm.txt1) | ||||||
|         // 夜间行驶 |         // 白考过滤掉夜间行驶 | ||||||
|         if (this.mode !== 2 && no2 == 13) { |         if (this.mode !== 2 && no2 == 13) { | ||||||
|           return |           return | ||||||
|         } |         } | ||||||
| @ -326,15 +326,21 @@ struct Index { | |||||||
|           return |           return | ||||||
|         } |         } | ||||||
|         let isRequired = allItems.includes(no2 + '') |         let isRequired = allItems.includes(no2 + '') | ||||||
|  |         let isEnd = false | ||||||
|  |         let isUpload = false | ||||||
|  | 
 | ||||||
|  |         // 夜考除夜间行驶其他项目不需要重复上传 | ||||||
|  |         if (this.mode === 2 && no2 != 13) { | ||||||
|  |           isUpload = true | ||||||
|  |         } | ||||||
|  |         // 夜考靠边停车设置为非必须 | ||||||
|         if (this.mode === 2 && no2 == 11) { |         if (this.mode === 2 && no2 == 11) { | ||||||
|           isRequired = false |           isRequired = false | ||||||
|         } |         } | ||||||
|  |         // 加减档自动完成,为非必须项目 | ||||||
|         if (no2 == 14) { |         if (no2 == 14) { | ||||||
|           isRequired = false |           isRequired = false | ||||||
|         } |         } | ||||||
|         if (no2 == 13 && this.mode === 1) { |  | ||||||
|           isRequired = false |  | ||||||
|         } |  | ||||||
|         const currentProject: Project = { |         const currentProject: Project = { | ||||||
|           name, |           name, | ||||||
|           abbreviation: decodeURI(systemParm.txt3), |           abbreviation: decodeURI(systemParm.txt3), | ||||||
| @ -343,19 +349,10 @@ struct Index { | |||||||
|           // 白考夜间行驶非必考 |           // 白考夜间行驶非必考 | ||||||
|           isRequired, |           isRequired, | ||||||
|           //是否考过了 |           //是否考过了 | ||||||
|           isEnd: !(this.mode === 2 && no2 == 13 && this.kssycs != '1'), |           isEnd, | ||||||
|           //项目开始数据是否上传过 |           //项目开始数据是否上传过 | ||||||
|           isUpload: !(this.mode === 2 && no2 == 13 && this.kssycs != '1'), |           isUpload, | ||||||
|         } |         } | ||||||
|         // if (this.mode === 2) { |  | ||||||
|         //   let type: '1' | '2' | '3' |  | ||||||
|         //   if (no2 == 13) { |  | ||||||
|         //     type = '2' |  | ||||||
|         //   } else { |  | ||||||
|         //     type = isRequired ? '1' : '3' |  | ||||||
|         //   } |  | ||||||
|         //   currentProject.ykType = type |  | ||||||
|         // } |  | ||||||
|         this.projectsObj[no2*1] = currentProject |         this.projectsObj[no2*1] = currentProject | ||||||
|         this.projectsCenterObj[txt2] = currentProject |         this.projectsCenterObj[txt2] = currentProject | ||||||
|         this.projects.push(currentProject); |         this.projects.push(currentProject); | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user