Commit d2ab9264 authored by 李维's avatar 李维

添加涂色题型表单配置

开发未完成
parent 713b8585
...@@ -26,6 +26,7 @@ const SORT_WORDS = "10"; ...@@ -26,6 +26,7 @@ const SORT_WORDS = "10";
const CONNECTION_CHOICE = "11"; const CONNECTION_CHOICE = "11";
const TEXTINPUT_GROUP = "12"; const TEXTINPUT_GROUP = "12";
const VIDEO_PLAY = "13"; const VIDEO_PLAY = "13";
const DRAWING = "14";
// 评分体系 // 评分体系
const RS_15_5L_FAF = "0"; const RS_15_5L_FAF = "0";
...@@ -603,6 +604,10 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -603,6 +604,10 @@ export default class SceneComponent extends MyCocosSceneComponent {
validater = this.setTextInputGroup(configItem, isDebug); validater = this.setTextInputGroup(configItem, isDebug);
this.scoreValidater.push(validater); this.scoreValidater.push(validater);
break; break;
// 画图题
case DRAWING:
this.setDrawingArea(configItem, this.data.hotZoneItemArr[configItem.linkHotZoneIndex]);
break;
} }
}); });
...@@ -2449,6 +2454,11 @@ export default class SceneComponent extends MyCocosSceneComponent { ...@@ -2449,6 +2454,11 @@ export default class SceneComponent extends MyCocosSceneComponent {
}) })
}; };
// 画图题
setDrawingArea(contentData, hotZoneItemData, debugMode=false) {
const rect = this.newRectNode(hotZoneItemData, layer_4, debugMode);
};
// 语音评测题型 // 语音评测题型
setPronunciationAssessment(contentData, hotZoneItemData, debugMode=false) { setPronunciationAssessment(contentData, hotZoneItemData, debugMode=false) {
let recordUrl = ""; let recordUrl = "";
......
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
<nz-select [(ngModel)]="it.hotZoneType" style="width: 300px;" (ngModelChange)="save()"> <nz-select [(ngModel)]="it.hotZoneType" style="width: 300px;" (ngModelChange)="save()">
<nz-option [nzValue]="TEXT_SELECT" nzLabel="文字选项"></nz-option> <nz-option [nzValue]="TEXT_SELECT" nzLabel="文字选项"></nz-option>
<nz-option [nzValue]="AUDIO_PLAY" nzLabel="播放音频"></nz-option> <nz-option [nzValue]="AUDIO_PLAY" nzLabel="播放音频"></nz-option>
<nz-option [nzValue]="VIDEO_PLAY" nzLabel="播放视频"></nz-option> <nz-option [nzValue]="VIDEO_PLAY" nzLabel="播放视频(开发中)"></nz-option>
<nz-option [nzValue]="HOT_ZONE_RADIO" nzLabel="热区选项(单选)"></nz-option> <nz-option [nzValue]="HOT_ZONE_RADIO" nzLabel="热区选项(单选)"></nz-option>
<nz-option [nzValue]="HOT_ZONE_CHECKBOX" nzLabel="热区选项(多选)"></nz-option> <nz-option [nzValue]="HOT_ZONE_CHECKBOX" nzLabel="热区选项(多选)"></nz-option>
<nz-option [nzValue]="TEXTINPUT" nzLabel="文字输入"></nz-option> <nz-option [nzValue]="TEXTINPUT" nzLabel="文字输入"></nz-option>
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
<nz-option [nzValue]="PRONUNCIATION_ASSESSMENT" nzLabel="语音评测"></nz-option> <nz-option [nzValue]="PRONUNCIATION_ASSESSMENT" nzLabel="语音评测"></nz-option>
<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]="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>
...@@ -109,7 +110,7 @@ ...@@ -109,7 +110,7 @@
</nz-table> </nz-table>
</div> </div>
<div *ngIf="it.hotZoneType != '' && it.hotZoneType != AUDIO_PLAY && it.hotZoneType != VIDEO_PLAY && 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 != 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)">
...@@ -535,7 +536,7 @@ ...@@ -535,7 +536,7 @@
</nz-select> </nz-select>
</div> </div>
<div *ngIf="it.hotZoneType != ''&& it.hotZoneType != AUDIO_PLAY && it.hotZoneType != VIDEO_PLAY && 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 != 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>
......
...@@ -56,6 +56,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni ...@@ -56,6 +56,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
CONNECTION_CHOICE = "11"; CONNECTION_CHOICE = "11";
TEXTINPUT_GROUP = "12"; TEXTINPUT_GROUP = "12";
VIDEO_PLAY = "13"; VIDEO_PLAY = "13";
DRAWING = "14";
// 评分体系 // 评分体系
RS_15_5L_FAF = "0"; RS_15_5L_FAF = "0";
...@@ -554,7 +555,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni ...@@ -554,7 +555,7 @@ export class FormComponent implements OnInit, OnChanges, OnDestroy, AfterViewIni
totalScore = parseFloat(_totalScore + ""); totalScore = parseFloat(_totalScore + "");
this.item.hotZoneConfigArr.forEach((content, contentIndex) => { this.item.hotZoneConfigArr.forEach((content, contentIndex) => {
if(content.hotZoneType != this.AUDIO_PLAY && content.hotZoneType != this.VIDEO_PLAY) { if(content.hotZoneType != this.AUDIO_PLAY && content.hotZoneType != this.VIDEO_PLAY && content.hotZoneType != this.DRAWING) {
if(allScoreIndex.indexOf(contentIndex) == -1) { if(allScoreIndex.indexOf(contentIndex) == -1) {
scoreConfigErr.push((`内容${contentIndex+1}: 没有被配置到题目内容中,请检查分数配置`)) scoreConfigErr.push((`内容${contentIndex+1}: 没有被配置到题目内容中,请检查分数配置`))
} }
......
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