|
|
@@ -57,7 +57,7 @@
|
|
|
<span v-else>无</span>
|
|
|
</div>
|
|
|
|
|
|
- <span v-if="![7,1,3,23,18,21,71,68,23,24,32,63,28,31,39,66].includes(toolType)">题目内容</span>
|
|
|
+ <span v-if="![7,1,3,23,18,21,71,23,24,32,63,28,31,39,66].includes(toolType)">题目内容</span>
|
|
|
|
|
|
<!-- 选择题1 -->
|
|
|
<div v-if="[45].includes(toolType) && testJson">
|
|
|
@@ -372,7 +372,7 @@
|
|
|
:label="checkIndex1"
|
|
|
:disabled="isAnswer"
|
|
|
class="redioStyle"
|
|
|
- ><span v-html="item2"></span>
|
|
|
+ >{{ optionTypeList[checkIndex1] }}.<span v-html="item2"></span>
|
|
|
</el-checkbox>
|
|
|
</el-checkbox-group>
|
|
|
</div>
|
|
|
@@ -382,7 +382,7 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
<!-- 思维网格 电子白板 思维导图 -->
|
|
|
- <div id="loadLi_JieE" v-if="[7,1,3,57,18,21,71,23,24,32,63,28,31,39,66,68].includes(toolType)" style="position: relative; " class="s_b_m_b_i_m_iframe">
|
|
|
+ <div id="loadLi_JieE" v-if="[7,1,3,57,18,21,71,23,24,32,63,28,31,39,66].includes(toolType)" style="position: relative; " class="s_b_m_b_i_m_iframe">
|
|
|
<div style="display: none;
|
|
|
position: absolute;
|
|
|
height: 100%;
|
|
|
@@ -548,7 +548,7 @@
|
|
|
</iframe>
|
|
|
</div>
|
|
|
<!-- 时间轴 -->
|
|
|
- <div v-if="[68].includes(toolType)" class="s_b_m_b_i_m_evaluation">
|
|
|
+ <!-- <div v-if="[68].includes(toolType)" class="s_b_m_b_i_m_evaluation">
|
|
|
<iframe
|
|
|
frameborder="no"
|
|
|
border="0"
|
|
|
@@ -557,7 +557,7 @@
|
|
|
src="https://time.graphics/editor"
|
|
|
>
|
|
|
</iframe>
|
|
|
- </div>
|
|
|
+ </div> -->
|
|
|
|
|
|
</div>
|
|
|
|
|
|
@@ -575,16 +575,16 @@
|
|
|
<!-- 英语写口语 -->
|
|
|
<div v-if="[70].includes(toolType)" class="s_b_m_b_i_m_evaluation">
|
|
|
<EnglishVoice
|
|
|
- :englishVoiceJson='englishVoiceJson'
|
|
|
- :userid="userId"
|
|
|
- :id="id"
|
|
|
- :courseType="courseType"
|
|
|
- :taskCount="taskCount"
|
|
|
- :toolindex="toolIndex"
|
|
|
- @selectSWorks="selectSWorks"
|
|
|
- @selectStudent="selectStudent"
|
|
|
- :englishVoiceJsonWork="englishVoiceJsonWork"></EnglishVoice>
|
|
|
- </div>
|
|
|
+ :englishVoiceJson='englishVoiceJson'
|
|
|
+ :userid="userId"
|
|
|
+ :id="id"
|
|
|
+ :courseType="courseType"
|
|
|
+ :taskCount="taskCount"
|
|
|
+ :toolindex="toolIndex"
|
|
|
+ @selectSWorks="selectSWorks"
|
|
|
+ @selectStudent="selectStudent"
|
|
|
+ :englishVoiceJsonWork="englishVoiceJsonWork"></EnglishVoice>
|
|
|
+ </div>
|
|
|
|
|
|
<!-- 学生分组 -->
|
|
|
<div v-if="[49].includes(toolType) && groupStudent.length > 0" class="s_b_m_b_i_m_evaluation">
|
|
|
@@ -804,7 +804,7 @@
|
|
|
exitGroup(
|
|
|
groupStudent[toolIndex][gindex] &&
|
|
|
groupStudent[toolIndex][gindex][
|
|
|
- groupStudentUid[toolIndex][gindex].indexOf(userId)
|
|
|
+ groupStudentUid[toolIndex][gindex].indexOf(userId)
|
|
|
].id
|
|
|
)
|
|
|
"
|
|
|
@@ -1393,6 +1393,7 @@ export default {
|
|
|
AIUrl:'',
|
|
|
show: false,
|
|
|
showType: 0,
|
|
|
+ timerId:'',
|
|
|
myAnswerList1:{}, //英语写作
|
|
|
englishList:{},//英语写作
|
|
|
englishVoiceJsonWork:[], //英语口语
|
|
|
@@ -1428,7 +1429,7 @@ export default {
|
|
|
worksPreview: false
|
|
|
},
|
|
|
dialogTypeList: [
|
|
|
- { label: "作业详细", value: 0,showType:[1,7,15,40,41,45,47,48,49,52,3,4,57,18,21,71,69,70,23,24,32,63,28,31,39,66,68], loading: false },
|
|
|
+ { label: "作业详细", value: 0,showType:[1,7,15,40,41,45,47,48,49,52,3,4,57,18,21,71,69,70,23,24,32,63,28,31,39,66], loading: false },
|
|
|
{ label: "题目统计", value: 1,showType:[45,15], loading: false },
|
|
|
{ label: "学生统计", value: 2,showType:[1,7,15,40,41,45,47,48,52,3,4,57], loading: false }
|
|
|
],
|
|
|
@@ -1444,7 +1445,6 @@ export default {
|
|
|
{label:"数学画板",value:31,img:require("../../assets/icon/secondToolList/networkPanel.png")},
|
|
|
{label:"GeoGebra",value:39,img:require("../../assets/icon/secondToolList/GeoGebra.png")},
|
|
|
{label:"公式编辑",value:66,img:require("../../assets/icon/secondToolList/formulaEdi.png")},
|
|
|
- {label:"时间轴",value:68,img:require("../../assets/icon/secondToolList/timeAxis.png")},
|
|
|
{label:"英语写作",value:69,img:require("../../assets/icon/secondToolList/english.png")},
|
|
|
{label:"英语口语",value:70,img:require("../../assets/icon/thirdToolList/englishVoice.png")},
|
|
|
{label:"AI智能体",value:71,img:require("../../assets/icon/fourthToolList/chatgpt.png")},
|
|
|
@@ -1663,8 +1663,7 @@ export default {
|
|
|
}
|
|
|
return _result;
|
|
|
}
|
|
|
- },
|
|
|
-
|
|
|
+ },
|
|
|
cy(){
|
|
|
let _result = ''
|
|
|
if(this.toolType==15){
|
|
|
@@ -1704,8 +1703,6 @@ export default {
|
|
|
if (JSON.stringify(newl) != JSON.stringify(this.chapInfoListData2)) {
|
|
|
this.chapInfoListData2 = newl
|
|
|
|
|
|
- console.log('获取');
|
|
|
-
|
|
|
let _tempData = newl[this.courseType].chapterInfo[0]
|
|
|
.taskJson[this.taskCount].toolChoose[this.toolIndex];
|
|
|
|
|
|
@@ -1723,15 +1720,7 @@ export default {
|
|
|
},
|
|
|
deep: true
|
|
|
},
|
|
|
- groupStudentUid2:{
|
|
|
- handler(newl){
|
|
|
- if (!this.show) return
|
|
|
-
|
|
|
- console.log('777');
|
|
|
-
|
|
|
- },
|
|
|
- deep: true
|
|
|
- },
|
|
|
+
|
|
|
worksStudentData: {
|
|
|
handler(newValue) {
|
|
|
|
|
|
@@ -2590,7 +2579,9 @@ export default {
|
|
|
if (this.testJsonCopy && this.testJsonCopy.length) {
|
|
|
this.questionsData = JSON.parse(this.testJsonCopy[0].works).text
|
|
|
}else{
|
|
|
- this.questionsData = this.testData.wordJson.text
|
|
|
+ if (this.testData.wordJson && this.testData.wordJson.text) {
|
|
|
+ this.questionsData = this.testData.wordJson.text
|
|
|
+ }
|
|
|
}
|
|
|
}else if(this.toolType == 48) { //表格
|
|
|
if (this.testJsonCopy && this.testJsonCopy.length) {
|
|
|
@@ -2666,16 +2657,22 @@ export default {
|
|
|
this.groupStudent=this.groupStudent2
|
|
|
this.groupStudentUid=this.groupStudentUid2
|
|
|
|
|
|
+
|
|
|
this.groupJson = this.testData.groupJson;
|
|
|
this.islock = this.groupJson.islock == 1 ? true : false;
|
|
|
- this.selectGroup()
|
|
|
+ this.timerId = setInterval(() => {
|
|
|
+ this.selectGroup()
|
|
|
+ console.log('分组同步');
|
|
|
+ }, 5000);
|
|
|
}
|
|
|
}
|
|
|
},
|
|
|
close() {
|
|
|
this.show = false;
|
|
|
// 清除定时器
|
|
|
- // clearInterval(this.timerId);
|
|
|
+ if (this.timerId) {
|
|
|
+ clearInterval(this.timerId);
|
|
|
+ }
|
|
|
this.init();
|
|
|
this.$emit("changeSplitScreenBehavior",{code:99})
|
|
|
},
|
|
|
@@ -2792,7 +2789,7 @@ export default {
|
|
|
console.log("思维导图iframe加载数据👈")
|
|
|
|
|
|
// if (res.data[0].length > 0) {
|
|
|
- if(_data[0].length > 0){
|
|
|
+ if(_data.length > 0){
|
|
|
_iframe.contentWindow.editor.minder.importData('json',_data[0].text)
|
|
|
}
|
|
|
// }
|
|
|
@@ -2828,7 +2825,7 @@ export default {
|
|
|
console.log('_data',_data);
|
|
|
|
|
|
// this.$nextTick(()=>{
|
|
|
- let onloadListener = _iframe.onload = () =>{
|
|
|
+ // _iframe.onload = () =>{
|
|
|
console.log("电子白板iframe加载数据👈")
|
|
|
if(_data[0]){
|
|
|
_iframe.contentWindow.h.app.updateScene({elements:JSON.parse(_data[0].text)})
|
|
|
@@ -2847,7 +2844,7 @@ export default {
|
|
|
script.src = src;
|
|
|
_iframe.contentWindow.document.body.appendChild(script);
|
|
|
});
|
|
|
- }
|
|
|
+ // }
|
|
|
// if (onloadListener) {
|
|
|
// _iframe.contentDocument.location.reload()
|
|
|
// } else {
|
|
|
@@ -2878,7 +2875,6 @@ export default {
|
|
|
|
|
|
})
|
|
|
}else if([7].includes(this.toolType)){ //思维网格ok
|
|
|
- console.log("思维网格")
|
|
|
let _iframe = this.$refs.iframeThoughtGridRef;
|
|
|
_iframe.onload = () =>{
|
|
|
console.log("思维网格iframe加载数据👈")
|
11wqe1