Browse Source

[完善]修改bug

master
邵佳豪 3 years ago
parent
commit
484e09c49d
  1. 4
      src/app/examiner/create-test-score/create-test-score.component.html
  2. 4
      src/app/examiner/examiner-new-one/examiner-new-one.component.html
  3. 9
      src/app/student/student-index/student-index.component.ts
  4. 2
      src/app/ui/collection-tools-examinee/collection-tools.component.html
  5. 4
      src/app/ui/collection-tools-read/collection-tools.component.html

4
src/app/examiner/create-test-score/create-test-score.component.html

@ -281,14 +281,14 @@
<tr *ngFor="let item of unitId[selectedUnitIndex].planList"> <tr *ngFor="let item of unitId[selectedUnitIndex].planList">
<td>{{item.title}}</td> <td>{{item.title}}</td>
<td>{{item.creatorName}}</td> <td>{{item.creatorName}}</td>
<td>{{item.modifiedTime | date:'yyyy-MM-dd'}}</td> <td>{{item.modifiedTime | date:'yyyy-MM-dd HH:mm:ss'}}</td>
<td>{{item.isPublic ? '已公开' : '未公开'}}</td> <td>{{item.isPublic ? '已公开' : '未公开'}}</td>
<td>{{item.planLevel | planlevel}}</td> <td>{{item.planLevel | planlevel}}</td>
<td> <td>
<input onchange="if(!value)value=0" (input)="planItemScore()" type="number" [(ngModel)]="item.score"> <input onchange="if(!value)value=0" (input)="planItemScore()" type="number" [(ngModel)]="item.score">
</td> </td>
<td *ngIf="!(pattern=='look')"> <td *ngIf="!(pattern=='look')">
<span style="color: #07CDCF;" (click)="edit(item)" >编辑</span> <!-- <span style="color: #07CDCF;" (click)="edit(item)" >编辑</span> -->
<span style="color: #FF8678;" (click)="deletePlan(item)">删除</span> <span style="color: #FF8678;" (click)="deletePlan(item)">删除</span>
</td> </td>
</tr> </tr>

4
src/app/examiner/examiner-new-one/examiner-new-one.component.html

@ -20,7 +20,7 @@
<div><input type="text" name="shehui" [(ngModel)]="shehui" autocomplete="off" placeholder="请填写"></div> <div><input type="text" name="shehui" [(ngModel)]="shehui" autocomplete="off" placeholder="请填写"></div>
</div> </div>
<div class="queryField ordiv"> <div class="queryField ordiv">
<div><label style="margin-right: 10px;position: relative;top: 5px;" >辖区中队:</label></div> <div><label style="margin-right: 10px;position: relative;top: 5px;" >消防救援站:</label></div>
<div> <div>
<input (click)="stopclose($event)" readonly autocomplete="off" [(ngModel)]="js" name="js" (focus)="openorganizationbox()" placeholder="请填写"> <input (click)="stopclose($event)" readonly autocomplete="off" [(ngModel)]="js" name="js" (focus)="openorganizationbox()" placeholder="请填写">
<mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox> <mat-checkbox color="primary" style="margin-left: 6px;" [(ngModel)]="jscheck" name="jscheck">包含下级</mat-checkbox>
@ -67,7 +67,7 @@
<td mat-cell *matCellDef="let element">{{element.name}}</td> <td mat-cell *matCellDef="let element">{{element.name}}</td>
</ng-container> </ng-container>
<ng-container matColumnDef="jurisdictionsquadron"> <ng-container matColumnDef="jurisdictionsquadron">
<th mat-header-cell *matHeaderCellDef>辖区中队</th> <th mat-header-cell *matHeaderCellDef>消防救援站</th>
<td mat-cell *matCellDef="let element">{{element.organizationName}}</td> <td mat-cell *matCellDef="let element">{{element.organizationName}}</td>
</ng-container> </ng-container>

9
src/app/student/student-index/student-index.component.ts

@ -139,8 +139,7 @@ export class StudentIndexComponent implements OnInit {
if (int_second < 10) if (int_second < 10)
int_second = "0" + int_second; int_second = "0" + int_second;
this.str_time = int_hour + ":" + int_minute + ":" + int_second; this.str_time = int_hour + ":" + int_minute + ":" + int_second;
if(this.str_time=="00:00:00") if (this.str_time == "00:00:00") { this.str_time = "已结束" }
{this.str_time="已结束"}
//console.log(this.str_time) //console.log(this.str_time)
} else { } else {
//timer=timer; //timer=timer;
@ -150,12 +149,18 @@ export class StudentIndexComponent implements OnInit {
//参加考试 //参加考试
takeTest(e) { takeTest(e) {
console.log(e)
let body = { let body = {
name: e.title, name: e.title,
paperId: e.id, paperId: e.id,
} }
this.http.post('/api/Examinations', body).subscribe((data: any) => { this.http.post('/api/Examinations', body).subscribe((data: any) => {
window.open(`/examinationDetails?paperId=${e.id}&examId=${data.id}`) window.open(`/examinationDetails?paperId=${e.id}&examId=${data.id}`)
}, err => {
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open(err, '确定', config);
}) })
} }
} }

2
src/app/ui/collection-tools-examinee/collection-tools.component.html

@ -62,7 +62,7 @@
<p style="font-size: 15px;">考试题目</p> <p style="font-size: 15px;">考试题目</p>
<nz-tree *ngIf="questionstreeData.length != 0" nzExpandAll #nzTreeComponent [nzData]="questionstreeData" nzBlockNode [nzTreeTemplate]="nzTreeTemplate"></nz-tree> <nz-tree *ngIf="questionstreeData.length != 0" nzExpandAll #nzTreeComponent [nzData]="questionstreeData" nzBlockNode [nzTreeTemplate]="nzTreeTemplate"></nz-tree>
<ng-template #nzTreeTemplate let-node let-origin="origin"> <ng-template #nzTreeTemplate let-node let-origin="origin">
<div id="terrNodePublic" [ngClass]="{'selectanelPoint': selectDisposalNode==node.origin.id}"> <div id="terrNodePublic" (click)='selectanelPoint(node.origin,0)' [ngClass]="{'selectanelPoint': selectDisposalNode==node.origin.id}">
<label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label> <label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label>
</div> </div>
</ng-template> </ng-template>

4
src/app/ui/collection-tools-read/collection-tools.component.html

@ -8,9 +8,9 @@
</div> </div>
</div> </div>
<div class="headerRight" *ngIf="paperType == 0"> <div class="headerRight" *ngIf="paperType == 0">
<!-- <button style="border: 1px solid #07CDCF; border-radius: 5px; margin: 0 15px;" (click)='lookAnswerDiv()'><mat-icon>visibility</mat-icon> <button style="border: 1px solid #07CDCF; border-radius: 5px; margin: 0 15px;" (click)='lookAnswerDiv()'><mat-icon>visibility</mat-icon>
查看答案 查看答案
</button> --> </button>
<button (click)="score()"><mat-icon>description</mat-icon>评分</button> <button (click)="score()"><mat-icon>description</mat-icon>评分</button>
<button (click)="submitScore()"><mat-icon>open_in_browser</mat-icon>提交</button> <button (click)="submitScore()"><mat-icon>open_in_browser</mat-icon>提交</button>
</div> </div>

Loading…
Cancel
Save