Merge branch 'master' of http://39.106.78.171:3000/shaojiahao/examSystem-Anxin

src/app/examiner/examiner-index/examiner-index.component.ts

@@ -138,7 +138,7 @@ export class ExaminerIndexComponent implements OnInit {
   }
   //新增考题跳转
   newExamination(){
-    this.router.navigate(['/home/examiner-new-one'])
+    this.router.navigate(['/home/createexam-index/examiner-new-one'])
   }
 
 }

src/app/examiner/examiner-routing.ts

@@ -16,9 +16,9 @@ import { StatisticAnalysisComponent } from './statistic-analysis/statistic-analy
 
 const routes: Routes = [
     { path: 'createexam-index', component:ExaminerIndexComponent },
-    { path: 'examiner-new-one', component:ExaminerNewOneComponent },
+    { path: 'createexam-index/examiner-new-one', component:ExaminerNewOneComponent },
     { path: 'mark-papers-index',component:MarkPapersIndexComponent},
-    { path: 'mark-papers-two',component:MarkPapersTwoComponent},
+    { path: 'mark-papers-index/mark-papers-two',component:MarkPapersTwoComponent},
     { path: 'statistic-anaily',component:StatisticAnalysisComponent}
 ]
 @NgModule({

src/app/examiner/mark-papers-index/mark-papers-index.component.ts

@@ -48,7 +48,7 @@ export class MarkPapersIndexComponent implements OnInit {
   //点击阅卷跳转
   markTwo(e){
     console.log(e)
-    this.router.navigate(['/home/mark-papers-two'],{queryParams:{'level':e}})
+    this.router.navigate(['/home/mark-papers-index/mark-papers-two'],{queryParams:{'level':e}})
   }
 
 }