Commit 6a1abdd5 authored by 李维's avatar 李维

Bug fix

parent aa67e6d5
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<div nzAlign="middle"> <div nzAlign="middle">
<div class="img-box clearfix" style="margin-top: 20px; padding-bottom: 10px;"> <div class="img-box clearfix" style="margin-top: 20px; padding-bottom: 10px;">
<h3>题目配置({{questionsLeft.length}})</h3> <h3>题目配置({{questionsLeft.length}})</h3>
<div *ngFor="let item of questionsLeft; let QI = index" class="img-box clearfix" style="border-bottom: 1px solid #DDD; padding-bottom: 10px;"> <div *ngFor="let qItem of questionsLeft; let QI = index" class="img-box clearfix" style="border-bottom: 1px solid #DDD; padding-bottom: 10px;">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="1">No.</nz-form-label> <nz-form-label [nzSpan]="1">No.</nz-form-label>
<nz-form-control [nzSpan]="1"> <nz-form-control [nzSpan]="1">
...@@ -109,20 +109,20 @@ ...@@ -109,20 +109,20 @@
<nz-form-label [nzSpan]="2">组合数</nz-form-label> <nz-form-label [nzSpan]="2">组合数</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="6">
<nz-input-number [(ngModel)]="item.number" [nzMin]="1" [nzMax]="5" [nzStep]="1" (ngModelChange)="handleCombinLength(item)"></nz-input-number> <nz-input-number [(ngModel)]="qItem.number" [nzMin]="1" [nzMax]="5" [nzStep]="1" (ngModelChange)="handleCombinLength(qItem)"></nz-input-number>
</nz-form-control> </nz-form-control>
<nz-form-label [nzSpan]="2">发音</nz-form-label> <nz-form-label [nzSpan]="2">发音</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="6">
<app-audio-recorder id="index_audio_1" [audioUrl]="item.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', item)" > </app-audio-recorder> <app-audio-recorder id="index_audio_1" [audioUrl]="qItem.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', qItem)" > </app-audio-recorder>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2">组合</nz-form-label> <nz-form-label [nzSpan]="2">组合</nz-form-label>
<nz-form-control [nzSpan]="22"> <nz-form-control [nzSpan]="22">
<nz-select *ngFor="let part of item.combin; let i = index" [attr.data-index]="i" [(ngModel)]="questionsLeft[QI]._combin[i]" style="float: left; margin-right: 5px; width: 100px;" (ngModelChange)="handlePartChange($event, 1, QI, i)"> <nz-select *ngFor="let part of qItem.combin; let i = index" [attr.data-index]="i" [(ngModel)]="questionsLeft[QI]._combin[i]" style="float: left; margin-right: 5px; width: 100px;" (ngModelChange)="handlePartChange($event, 1, QI, i)">
<nz-option *ngIf="wordLeft_text" [nzDisabled]="item.combin.indexOf(-1)!=-1" [nzValue]="-1" [nzLabel]="'R-' + wordLeft_text"></nz-option> <nz-option *ngIf="item.contentObj.wordLeft_text" [nzDisabled]="qItem.combin.indexOf(-1)!=-1" [nzValue]="-1" [nzLabel]="'L-' + item.contentObj.wordLeft_text"></nz-option>
<nz-option *ngFor="let hot of hotZoneItemArrLeft; let j = index;" [attr.data-index]="j" [nzValue]="j" [nzLabel]="(j + 1) + '-' + hot.media.text"></nz-option> <nz-option *ngFor="let hot of hotZoneItemArrLeft; let j = index;" [attr.data-index]="j" [nzValue]="j" [nzLabel]="(j + 1) + '-' + hot.media.text"></nz-option>
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
<nz-form-label [nzSpan]="2">预览</nz-form-label> <nz-form-label [nzSpan]="2">预览</nz-form-label>
<nz-form-control [nzSpan]="4" style="padding: 0 5px; "> <nz-form-control [nzSpan]="4" style="padding: 0 5px; ">
<span style="background-color: #ccc; padding: 5px;"> <span style="background-color: #ccc; padding: 5px;">
{{getQuestionWord(1, item.combin)}} {{getQuestionWord(1, qItem.combin)}}
</span> </span>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
...@@ -245,11 +245,11 @@ ...@@ -245,11 +245,11 @@
</nz-form-item> </nz-form-item>
</div> </div>
<!-- 右侧题目 --> <!-- 中间题目 -->
<div nzAlign="middle"> <div nzAlign="middle">
<div class="img-box clearfix" style="margin-top: 20px; padding-bottom: 10px;"> <div class="img-box clearfix" style="margin-top: 20px; padding-bottom: 10px;">
<h3>题目配置({{questionsMiddle.length}})</h3> <h3>题目配置({{questionsMiddle.length}})</h3>
<div *ngFor="let item of questionsMiddle; let QI = index" class="img-box clearfix" style="border-bottom: 1px solid #DDD; padding-bottom: 10px;"> <div *ngFor="let qItem of questionsMiddle; let QI = index" class="img-box clearfix" style="border-bottom: 1px solid #DDD; padding-bottom: 10px;">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="1">No.</nz-form-label> <nz-form-label [nzSpan]="1">No.</nz-form-label>
<nz-form-control [nzSpan]="1"> <nz-form-control [nzSpan]="1">
...@@ -258,20 +258,20 @@ ...@@ -258,20 +258,20 @@
<nz-form-label [nzSpan]="2">组合数</nz-form-label> <nz-form-label [nzSpan]="2">组合数</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="6">
<nz-input-number [(ngModel)]="item.number" [nzMin]="1" [nzMax]="5" [nzStep]="1" (ngModelChange)="handleCombinLength(item)"></nz-input-number> <nz-input-number [(ngModel)]="qItem.number" [nzMin]="1" [nzMax]="5" [nzStep]="1" (ngModelChange)="handleCombinLength(qItem)"></nz-input-number>
</nz-form-control> </nz-form-control>
<nz-form-label [nzSpan]="2">发音</nz-form-label> <nz-form-label [nzSpan]="2">发音</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="6">
<app-audio-recorder id="index_audio_1" [audioUrl]="item.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', item)" > </app-audio-recorder> <app-audio-recorder id="index_audio_1" [audioUrl]="qItem.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', qItem)" > </app-audio-recorder>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2">组合</nz-form-label> <nz-form-label [nzSpan]="2">组合</nz-form-label>
<nz-form-control [nzSpan]="22"> <nz-form-control [nzSpan]="22">
<nz-select *ngFor="let part of item.combin; let i = index" [attr.data-index]="i" [(ngModel)]="questionsMiddle[QI]._combin[i]" style="float: left; margin-right: 5px; width: 100px;" (ngModelChange)="handlePartChange($event, 2, QI, i)"> <nz-select *ngFor="let part of qItem.combin; let i = index" [attr.data-index]="i" [(ngModel)]="questionsMiddle[QI]._combin[i]" style="float: left; margin-right: 5px; width: 100px;" (ngModelChange)="handlePartChange($event, 2, QI, i)">
<nz-option *ngIf="wordMiddle_text" [nzDisabled]="item.combin.indexOf(-1)!=-1" [nzValue]="-1" [nzLabel]="'R-' + wordMiddle_text"></nz-option> <nz-option *ngIf="item.contentObj.wordMiddle_text" [nzDisabled]="qItem.combin.indexOf(-1)!=-1" [nzValue]="-1" [nzLabel]="'M-' + item.contentObj.wordMiddle_text"></nz-option>
<nz-option *ngFor="let hot of hotZoneItemArrMiddle; let j = index;" [attr.data-index]="j" [nzValue]="j" [nzLabel]="(j + 1) + '-' + hot.media.text"></nz-option> <nz-option *ngFor="let hot of hotZoneItemArrMiddle; let j = index;" [attr.data-index]="j" [nzValue]="j" [nzLabel]="(j + 1) + '-' + hot.media.text"></nz-option>
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
...@@ -281,7 +281,7 @@ ...@@ -281,7 +281,7 @@
<nz-form-label [nzSpan]="2">预览</nz-form-label> <nz-form-label [nzSpan]="2">预览</nz-form-label>
<nz-form-control [nzSpan]="4" style="padding: 0 5px; "> <nz-form-control [nzSpan]="4" style="padding: 0 5px; ">
<span style="background-color: #ccc; padding: 5px;"> <span style="background-color: #ccc; padding: 5px;">
{{getQuestionWord(2, item.combin)}} {{getQuestionWord(2, qItem.combin)}}
</span> </span>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
...@@ -398,7 +398,7 @@ ...@@ -398,7 +398,7 @@
<div nzAlign="middle"> <div nzAlign="middle">
<div class="img-box clearfix" style="margin-top: 20px; padding-bottom: 10px;"> <div class="img-box clearfix" style="margin-top: 20px; padding-bottom: 10px;">
<h3>题目配置({{questionsRight.length}})</h3> <h3>题目配置({{questionsRight.length}})</h3>
<div *ngFor="let item of questionsRight; let QI = index" class="img-box clearfix" style="border-bottom: 1px solid #DDD; padding-bottom: 10px;"> <div *ngFor="let qItem of questionsRight; let QI = index" class="img-box clearfix" style="border-bottom: 1px solid #DDD; padding-bottom: 10px;">
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="1">No.</nz-form-label> <nz-form-label [nzSpan]="1">No.</nz-form-label>
<nz-form-control [nzSpan]="1"> <nz-form-control [nzSpan]="1">
...@@ -407,20 +407,20 @@ ...@@ -407,20 +407,20 @@
<nz-form-label [nzSpan]="2">组合数</nz-form-label> <nz-form-label [nzSpan]="2">组合数</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="6">
<nz-input-number [(ngModel)]="item.number" [nzMin]="1" [nzMax]="5" [nzStep]="1" (ngModelChange)="handleCombinLength(item)"></nz-input-number> <nz-input-number [(ngModel)]="qItem.number" [nzMin]="1" [nzMax]="5" [nzStep]="1" (ngModelChange)="handleCombinLength(qItem)"></nz-input-number>
</nz-form-control> </nz-form-control>
<nz-form-label [nzSpan]="2">发音</nz-form-label> <nz-form-label [nzSpan]="2">发音</nz-form-label>
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="6">
<app-audio-recorder id="index_audio_1" [audioUrl]="item.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', item)" > </app-audio-recorder> <app-audio-recorder id="index_audio_1" [audioUrl]="qItem.audio_url" (audioUploaded)="onAudioUploadSuccess($event, 'audio_url', qItem)" > </app-audio-recorder>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
<nz-form-item> <nz-form-item>
<nz-form-label [nzSpan]="2">组合</nz-form-label> <nz-form-label [nzSpan]="2">组合</nz-form-label>
<nz-form-control [nzSpan]="22"> <nz-form-control [nzSpan]="22">
<nz-select *ngFor="let part of item.combin; let i = index" [attr.data-index]="i" [(ngModel)]="questionsRight[QI]._combin[i]" style="float: left; margin-right: 5px; width: 100px;" (ngModelChange)="handlePartChange($event, 3, QI, i)"> <nz-select *ngFor="let part of qItem.combin; let i = index" [attr.data-index]="i" [(ngModel)]="questionsRight[QI]._combin[i]" style="float: left; margin-right: 5px; width: 100px;" (ngModelChange)="handlePartChange($event, 3, QI, i)">
<nz-option *ngIf="wordRight_text" [nzDisabled]="item.combin.indexOf(-1)!=-1" [nzValue]="-1" [nzLabel]="'R-' + wordRight_text"></nz-option> <nz-option *ngIf="item.contentObj.wordRight_text" [nzDisabled]="qItem.combin.indexOf(-1)!=-1" [nzValue]="-1" [nzLabel]="'R-' + item.contentObj.wordRight_text"></nz-option>
<nz-option *ngFor="let hot of hotZoneItemArrRight; let j = index;" [attr.data-index]="j" [nzValue]="j" [nzLabel]="(j + 1) + '-' + hot.media.text"></nz-option> <nz-option *ngFor="let hot of hotZoneItemArrRight; let j = index;" [attr.data-index]="j" [nzValue]="j" [nzLabel]="(j + 1) + '-' + hot.media.text"></nz-option>
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
...@@ -430,7 +430,7 @@ ...@@ -430,7 +430,7 @@
<nz-form-label [nzSpan]="2">预览</nz-form-label> <nz-form-label [nzSpan]="2">预览</nz-form-label>
<nz-form-control [nzSpan]="4" style="padding: 0 5px; "> <nz-form-control [nzSpan]="4" style="padding: 0 5px; ">
<span style="background-color: #ccc; padding: 5px;"> <span style="background-color: #ccc; padding: 5px;">
{{getQuestionWord(3, item.combin)}} {{getQuestionWord(3, qItem.combin)}}
</span> </span>
</nz-form-control> </nz-form-control>
</nz-form-item> </nz-form-item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment