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 = "";
......
export const defaultData = {"header_image_url":"http://teach.cdn.ireadabc.com/64ef29f4a806e29ecb32fe1db7c98dfb.jpg","footer_image_url":"http://teach.cdn.ireadabc.com/665e4c3e6a80563b4c33dd7bbcd18014.jpg","bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/4425cebcf3aa2eba93f8a485358badf5.jpg","rect":{"x":0,"y":612.1666666666665,"width":1550,"height":3771.666666666667}},"hotZoneItemArr":[{"index":0,"itemType":"rect","itemName":"4-2","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":1998.83,"width":618,"height":42}},{"index":1,"itemType":"rect","itemName":"4-3","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2045.55,"width":618,"height":42}},{"index":2,"itemType":"rect","itemName":"4-4","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2092.26,"width":618,"height":42}},{"index":3,"itemType":"rect","itemName":"4-5","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2138.98,"width":618,"height":42}},{"index":4,"itemType":"rect","itemName":"4-6","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2185.69,"width":618,"height":42}},{"index":5,"itemType":"rect","itemName":"4-7","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2232.4,"width":618,"height":42}},{"index":6,"itemType":"rect","itemName":"4-8","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2279.12,"width":618,"height":42}},{"index":7,"itemType":"rect","itemName":"4-9","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2325.83,"width":618,"height":42}},{"index":8,"itemType":"rect","itemName":"test-video","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":262,"y":1844.83,"width":46,"height":46}}],"hotZoneConfigArr":[{"hotZoneType":"12","linkHotZoneIndex":-1,"audio_url":"","score":"0","unselectedStyle":"none","selectedStyle":"border","rightOrWrongStyleType":"symbol","inputText":"","keyWordMatch":false,"isCaseInsensitive":true,"openAnswer":false,"useSelectOptionList":false,"keyWordMatchInOrder":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectOptionList":[],"contentList":[{"uuid":"b9480a65-bf53-4fcf-9b27-fb775d2abbe6","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"selectHotZoneIndex":0,"inputText":"1 | 2 | 3","keyWordMatch":true},{"uuid":"c7c9d9f2-2e0a-43a9-8a80-8def23430e66","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"2","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":1},{"uuid":"79a0666e-ae9b-4c58-a4b5-45d30cab4978","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"3","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":2},{"uuid":"1e4f9710-e7bb-458b-a065-22650c688465","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"4","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":3},{"uuid":"a924e16e-2c8b-4495-b743-450683849529","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"5","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":4},{"uuid":"aff3a858-e189-41a9-86a7-de300326ecd1","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"6","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":5},{"uuid":"1f0dc34e-cf88-47d9-9f53-b9609a390900","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"7","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":6},{"uuid":"a4791aec-2bda-486b-a962-46bebd07641d","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"8","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":7}]},{"hotZoneType":"13","linkHotZoneIndex":8,"audio_url":"","video_url":"http://staging-teach.cdn.ireadabc.com/2ef06de470293f307b60513e1275b27a.mp4","score":"0","unselectedStyle":"none","selectedStyle":"border","rightOrWrongStyleType":"symbol","inputText":"","keyWordMatch":false,"isCaseInsensitive":false,"openAnswer":false,"useSelectOptionList":false,"keyWordMatchInOrder":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectOptionList":[],"contentList":[]}],"scoreConfigArr":[{"linkHotZoneIndex":-1,"linkHotZoneIndexArr":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]}],"alignMode":"left","ratingSystem":"4","basicScore":"30"} export const defaultData = {"header_image_url":"http://teach.cdn.ireadabc.com/64ef29f4a806e29ecb32fe1db7c98dfb.jpg","footer_image_url":"http://teach.cdn.ireadabc.com/665e4c3e6a80563b4c33dd7bbcd18014.jpg","bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/4425cebcf3aa2eba93f8a485358badf5.jpg","rect":{"x":0,"y":612.1666666666665,"width":1550,"height":3771.666666666667}},"hotZoneItemArr":[{"index":0,"itemType":"rect","itemName":"4-2","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":1998.83,"width":618,"height":42}},{"index":1,"itemType":"rect","itemName":"4-3","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2045.55,"width":618,"height":42}},{"index":2,"itemType":"rect","itemName":"4-4","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2092.26,"width":618,"height":42}},{"index":3,"itemType":"rect","itemName":"4-5","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2138.98,"width":618,"height":42}},{"index":4,"itemType":"rect","itemName":"4-6","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2185.69,"width":618,"height":42}},{"index":5,"itemType":"rect","itemName":"4-7","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2232.4,"width":618,"height":42}},{"index":6,"itemType":"rect","itemName":"4-8","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2279.12,"width":618,"height":42}},{"index":7,"itemType":"rect","itemName":"4-9","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":819,"y":2325.83,"width":618,"height":42}},{"index":8,"itemType":"rect","itemName":"test-video","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":262,"y":1844.83,"width":46,"height":46}},{"index":9,"itemType":"rect","itemName":"hutu ","fontSize":50,"fontName":"BRLNSR_1","fontColor":"#8f3758","fontScale":1.2109375,"imgScale":1,"mapScale":1.2109375,"rect":{"x":120,"y":196.83,"width":1334,"height":388}}],"hotZoneConfigArr":[{"hotZoneType":"12","linkHotZoneIndex":-1,"audio_url":"","score":"0","unselectedStyle":"none","selectedStyle":"border","rightOrWrongStyleType":"symbol","inputText":"","keyWordMatch":false,"isCaseInsensitive":true,"openAnswer":false,"useSelectOptionList":false,"keyWordMatchInOrder":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectOptionList":[],"contentList":[{"uuid":"b9480a65-bf53-4fcf-9b27-fb775d2abbe6","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"selectHotZoneIndex":0,"inputText":"1 | 2 | 3","keyWordMatch":true},{"uuid":"c7c9d9f2-2e0a-43a9-8a80-8def23430e66","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"2","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":1},{"uuid":"79a0666e-ae9b-4c58-a4b5-45d30cab4978","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"3","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":2},{"uuid":"1e4f9710-e7bb-458b-a065-22650c688465","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"4","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":3},{"uuid":"a924e16e-2c8b-4495-b743-450683849529","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"5","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":4},{"uuid":"aff3a858-e189-41a9-86a7-de300326ecd1","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"6","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":5},{"uuid":"1f0dc34e-cf88-47d9-9f53-b9609a390900","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"7","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":6},{"uuid":"a4791aec-2bda-486b-a962-46bebd07641d","text":"","optionShowText":"","image_url":"","hotZoneIndex":null,"score":"1","isCorrect":false,"isCheck":false,"linkedShowText":"","selectStartHotZoneIndex":null,"selectEndHotZoneIndex":null,"selectEndHotZoneShowIndex":null,"inputText":"8","keyWordMatch":false,"keyWordMatchInOrder":false,"isCaseInsensitive":false,"openAnswer":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectHotZoneIndex":7}]},{"hotZoneType":"13","linkHotZoneIndex":8,"audio_url":"","video_url":"http://staging-teach.cdn.ireadabc.com/2ef06de470293f307b60513e1275b27a.mp4","score":"0","unselectedStyle":"none","selectedStyle":"border","rightOrWrongStyleType":"symbol","inputText":"","keyWordMatch":false,"isCaseInsensitive":false,"openAnswer":false,"useSelectOptionList":false,"keyWordMatchInOrder":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectOptionList":[],"contentList":[]},{"hotZoneType":"14","linkHotZoneIndex":9,"audio_url":"","video_url":"","score":"0","unselectedStyle":"none","selectedStyle":"border","rightOrWrongStyleType":"symbol","inputText":"","keyWordMatch":false,"isCaseInsensitive":false,"openAnswer":false,"useSelectOptionList":false,"keyWordMatchInOrder":false,"capitalizedFirstLetter":false,"notAdaptContraction":false,"selectOptionList":[],"contentList":[]}],"scoreConfigArr":[{"linkHotZoneIndex":-1,"linkHotZoneIndexArr":[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18]}],"alignMode":"left","ratingSystem":"4","basicScore":"90"}
\ No newline at end of file \ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -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