Commit a85af4ea authored by 李维's avatar 李维

添加涂色评分题和两级连线题表单配置

parent dd0ffbff
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -66,6 +66,8 @@ ...@@ -66,6 +66,8 @@
<nz-option [nzValue]="CONNECTION_CHOICE" nzLabel="连线选择题"></nz-option> <nz-option [nzValue]="CONNECTION_CHOICE" nzLabel="连线选择题"></nz-option>
<nz-option [nzValue]="TEXTINPUT_GROUP" nzLabel="文字输入组"></nz-option> <nz-option [nzValue]="TEXTINPUT_GROUP" nzLabel="文字输入组"></nz-option>
<nz-option [nzValue]="DRAWING" nzLabel="涂色题"></nz-option> <nz-option [nzValue]="DRAWING" nzLabel="涂色题"></nz-option>
<nz-option [nzValue]="DRAWING_CHECK" nzLabel="涂色题(评分)"></nz-option>
<nz-option [nzValue]="CONNECTION_2LEVEL" nzLabel="2级连线题"></nz-option>
<nz-option [nzValue]="IMAGE_SELECT" nzLabel="图片选项" nzDisabled></nz-option> <nz-option [nzValue]="IMAGE_SELECT" nzLabel="图片选项" nzDisabled></nz-option>
</nz-select> </nz-select>
<label *ngIf="it.hotZoneType == TEXT_SELECT" nz-checkbox [(ngModel)]="it.useSelectOptionList" (ngModelChange)="handleUserSelectOptionListChange(it)" style="margin-left: 10px;">使用独立选项清单</label> <label *ngIf="it.hotZoneType == TEXT_SELECT" nz-checkbox [(ngModel)]="it.useSelectOptionList" (ngModelChange)="handleUserSelectOptionListChange(it)" style="margin-left: 10px;">使用独立选项清单</label>
...@@ -110,7 +112,7 @@ ...@@ -110,7 +112,7 @@
</nz-table> </nz-table>
</div> </div>
<div *ngIf="it.hotZoneType != '' && it.hotZoneType != AUDIO_PLAY && it.hotZoneType != VIDEO_PLAY && it.hotZoneType != DRAWING && it.hotZoneType != TEXTINPUT && it.hotZoneType != PRONUNCIATION_ASSESSMENT" style="padding: 10px 0 10px 150px;"> <div *ngIf="it.hotZoneType != '' && it.hotZoneType != AUDIO_PLAY && it.hotZoneType != VIDEO_PLAY && it.hotZoneType != DRAWING && it.hotZoneType != DRAWING_CHECK && it.hotZoneType != TEXTINPUT && it.hotZoneType != PRONUNCIATION_ASSESSMENT" style="padding: 10px 0 10px 150px;">
<div style="margin-bottom: 16px;"> <div style="margin-bottom: 16px;">
<span style="font-size: 14px; color: #000000d9;">内容清单</span> <span style="font-size: 14px; color: #000000d9;">内容清单</span>
<button nz-button nzSize="small" nzType="primary" style="float: right;" (click)="addHotZoneConfigItem(it)"> <button nz-button nzSize="small" nzType="primary" style="float: right;" (click)="addHotZoneConfigItem(it)">
...@@ -339,6 +341,52 @@ ...@@ -339,6 +341,52 @@
</tbody> </tbody>
</nz-table> </nz-table>
<!-- 2级连线 -->
<nz-table *ngIf="it.hotZoneType == CONNECTION_2LEVEL" #contentTable [nzData]="it.contentList" [nzFrontPagination]="false" [nzShowPagination]="false">
<thead>
<tr>
<th nzWidth="100px" nzAlign="center">序号</th>
<th nzWidth="100px" nzAlign="center">分数</th>
<th nzAlign="center">热区起点-1</th>
<th nzAlign="center">热区终点-1</th>
<th nzAlign="center">热区起点-2</th>
<th nzAlign="center">热区终点-2</th>
<th nzWidth="150px" nzAlign="center">操作</th>
</tr>
</thead>
<tbody>
<tr *ngFor="let data of contentTable.data; let i = index;">
<td nzWidth="100px" nzAlign="center">{{ i + 1 }}</td>
<td nzWidth="100px">
<input type="text" nz-input [(ngModel)]="data.score" (blur)="save()"/>
</td>
<td>
<nz-select nzShowSearch nzAllowClear [(ngModel)]="data.selectStartHotZoneIndex_1" style="width: 180px;" (ngModelChange)="save()">
<nz-option *ngFor="let itOption of item.hotZoneItemArr" [nzValue]="itOption.index" [nzLabel]="itOption.itemName"></nz-option>
</nz-select>
</td>
<td>
<nz-select nzShowSearch nzAllowClear [(ngModel)]="data.selectEndHotZoneIndex_1" style="width: 180px;" (ngModelChange)="save()">
<nz-option *ngFor="let itOption of item.hotZoneItemArr" [nzValue]="itOption.index" [nzLabel]="itOption.itemName"></nz-option>
</nz-select>
</td>
<td>
<nz-select nzShowSearch nzAllowClear [(ngModel)]="data.selectStartHotZoneIndex_2" style="width: 180px;" (ngModelChange)="save()">
<nz-option *ngFor="let itOption of item.hotZoneItemArr" [nzValue]="itOption.index" [nzLabel]="itOption.itemName"></nz-option>
</nz-select>
</td>
<td>
<nz-select nzShowSearch nzAllowClear [(ngModel)]="data.selectEndHotZoneIndex_2" style="width: 180px;" (ngModelChange)="save()">
<nz-option *ngFor="let itOption of item.hotZoneItemArr" [nzValue]="itOption.index" [nzLabel]="itOption.itemName"></nz-option>
</nz-select>
</td>
<td nzWidth="150px" nzAlign="center">
<a nz-popconfirm nzPopconfirmTitle="删除后不可恢复,确定删除吗?" (nzOnConfirm)="deleteHotZoneConfigItem(it, i)">删除</a>
</td>
</tr>
</tbody>
</nz-table>
<!-- 纵横字谜 --> <!-- 纵横字谜 -->
<nz-table *ngIf="it.hotZoneType == CROSSWORD_PUZZLE" #contentTable [nzData]="it.contentList" [nzFrontPagination]="false" [nzShowPagination]="false"> <nz-table *ngIf="it.hotZoneType == CROSSWORD_PUZZLE" #contentTable [nzData]="it.contentList" [nzFrontPagination]="false" [nzShowPagination]="false">
<thead> <thead>
...@@ -517,7 +565,23 @@ ...@@ -517,7 +565,23 @@
<label nz-checkbox [(ngModel)]="it.textAlignLeft" (ngModelChange)="save()" style="margin-left: 10px;">文字靠左对齐</label> <label nz-checkbox [(ngModel)]="it.textAlignLeft" (ngModelChange)="save()" style="margin-left: 10px;">文字靠左对齐</label>
</div> </div>
<div *ngIf="it.hotZoneType != '' && it.hotZoneType != CROSSWORD_PUZZLE && it.hotZoneType != HOT_ZONE_RADIO && it.hotZoneType != HOT_ZONE_CHECKBOX && it.hotZoneType != CONNECTION && it.hotZoneType != TEXT_SELECT && it.hotZoneType != RIGHT_OR_WRONG && it.hotZoneType != TEXTINPUT_GROUP" style="margin: 10px 10px;"> <div *ngIf="it.hotZoneType == DRAWING_CHECK" style="margin: 10px 10px;">
<span style="display: inline-block; text-align: right; width: 150px;">正确颜色:</span>
<nz-select nzShowSearch nzAllowClear [(ngModel)]="it.drawingCheckCorrectColors" nzMode="multiple" style="width: 500px;" (ngModelChange)="save()">
<nz-option nzValue="color_red" nzLabel="Red"></nz-option>
<nz-option nzValue="color_orange" nzLabel="Orange"></nz-option>
<nz-option nzValue="color_yellow" nzLabel="Yellow"></nz-option>
<nz-option nzValue="color_green" nzLabel="Green"></nz-option>
<nz-option nzValue="color_blue" nzLabel="Blue"></nz-option>
<nz-option nzValue="color_purple" nzLabel="Purple"></nz-option>
<nz-option nzValue="color_pink" nzLabel="Pink"></nz-option>
<nz-option nzValue="color_brown" nzLabel="Brown"></nz-option>
<nz-option nzValue="color_black" nzLabel="Black"></nz-option>
</nz-select>
<label nz-checkbox [(ngModel)]="it.drawingCheckStrictEqual" (ngModelChange)="save()" style="margin-left: 10px;">颜色严格相等</label>
</div>
<div *ngIf="it.hotZoneType != '' && it.hotZoneType != CROSSWORD_PUZZLE && it.hotZoneType != HOT_ZONE_RADIO && it.hotZoneType != HOT_ZONE_CHECKBOX && it.hotZoneType != CONNECTION && it.hotZoneType != CONNECTION_2LEVEL && it.hotZoneType != TEXT_SELECT && it.hotZoneType != RIGHT_OR_WRONG && it.hotZoneType != TEXTINPUT_GROUP" style="margin: 10px 10px;">
<span style="display: inline-block; text-align: right; width: 150px;">关联热区:</span> <span style="display: inline-block; text-align: right; width: 150px;">关联热区:</span>
<nz-select nzShowSearch nzAllowClear [(ngModel)]="it.linkHotZoneIndex" style="width: 300px;" (ngModelChange)="save()"> <nz-select nzShowSearch nzAllowClear [(ngModel)]="it.linkHotZoneIndex" style="width: 300px;" (ngModelChange)="save()">
<nz-option *ngFor="let itOption of item.hotZoneItemArr" [nzValue]="itOption.index" [nzLabel]="itOption.itemName"></nz-option> <nz-option *ngFor="let itOption of item.hotZoneItemArr" [nzValue]="itOption.index" [nzLabel]="itOption.itemName"></nz-option>
...@@ -531,14 +595,14 @@ ...@@ -531,14 +595,14 @@
</nz-select> </nz-select>
</div> </div>
<div *ngIf="it.hotZoneType == HOT_ZONE_RADIO || it.hotZoneType == HOT_ZONE_CHECKBOX || it.hotZoneType == CONNECTION || it.hotZoneType == RIGHT_OR_WRONG || it.hotZoneType == CROSSWORD_PUZZLE || it.hotZoneType == SORT_WORDS || it.hotZoneType == PRONUNCIATION_ASSESSMENT || it.hotZoneType == CONNECTION_CHOICE" style="margin: 10px 10px;"> <div *ngIf="it.hotZoneType == HOT_ZONE_RADIO || it.hotZoneType == HOT_ZONE_CHECKBOX || it.hotZoneType == CONNECTION || it.hotZoneType == CONNECTION_2LEVEL || it.hotZoneType == RIGHT_OR_WRONG || it.hotZoneType == CROSSWORD_PUZZLE || it.hotZoneType == SORT_WORDS || it.hotZoneType == PRONUNCIATION_ASSESSMENT || it.hotZoneType == CONNECTION_CHOICE" style="margin: 10px 10px;">
<span style="display: inline-block; text-align: right; width: 150px;">检查结果显示热区:</span> <span style="display: inline-block; text-align: right; width: 150px;">检查结果显示热区:</span>
<nz-select nzShowSearch nzAllowClear [(ngModel)]="it.linkResultShowHotZoneIndex" style="width: 300px;" (ngModelChange)="save()"> <nz-select nzShowSearch nzAllowClear [(ngModel)]="it.linkResultShowHotZoneIndex" style="width: 300px;" (ngModelChange)="save()">
<nz-option *ngFor="let itOption of item.hotZoneItemArr" [nzValue]="itOption.index" [nzLabel]="itOption.itemName"></nz-option> <nz-option *ngFor="let itOption of item.hotZoneItemArr" [nzValue]="itOption.index" [nzLabel]="itOption.itemName"></nz-option>
</nz-select> </nz-select>
</div> </div>
<div *ngIf="it.hotZoneType != ''&& it.hotZoneType != AUDIO_PLAY && it.hotZoneType != VIDEO_PLAY && it.hotZoneType != DRAWING && it.hotZoneType != HOT_ZONE_CHECKBOX && it.hotZoneType != CONNECTION && it.hotZoneType != TEXT_SELECT && it.hotZoneType != RIGHT_OR_WRONG && it.hotZoneType != TEXTINPUT_GROUP" style="margin: 10px 10px;"> <div *ngIf="it.hotZoneType != ''&& it.hotZoneType != AUDIO_PLAY && it.hotZoneType != VIDEO_PLAY && it.hotZoneType != DRAWING && it.hotZoneType != HOT_ZONE_CHECKBOX && it.hotZoneType != CONNECTION && it.hotZoneType != CONNECTION_2LEVEL && it.hotZoneType != TEXT_SELECT && it.hotZoneType != RIGHT_OR_WRONG && it.hotZoneType != TEXTINPUT_GROUP" style="margin: 10px 10px;">
<span style="display: inline-block; text-align: right; width: 150px;">分数:</span> <span style="display: inline-block; text-align: right; width: 150px;">分数:</span>
<input type="text" nz-input [(ngModel)]="it.score" (blur)="save()" style="display: inline-block; width: 300px;"> <input type="text" nz-input [(ngModel)]="it.score" (blur)="save()" style="display: inline-block; width: 300px;">
</div> </div>
......
...@@ -57,6 +57,8 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni ...@@ -57,6 +57,8 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
TEXTINPUT_GROUP = "12"; TEXTINPUT_GROUP = "12";
VIDEO_PLAY = "13"; VIDEO_PLAY = "13";
DRAWING = "14"; DRAWING = "14";
DRAWING_CHECK = "15";
CONNECTION_2LEVEL = "16";
// 评分体系 // 评分体系
RS_15_5L_FAF = "0"; RS_15_5L_FAF = "0";
...@@ -243,6 +245,10 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni ...@@ -243,6 +245,10 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
selectStartHotZoneIndex: null, // 起点热区索引 [连线题] selectStartHotZoneIndex: null, // 起点热区索引 [连线题]
selectEndHotZoneIndex: null, // 终点热区索引 [连线题] selectEndHotZoneIndex: null, // 终点热区索引 [连线题]
selectEndHotZoneShowIndex: null, // 被连接后 需要显示内容的热区 [连线题] selectEndHotZoneShowIndex: null, // 被连接后 需要显示内容的热区 [连线题]
selectStartHotZoneIndex_1: null, // 起点1热区索引 [两级连线题]
selectEndHotZoneIndex_1: null, // 终点1热区索引 [两级连线题]
selectStartHotZoneIndex_2: null, // 起点2热区索引 [两级连线题]
selectEndHotZoneIndex_2: null, // 终点2热区索引 [两级连线题]
inputText: "", // 输入文字 [文字输入组] inputText: "", // 输入文字 [文字输入组]
keyWordMatch: false, // 关键词匹配 [文字输入组] keyWordMatch: false, // 关键词匹配 [文字输入组]
...@@ -252,6 +258,9 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni ...@@ -252,6 +258,9 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
capitalizedFirstLetter: false, // 首字母大写 [文字输入组] capitalizedFirstLetter: false, // 首字母大写 [文字输入组]
notAdaptContraction: false, // 不进行缩写适配 [文字输入组] notAdaptContraction: false, // 不进行缩写适配 [文字输入组]
textAlignLeft: false, // 文字居左对齐 [文字输入组] textAlignLeft: false, // 文字居左对齐 [文字输入组]
drawingCheckCorrectColors: [], // 正确颜色 [评分画图题]
drawingCheckStrictEqual: false, // 严格相等 [评分画图题]
} }
} }
......
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