违纪考生导入

src/app/routes/art/score/score-first-ym/score-first-ym.component.html

@@ -58,11 +58,15 @@
         <span class="text-success" *ngIf="v.aspect_qualified == '合格'">{{v.aspect_qualified}}</span>
         <span *ngIf="v.aspect_qualified != '不合格' && v.aspect_qualified != '作弊' && v.aspect_qualified !='合格'">{{v.aspect_qualified}}</span>
       </td>
-      <td>{{v.apply_msg}}</td>
+      <td>
+        <span *ngIf="v.apply_msg" class="text-success" [tooltip]="v.apply_msg">复核内容</span>
+      </td>
       <td>{{v.check_flag}}</td>
-      <td>{{v.check_note}}</td>
       <td>
-        <span *ngIf="v.check_note"> 2024年1月29日 9:00</span>
+        <span *ngIf="v.check_note" class="text-success" [tooltip]="v.check_note">复核结论</span>
+      </td>
+      <td>
+        <span *ngIf="v.check_note"> {{v.recovery_time}}</span>
       </td>
       <td>
         <div class="btn-group" dropdown style="margin-top: -2px;"  *ngIf="v.wei_gui=='是'">

src/app/routes/art/score/score-ym-violation/score-ym-violation.component.html

@@ -0,0 +1,59 @@
+<div class="content-heading  justify-content-between">
+  <div>违纪考生</div>
+  <div class="float-right">
+    <div class="btn-group ml-3 mr-5" dropdown>
+      <button class="btn dropdown-toggle btn-secondary" type="button" dropdownToggle>辅助功能
+        <span class="caret"></span>
+      </button>
+      <div *dropdownMenu class="dropdown-menu" role="menu">
+        <a class="dropdown-item" href="#" (click)="doUploaFile()">导入违纪考生</a>
+        <div class="dropdown-divider"></div>
+      </div>
+    </div>
+  </div>
+</div>
+<div class="table-responsive bg-white table-full">
+  <table class="table table-striped table-hover table-bordered">
+    <thead>
+    <tr>
+      <th>考生姓名</th>
+      <th>证件号码</th>
+      <th>生源地</th>
+      <th>高考报名号</th>
+      <th>准考证号</th>
+      <th>违规编号</th>
+      <th>考试日期</th>
+      <th>考试科目</th>
+      <th>违规行为</th>
+      <th>国家处理办法</th>
+      <th>学校处理办法</th>
+    </tr>
+    </thead>
+    <tbody>
+    <tr *ngFor="let v of pager.getRecords(); let i = index">
+      <td>{{v.std_name}}</td>
+      <td>{{v.cert_id}}</td>
+      <td>{{v.province_name}}</td>
+      <td>{{v.exam_id}}</td>
+      <td>{{v.ticket_no}}</td>
+      <td>{{v.violation_no}}</td>
+      <td>{{v.exam_date}}</td>
+      <td>
+        <span *ngIf="v.exam_subject" class="text-success" [tooltip]="v.exam_subject">考试科目说明</span>
+      </td>
+      <td>
+        <span *ngIf="v.violation_remark" class="text-danger" [tooltip]="v.violation_remark">违规行为说明</span>
+      </td>
+      <td>
+        <span *ngIf="v.country_rule" class="text-success" [tooltip]="v.country_rule">国家处理办法</span>
+      </td>
+      <td>
+        <span *ngIf="v.school_rule" class="text-success" [tooltip]="v.school_rule">学校处理办法</span>
+      </td>
+    </tr>
+    </tbody>
+  </table>
+  <frame-pager [url]="'./score/ym/violation/page.htm'" #pager></frame-pager>
+</div>
+
+

src/app/routes/art/score/score-ym-violation/score-ym-violation.component.ts

@@ -0,0 +1,35 @@
+import { Component, OnInit, ViewChild } from '@angular/core';
+import { BsModalService } from 'ngx-bootstrap/modal';
+import { FrameUpload } from 'src/app/core/frame/upload/frame-upload/frame-upload';
+import { ModalService } from 'src/app/core/service/modal.service';
+import { FramePageComponent } from 'src/app/routes/frame/core/page/frame.page';
+
+@Component({
+  selector: 'app-score-ym-violation',
+  templateUrl: './score-ym-violation.component.html',
+  styleUrls: ['./score-ym-violation.component.scss']
+})
+export class ScoreYmViolationComponent extends FramePageComponent implements OnInit {
+
+  @ViewChild('uploader', { static: false }) uploader: FrameUpload;
+  constructor(private modalService: BsModalService) {
+    super(modalService);
+   }
+
+  ngOnInit(): void {
+  }
+
+  doUploaFile() {
+    ModalService.showUploadWindow(this.bsService, './score/ym/violation/upload.htm', {}, {
+      uploadTitle: '违纪考生',
+      templateFile:'模版-线上考试违纪考生.xls',
+      uploadCallback: this.uploadWithThreadCallback.bind(this),
+      autoClose: true
+    });
+  }
+
+  uploadWithThreadCallback(ajax) {
+    this.pager.reload();
+  }
+
+}

src/app/routes/art/score/score.art.module.ts

@@ -23,6 +23,7 @@ import { ScoreInputGobalComponent } from './score-input-gobal/score-input-gobal.
 import { ScoreOneInputComponent } from './score-one-input/score-one-input.component';
 import { ScoreOneInputDetailComponent } from './score-one-input-detail/score-one-input-detail.component';
 import { ScoreYmfzComponent } from './score-ymfz/score-ymfz.component';
+import { ScoreYmViolationComponent } from './score-ym-violation/score-ym-violation.component';
 
 const routes: Routes = [
   {path: 'subject', component: ScoreSubjectComponent},
@@ -36,7 +37,8 @@ const routes: Routes = [
   {path: 'ems', component: ScoreYmEmsComponent},
   {path: 'gobal', component: ScoreInputGobalComponent},
   {path: 'oneinput', component: ScoreOneInputComponent},
-  {path: 'ymfz', component: ScoreYmfzComponent}
+  {path: 'ymfz', component: ScoreYmfzComponent},
+  {path: 'violation', component: ScoreYmViolationComponent}
 ];
 
 @NgModule({
@@ -48,7 +50,7 @@ const routes: Routes = [
   entryComponents: [ScoreYmDetailComponent,ScoreYmReportComponent,ScoreYmEmsDetailComponent, ScoreYmEmsReportComponent,ScoreYmEmsReturnComponent,ScoreDevSqlComponent],
   declarations: [ScoreSubjectComponent, ScoreAspectComponent, ScoreCheckComponent,ScoreInputWrittenComponent,ScoreDevOpsComponent,
     ScoreYmComponent, ScoreYmDetailComponent, ScoreYmReportComponent, ScoreYmEmsComponent, ScoreYmEmsDetailComponent, ScoreYmEmsReportComponent,
-    ScoreYmEmsReturnComponent,ScoreDevSqlComponent,ScoreFirstYmComponent,ScoreFirstYmDetailComponent,ScoreFinalYmComponent,ScoreFinalYmDetailComponent, ScoreInputGobalComponent, ScoreOneInputComponent, ScoreOneInputDetailComponent, ScoreYmfzComponent],
+    ScoreYmEmsReturnComponent,ScoreDevSqlComponent,ScoreFirstYmComponent,ScoreFirstYmDetailComponent,ScoreFinalYmComponent,ScoreFinalYmDetailComponent, ScoreInputGobalComponent, ScoreOneInputComponent, ScoreOneInputDetailComponent, ScoreYmfzComponent, ScoreYmViolationComponent],
   exports: [
     RouterModule
   ]