|
|
@@ -1588,7 +1588,7 @@
|
|
|
@click="returnTest(scope.row)"
|
|
|
type="primary"
|
|
|
size="small"
|
|
|
- v-if="((examineData && examineData.type == 1) || !examineData) && review == '1'"
|
|
|
+ v-if="((examineData && examineData.type == 1) || !examineData) && review == '1'"
|
|
|
>退回</el-button
|
|
|
>
|
|
|
<!-- v-if="((examineData && examineData.type == 1) || !examineData) && review == '1'" -->
|
|
|
@@ -2051,6 +2051,7 @@
|
|
|
@changeCover="changeCover"
|
|
|
/>
|
|
|
<checkFileListDialog ref="checkFileListDialogRef" @checkFile="checkFile" @downloadFile="downloadFile"/>
|
|
|
+ <returnTestDialog ref="returnTestDialogRef" :title="testJson.title" @success="getData"/>
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
|
@@ -2082,6 +2083,9 @@ import docxTemplateDialog from "./docxTemplateDialog";
|
|
|
//查看文件
|
|
|
import checkFileListDialog from "./checkFileListDialog.vue";
|
|
|
|
|
|
+//退回弹窗
|
|
|
+import returnTestDialog from "./returnTestDialog.vue";
|
|
|
+
|
|
|
const getFile = (url) => {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
var credentials = {
|
|
|
@@ -2138,7 +2142,8 @@ export default {
|
|
|
wordcloud,
|
|
|
aiBoxRight,
|
|
|
docxTemplateDialog,
|
|
|
- checkFileListDialog
|
|
|
+ checkFileListDialog,
|
|
|
+ returnTestDialog
|
|
|
},
|
|
|
data() {
|
|
|
return {
|
|
|
@@ -2484,9 +2489,13 @@ export default {
|
|
|
let kpl = this.tableWorksArray[kin].array
|
|
|
// console.log('kpl',this.tableWorksArray[kin]);
|
|
|
|
|
|
- for (let index = 0; index < kpl.length; index++) {
|
|
|
+ for (let index = 0; index < kpl.length; index++) {
|
|
|
if (kpl[index].type == 3 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
- userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
|
|
|
+ if (kpl[index].json.answer2) {
|
|
|
+ userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
|
|
|
+ }else{
|
|
|
+ userWork.push(kpl[index].json.title +':'+ '')
|
|
|
+ }
|
|
|
}
|
|
|
if (kpl[index].type == 5 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
if (kpl[index].json.file && kpl[index].json.file[0].url) {
|
|
|
@@ -2495,13 +2504,19 @@ export default {
|
|
|
userWork.push(kpl[index].json.title+':' + _fileid.join('、'))
|
|
|
}
|
|
|
if (kpl[index].type == 7 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
- userWork.push(kpl[index].json.title+':'+kpl[index].json.answer2)
|
|
|
+ if (kpl[index].json.answer2) {
|
|
|
+ userWork.push(kpl[index].json.title+':'+kpl[index].json.answer2)
|
|
|
+ }else{
|
|
|
+ userWork.push(kpl[index].json.title+':'+'')
|
|
|
+ }
|
|
|
}
|
|
|
if (kpl[index].type == 1 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
let kk = []
|
|
|
- kpl[index].json.answer2.forEach((e)=>{
|
|
|
- kk.push(kpl[index].json.array[e].option)
|
|
|
- })
|
|
|
+ if (kpl[index].json && kpl[index].json.answer2 && kpl[index].json.answer2.length) {
|
|
|
+ kpl[index].json.answer2.forEach((e)=>{
|
|
|
+ kk.push(kpl[index].json.array[e].option)
|
|
|
+ })
|
|
|
+ }
|
|
|
userWork.push(kpl[index].json.title+':' +kk.join(','))
|
|
|
}
|
|
|
}
|
|
|
@@ -2689,7 +2704,11 @@ ${JSON.stringify(forAllList)}
|
|
|
|
|
|
for (let index = 0; index < kpl.length; index++) {
|
|
|
if (kpl[index].type == 3 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
- userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
|
|
|
+ if (kpl[index].json.answer2) {
|
|
|
+ userWork.push(kpl[index].json.title +':'+ kpl[index].json.answer2)
|
|
|
+ }else{
|
|
|
+ userWork.push(kpl[index].json.title +':'+ '')
|
|
|
+ }
|
|
|
}
|
|
|
if (kpl[index].type == 5 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
if (kpl[index].json.file && kpl[index].json.file[0].url) {
|
|
|
@@ -2698,13 +2717,19 @@ ${JSON.stringify(forAllList)}
|
|
|
userWork.push(kpl[index].json.title+':' + _fileid.join('、'))
|
|
|
}
|
|
|
if (kpl[index].type == 7 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
- userWork.push(kpl[index].json.title+':'+kpl[index].json.answer2)
|
|
|
+ if (kpl[index].json.answer2) {
|
|
|
+ userWork.push(kpl[index].json.title+':'+kpl[index].json.answer2)
|
|
|
+ }else{
|
|
|
+ userWork.push(kpl[index].json.title+':'+'')
|
|
|
+ }
|
|
|
}
|
|
|
if (kpl[index].type == 1 && this.cueWord.fieldList.includes(kpl[index].json.title)) {
|
|
|
let kk = []
|
|
|
- kpl[index].json.answer2.forEach((e)=>{
|
|
|
- kk.push(kpl[index].json.array[e].option)
|
|
|
- })
|
|
|
+ if (kpl[index].json && kpl[index].json.answer2 && kpl[index].json.answer2.length) {
|
|
|
+ kpl[index].json.answer2.forEach((e)=>{
|
|
|
+ kk.push(kpl[index].json.array[e].option)
|
|
|
+ })
|
|
|
+ }
|
|
|
userWork.push(kpl[index].json.title+':' +kk.join(','))
|
|
|
}
|
|
|
}
|
|
|
@@ -2915,11 +2940,11 @@ ${JSON.stringify(forAllList)}
|
|
|
let scoArr = []
|
|
|
// 新添加的评分
|
|
|
const ids1 = this.scoList.map(item => item.id);
|
|
|
- console.log('ids1',ids1);
|
|
|
+ // console.log('ids1',ids1);
|
|
|
|
|
|
// jiu评分
|
|
|
scoArr = this.scoListCopy.filter(item => !ids1.includes(item.id));
|
|
|
- console.log('scoArr',JSON.parse(JSON.stringify('scoArr')));
|
|
|
+ // console.log('scoArr',JSON.parse(JSON.stringify('scoArr')));
|
|
|
|
|
|
|
|
|
scoArr = [...this.scoList,...scoArr]
|
|
|
@@ -3437,6 +3462,7 @@ ${JSON.stringify(forAllList)}
|
|
|
name: this.works[i].username ? this.works[i].username : "匿名",
|
|
|
time: this.works[i].time,
|
|
|
array: _json2,
|
|
|
+ testName:this.works[i].testName,
|
|
|
isReview:this.works[i].isReview,
|
|
|
cut: 0,
|
|
|
uteaName: this.works[i].uteaName,
|
|
|
@@ -4929,20 +4955,21 @@ ${JSON.stringify(item.array)}
|
|
|
returnTest(row){
|
|
|
if(row.type=='1')return this.$message.info("该表单未提交")
|
|
|
if(row.type=='4')return this.$message.info("该表单已退回")
|
|
|
- let params = [{
|
|
|
- id:row.id,
|
|
|
- type:"4"
|
|
|
- }];
|
|
|
-
|
|
|
- this.ajax.post(this.$store.state.api+"update_testCourseWorks_typeById",params).then(res=>{
|
|
|
- if(res.data==1){
|
|
|
- this.getData();
|
|
|
- // this.tableWorksArray = this.tableWorksArray.filter(i=>i.id!==row.id);
|
|
|
- this.$message.success("表单退回成功");
|
|
|
- }
|
|
|
- }).catch(e=>{
|
|
|
- console.log(e);
|
|
|
- })
|
|
|
+ this.$refs.returnTestDialogRef.open(row)
|
|
|
+ // let params = [{
|
|
|
+ // id:row.id,
|
|
|
+ // type:"4"
|
|
|
+ // }];
|
|
|
+
|
|
|
+ // this.ajax.post(this.$store.state.api+"update_testCourseWorks_typeById",params).then(res=>{
|
|
|
+ // if(res.data==1){
|
|
|
+ // this.getData();
|
|
|
+ // // this.tableWorksArray = this.tableWorksArray.filter(i=>i.id!==row.id);
|
|
|
+ // this.$message.success("表单退回成功");
|
|
|
+ // }
|
|
|
+ // }).catch(e=>{
|
|
|
+ // console.log(e);
|
|
|
+ // })
|
|
|
|
|
|
},
|
|
|
},
|
SanHQin