diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue index 535193f..2d2b7ff 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbAllDjjgsList.vue @@ -1,5 +1,5 @@ + @@ -66,6 +68,7 @@ const toggleSearchStatus = ref(false); const WjxWjxxTmlbDjjgModalPage = ref(); const ZgtpfModalPage = ref(); const sjxxInfo = ref({}); +const loadingCeshi = ref(false); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -124,12 +127,15 @@ function handleZgtpf() { function handleHqjg(record){ console.log(record); - defHttp.post({url:'/wjxDjxx/updateDjjg',params:record}).then(res=>{ - console.log('-->',res) - }) - // defHttp.post({url:'/wjxDjxx/getDjjg',params:record}).then(res=>{ + // defHttp.post({url:'/wjxDjxx/updateDjjg',params:record}).then(res=>{ // console.log('-->',res) // }) + loadingCeshi.value = true; + defHttp.post({url:'/wjxDjxx/getDjjg',params:record}).then(res=>{ + console.log('-->',res) + loadingCeshi.value = false; + reload(); + }) } /** @@ -142,10 +148,11 @@ function getTableAction(record) { label: '答卷结果', onClick: handlePeizhiDjjg.bind(null, record), }, - //{ - // label: '获取结果', - // onClick: handleHqjg.bind(null, record), - //}, + { + label: '获取结果', + onClick: handleHqjg.bind(null, record), + ifShow: record.answerSeconds == 0, + }, { label: '主观题评分', onClick: handleZgypf.bind(null, record), diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjV2Form.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjV2Form.vue index bd775ff..91f41de 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjV2Form.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjV2Form.vue @@ -309,19 +309,26 @@ function edit(record, isDisabled, type, flag) { async function submitForm() { const data = tiganData.value; const values = Object.assign([], data); + console.log("🚀 ~ submitForm ~ values:", values) for (let i = 0; i < values.length; i++) { let param = values[i]; if (param.wjType == 3 || param.wjType == 4) { if (param.itemSelected == null) { emit('closeLoading'); - createMessage.warning('有题目没有作答,请检查试卷,完成所有作答!'); + createMessage.warning('第'+(i+1)+'题没有作答,请检查试卷,完成所有作答!'); return; } values[i].itemSelected = param.itemSelected + ''; } else if (param.wjType == 5) { if (param.wjAnswer == null || param.wjAnswer == '') { emit('closeLoading'); - createMessage.warning('有题目没有作答,请检查试卷,完成所有作答!'); + createMessage.warning('第'+(i+1)+'题没有作答,请检查试卷,完成所有作答!'); + return; + } + } else if (param.wjType == 8) { + if (param.wjAnswer == null || param.wjAnswer == '') { + emit('closeLoading'); + createMessage.warning('第'+(i+1)+'题没有作答,请检查试卷,完成所有作答!'); return; } } diff --git a/src/views/kc/wjxWjxx/components/ZgtpfForm.vue b/src/views/kc/wjxWjxx/components/ZgtpfForm.vue index 060b1f9..46eba9c 100644 --- a/src/views/kc/wjxWjxx/components/ZgtpfForm.vue +++ b/src/views/kc/wjxWjxx/components/ZgtpfForm.vue @@ -220,32 +220,28 @@ async function submitForm() { var list = tiganData.value; console.log('👩‍🎤', list); for (var i = 0; i < list.length; i++) { - if (!(list[i].itemScore+"")) { - console.log("🚀 ~ submitForm ~ list[i].itemScore:", list[i].itemScore+"") + if (!(list[i].itemScore+"")||(list[i].itemScore+"")=='null'||(list[i].itemScore+"")==null) { createMessage.warning('第【'+(i+1)+'】题您未填写评分,请填写评分!'); return; } } - // console.log(list); console.log("🚀 ~ submitForm ~ list:", list) defHttp.post({ url: '/wjxDjxx/editSdpf', params: list }).then((res) => { console.log('😕', res); - // createMessage.success('保存成功'); emit('ok'); }); } async function submitNextForm() { var list = tiganData.value; - console.log('👩‍🎤', list); + console.log("🚀 ~ submitNextForm ~ list:", list) for (var i = 0; i < list.length; i++) { - if (!(list[i].itemScore+"")) { + if (!(list[i].itemScore+"")||(list[i].itemScore+"")=='null'||(list[i].itemScore+"")==null) { createMessage.warning('第【'+(i+1)+'】题您未填写评分,请填写评分!'); return; } } defHttp.post({ url: '/wjxDjxx/editSdpf', params: list }).then((res) => { console.log('😕', res); - // createMessage.success('保存成功'); edit({ vid: infoData.value.vid }); }); } diff --git a/src/views/site/common/video/videojs/viewPage.vue b/src/views/site/common/video/videojs/viewPage.vue index 4e84709..4002428 100644 --- a/src/views/site/common/video/videojs/viewPage.vue +++ b/src/views/site/common/video/videojs/viewPage.vue @@ -39,7 +39,7 @@ ? diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue index 38be83a..0b51269 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue @@ -49,10 +49,10 @@ 课程资源 - +