Browse Source

[完善]修改样式

master
邵佳豪 4 years ago
parent
commit
9726ec844e
  1. 4
      src/app/examiner/create-test-score/create-test-score.component.ts
  2. 11
      src/app/ui/collection-tools-examinee/collection-tools.component.html
  3. 1
      src/app/ui/collection-tools-examinee/collection-tools.component.ts
  4. 13
      src/app/ui/collection-tools-examinee/examinationQuestions.ts

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

@ -1208,7 +1208,8 @@ export class CreateTestScoreComponent implements OnInit {
//判断是否存在总分填写后没有勾选 或者勾选了没有填写总分的情况
for (let index = 0; index < this.unitId.length; index++) {
const element = this.unitId[index];
element.planList ?
element.isPlanScore = true
element.planList.length != 0 ?
element.isPlanScore = element.planList.some(item=>{
if(!item.score || item.score == 0){
return false
@ -1216,7 +1217,6 @@ export class CreateTestScoreComponent implements OnInit {
return true
}
}): null
console.log('xixi',element.isPlanScore)
//判断存在总分填写后没有勾选题目
if( (element.basicInfoScore != 0 && element.basicInfoNodesKey.length == 0) ||
(element.aroundScore != 0 && element.aroundNodesKey.length == 0) ||

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

@ -57,17 +57,18 @@
<label class="overflowText" style="font-weight: 550;">处置预案</label>
</div>
<div [hidden]="!toggleHandlePlans">
<div class="questionsBox">
<p>考试题目</p>
<nz-tree #nzTreeComponent [nzData]="questionstreeData" nzBlockNode [nzTreeTemplate]="nzTreeTemplate"></nz-tree>
<div class="questionsBox" style="padding-left: 10px;box-sizing: border-box;">
<p style="font-size: 15px;">考试题目</p>
<nz-tree *ngIf="questionstreeData.length != 0" nzExpandAll #nzTreeComponent [nzData]="questionstreeData" nzBlockNode [nzTreeTemplate]="nzTreeTemplate"></nz-tree>
<ng-template #nzTreeTemplate let-node let-origin="origin">
<div id="terrNodePublic">
<label title="{{node.title}}" class="overflowText textNode">{{node.title}}</label>
</div>
</ng-template>
</div>
<div class="answerDiv">
<p>考生答案</p>
<mat-divider style="margin: 5px 0 8px 0;"></mat-divider>
<div class="answerDiv" style="padding-left: 10px;box-sizing: border-box;">
<p style="font-size: 15px;">考生答案</p>
<nz-tree #nzTreeComponent2 [nzData]="treeData" nzBlockNode [nzTreeTemplate]="nzTreeTemplate2" [nzExpandedKeys]="defaultExpandedKeys"></nz-tree>
<ng-template #nzTreeTemplate2 let-node let-origin="origin">
<div id="terrNodePublic" (click)='selectanelPoint(node.origin)' [ngClass]="{'selectanelPoint': selectDisposalNode==node.origin.id}">

1
src/app/ui/collection-tools-examinee/collection-tools.component.ts

@ -865,6 +865,7 @@ export class CollectionToolsExamineeComponent implements OnInit {
let data = {allFireElements:this.allFireElements,Facilities:this.Facilities}
let dialogRef = this.dialog.open(uploadQuestionsExaminee,{data});
}
//封装 刷新 tree 数据

13
src/app/ui/collection-tools-examinee/examinationQuestions.ts

@ -232,10 +232,15 @@ export class uploadQuestionsExaminee {
console.log($event)
}
//上传
submit () {
submit () {
// this.dialogRef.close();
const config = new MatSnackBarConfig();
config.verticalPosition = 'top';
config.duration = 3000
this.snackBar.open('提交成功,页面将于一秒后关闭','确定',config);
setTimeout(() => {
window.close()
}, 1000);
}
}

Loading…
Cancel
Save