|
@@ -605,9 +605,9 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div class="tooldetail" v-if="tool.toolDetail != ''">
|
|
|
+ <div class="tooldetail">
|
|
|
<!-- <div class="toolTitle">工具描述</div> -->
|
|
|
- <div v-html="contentConvent(tool.toolDetail)"></div>
|
|
|
+ <div v-html="contentConvent(tool.toolDetail ? tool.toolDetail : '暂无描述')"></div>
|
|
|
</div>
|
|
|
<el-button type="primary" v-if="tool.tool[0] == 32" style="
|
|
|
position: absolute;
|
|
@@ -1082,8 +1082,6 @@
|
|
|
<div class="worksTop">
|
|
|
<div>作业预览</div>
|
|
|
</div>
|
|
|
-
|
|
|
-
|
|
|
</div>
|
|
|
<div>
|
|
|
<div class="worksDetailBox" v-if="
|
|
@@ -1821,7 +1819,108 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
-
|
|
|
+ <div class="vedioBox">
|
|
|
+ <div v-if="
|
|
|
+ tType &&
|
|
|
+ ((tType == 2 && sIsOpen == true) ||
|
|
|
+ tType == 1 ||
|
|
|
+ tType == 4) &&
|
|
|
+ tool.tool.indexOf(4) != -1 && worksStudent.length &&
|
|
|
+ worksStudent[toolIndex].length &&
|
|
|
+ (tool.askJson[0].answer ||
|
|
|
+ tool.askJson[0].answer === 0) &&
|
|
|
+ checkJson[toolIndex].length
|
|
|
+ " class="xuan_right_box">
|
|
|
+ <div class="tool_right_box" v-for="(item, index) in tool.askJson" :key="index">
|
|
|
+ <div>
|
|
|
+ <span>{{ index + 1 + "、" + item.askstitle }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="right_box_xuan">
|
|
|
+ <span>正确率</span>
|
|
|
+ <span>{{
|
|
|
+ (checkJson[toolIndex][index].right
|
|
|
+ ? checkJson[toolIndex][index].right
|
|
|
+ : 0) + "%"
|
|
|
+ }}</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="xuan_right_box" style="background: unset" v-if="
|
|
|
+ tType &&
|
|
|
+ ((tType == 2 && sIsOpen == true) ||
|
|
|
+ tType == 1 ||
|
|
|
+ tType == 4) &&
|
|
|
+ tool.tool.indexOf(4) != -1 && worksStudent.length &&
|
|
|
+ worksStudent[toolIndex].length
|
|
|
+ ">
|
|
|
+ <AskStatic v-if="
|
|
|
+ worksStudent.length &&
|
|
|
+ worksStudent[toolIndex].length > 0
|
|
|
+ " :askJSON="tool" :checkJson="checkJson[toolIndex]"></AskStatic>
|
|
|
+ </div>
|
|
|
+ <div v-if="
|
|
|
+ tType &&
|
|
|
+ ((tType == 2 && sIsOpen == true) ||
|
|
|
+ tType == 1 ||
|
|
|
+ tType == 4) &&
|
|
|
+ tool.tool.indexOf(45) != -1 && worksStudent.length &&
|
|
|
+ worksStudent[toolIndex].length &&
|
|
|
+ (tool.testJson.testJson[0].answer ||
|
|
|
+ tool.testJson.testJson[0].answer === 0) &&
|
|
|
+ checkJson[toolIndex].length
|
|
|
+ " class="xuan_right_box">
|
|
|
+ <div class="tool_right_box" v-for="(item, index) in tool.testJson.testJson" :key="index">
|
|
|
+ <div>
|
|
|
+ <span>{{ index + 1 + "、" + item.teststitle }}</span>
|
|
|
+ </div>
|
|
|
+ <div class="right_box_xuan">
|
|
|
+ <span>正确率</span>
|
|
|
+ <span>{{
|
|
|
+ (checkJson[toolIndex][index].right
|
|
|
+ ? checkJson[toolIndex][index].right
|
|
|
+ : 0) + "%"
|
|
|
+ }}</span>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
+ <div class="xuan_right_box" style="background: unset" v-if="
|
|
|
+ tType &&
|
|
|
+ ((tType == 2 && sIsOpen == true) ||
|
|
|
+ tType == 1 ||
|
|
|
+ tType == 4) &&
|
|
|
+ tool.tool.indexOf(45) != -1 && worksStudent.length &&
|
|
|
+ worksStudent[toolIndex].length
|
|
|
+ ">
|
|
|
+ <AskStatic2 v-if="
|
|
|
+ worksStudent.length &&
|
|
|
+ worksStudent[toolIndex].length > 0
|
|
|
+ " :askJSON="tool" :checkJson="checkJson[toolIndex]"></AskStatic2>
|
|
|
+ </div>
|
|
|
+ <div v-if="
|
|
|
+ tType &&
|
|
|
+ ((tType == 2 && sIsOpen == true) ||
|
|
|
+ tType == 1 ||
|
|
|
+ tType == 4) &&
|
|
|
+ tool.tool.indexOf(41) != -1
|
|
|
+ ">
|
|
|
+ <AnswerData2 v-if="
|
|
|
+ worksStudent.length &&
|
|
|
+ worksStudent[toolIndex].length > 0
|
|
|
+ " :problemJson="tool.selectJson.answer" :people="worksStudent[toolIndex]"></AnswerData2>
|
|
|
+ </div>
|
|
|
+ <div v-if="
|
|
|
+ tType &&
|
|
|
+ ((tType == 2 && sIsOpen == true) ||
|
|
|
+ tType == 1 ||
|
|
|
+ tType == 4) &&
|
|
|
+ tool.tool.indexOf(47) != -1
|
|
|
+ ">
|
|
|
+ <AnswerData v-if="
|
|
|
+ checkJson[toolIndex].length &&
|
|
|
+ (tool.sentenceList || tool.sentenceList.length > 0)
|
|
|
+ " :people="checkJson[toolIndex]"></AnswerData>
|
|
|
+ </div>
|
|
|
+ </div>
|
|
|
<div class="vedioBox" v-if="arrayToArray(tool.tool, isWorkTool).length">
|
|
|
<div class="queTop" style="
|
|
|
font-size: 25px;
|
|
@@ -2336,44 +2435,6 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-if="
|
|
|
- tType &&
|
|
|
- ((tType == 2 && sIsOpen == true) ||
|
|
|
- tType == 1 ||
|
|
|
- tType == 4) &&
|
|
|
- tool.tool.indexOf(4) != -1 && worksStudent.length &&
|
|
|
- worksStudent[toolIndex].length &&
|
|
|
- (tool.askJson[0].answer ||
|
|
|
- tool.askJson[0].answer === 0) &&
|
|
|
- checkJson[toolIndex].length
|
|
|
- " class="xuan_right_box">
|
|
|
- <div class="tool_right_box" v-for="(item, index) in tool.askJson" :key="index">
|
|
|
- <div>
|
|
|
- <span>{{ index + 1 + "、" + item.askstitle }}</span>
|
|
|
- </div>
|
|
|
- <div class="right_box_xuan">
|
|
|
- <span>正确率</span>
|
|
|
- <span>{{
|
|
|
- (checkJson[toolIndex][index].right
|
|
|
- ? checkJson[toolIndex][index].right
|
|
|
- : 0) + "%"
|
|
|
- }}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="xuan_right_box" style="background: unset" v-if="
|
|
|
- tType &&
|
|
|
- ((tType == 2 && sIsOpen == true) ||
|
|
|
- tType == 1 ||
|
|
|
- tType == 4) &&
|
|
|
- tool.tool.indexOf(4) != -1 && worksStudent.length &&
|
|
|
- worksStudent[toolIndex].length
|
|
|
- ">
|
|
|
- <AskStatic v-if="
|
|
|
- worksStudent.length &&
|
|
|
- worksStudent[toolIndex].length > 0
|
|
|
- " :askJSON="tool" :checkJson="checkJson[toolIndex]"></AskStatic>
|
|
|
- </div>
|
|
|
<div v-if="
|
|
|
tType &&
|
|
|
((tType == 2 && sIsOpen == true) ||
|
|
@@ -2425,44 +2486,6 @@
|
|
|
</div>
|
|
|
|
|
|
</div>
|
|
|
- <div v-if="
|
|
|
- tType &&
|
|
|
- ((tType == 2 && sIsOpen == true) ||
|
|
|
- tType == 1 ||
|
|
|
- tType == 4) &&
|
|
|
- tool.tool.indexOf(45) != -1 && worksStudent.length &&
|
|
|
- worksStudent[toolIndex].length &&
|
|
|
- (tool.testJson.testJson[0].answer ||
|
|
|
- tool.testJson.testJson[0].answer === 0) &&
|
|
|
- checkJson[toolIndex].length
|
|
|
- " class="xuan_right_box">
|
|
|
- <div class="tool_right_box" v-for="(item, index) in tool.testJson.testJson" :key="index">
|
|
|
- <div>
|
|
|
- <span>{{ index + 1 + "、" + item.teststitle }}</span>
|
|
|
- </div>
|
|
|
- <div class="right_box_xuan">
|
|
|
- <span>正确率</span>
|
|
|
- <span>{{
|
|
|
- (checkJson[toolIndex][index].right
|
|
|
- ? checkJson[toolIndex][index].right
|
|
|
- : 0) + "%"
|
|
|
- }}</span>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- </div>
|
|
|
- <div class="xuan_right_box" style="background: unset" v-if="
|
|
|
- tType &&
|
|
|
- ((tType == 2 && sIsOpen == true) ||
|
|
|
- tType == 1 ||
|
|
|
- tType == 4) &&
|
|
|
- tool.tool.indexOf(45) != -1 && worksStudent.length &&
|
|
|
- worksStudent[toolIndex].length
|
|
|
- ">
|
|
|
- <AskStatic2 v-if="
|
|
|
- worksStudent.length &&
|
|
|
- worksStudent[toolIndex].length > 0
|
|
|
- " :askJSON="tool" :checkJson="checkJson[toolIndex]"></AskStatic2>
|
|
|
- </div>
|
|
|
<div v-if="
|
|
|
tType &&
|
|
|
((tType == 2 && sIsOpen == true) ||
|
|
@@ -3102,18 +3125,6 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-if="
|
|
|
- tType &&
|
|
|
- ((tType == 2 && sIsOpen == true) ||
|
|
|
- tType == 1 ||
|
|
|
- tType == 4) &&
|
|
|
- tool.tool.indexOf(41) != -1
|
|
|
- ">
|
|
|
- <AnswerData2 v-if="
|
|
|
- worksStudent.length &&
|
|
|
- worksStudent[toolIndex].length > 0
|
|
|
- " :problemJson="tool.selectJson.answer" :people="worksStudent[toolIndex]"></AnswerData2>
|
|
|
- </div>
|
|
|
<div v-if="
|
|
|
tType &&
|
|
|
((tType == 2 && sIsOpen == true) ||
|
|
@@ -3159,18 +3170,6 @@
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
- <div v-if="
|
|
|
- tType &&
|
|
|
- ((tType == 2 && sIsOpen == true) ||
|
|
|
- tType == 1 ||
|
|
|
- tType == 4) &&
|
|
|
- tool.tool.indexOf(47) != -1
|
|
|
- ">
|
|
|
- <AnswerData v-if="
|
|
|
- checkJson[toolIndex].length &&
|
|
|
- (tool.sentenceList || tool.sentenceList.length > 0)
|
|
|
- " :people="checkJson[toolIndex]"></AnswerData>
|
|
|
- </div>
|
|
|
<div v-if="
|
|
|
tType &&
|
|
|
((tType == 2 && sIsOpen == true) ||
|
|
@@ -4592,7 +4591,7 @@
|
|
|
<el-button type="primary" @click="dialogVisibleSentence1 = false">确 定</el-button>
|
|
|
</span>
|
|
|
</el-dialog>
|
|
|
- <el-dialog title="教师提交作业" :visible.sync="dialogVisibleWorks" :append-to-body="true" width="500px"
|
|
|
+ <el-dialog title="提交作业" :visible.sync="dialogVisibleWorks" :append-to-body="true" width="500px"
|
|
|
:before-close="handleClose" class="dialog_change">
|
|
|
<div class="marginT">
|
|
|
<div class="w_name">
|
|
@@ -12209,6 +12208,7 @@ export default {
|
|
|
border-radius: 20px;
|
|
|
background: #fff;
|
|
|
margin-bottom: 10px;
|
|
|
+ overflow:auto;
|
|
|
}
|
|
|
|
|
|
.taskBox {
|
|
@@ -12228,7 +12228,7 @@ export default {
|
|
|
}
|
|
|
|
|
|
.toolBox {
|
|
|
- padding: 20px 60px 0;
|
|
|
+ padding: 20px 60px 15px;
|
|
|
display: flex;
|
|
|
position: relative;
|
|
|
}
|
|
@@ -14273,7 +14273,7 @@ ol {
|
|
|
|
|
|
.toolBoxSteps:nth-child(1)>img,
|
|
|
.toolBoxSteps:nth-child(2)>img {
|
|
|
- width: 35px;
|
|
|
+ width: 24px;
|
|
|
}
|
|
|
|
|
|
.toolBoxSteps:nth-child(1) {
|