From 622ed8a4a12b21e8b259a93ab36d673d43cbe23c Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 13 May 2024 16:29:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../site/pjjgPage/studentPjjgTeaList.vue | 18 ++- .../checkKecheng/dqxqkcDetail.vue | 67 +++++++-- src/views/site/studentWdkc/studentMenu.vue | 13 +- src/views/zy/zyCjwt/ZyCjwt.api.ts | 13 +- src/views/zy/zyCjwt/components/ZyCjwtForm.vue | 6 +- .../zy/zyCjwt/components/ZyCjwtModal.vue | 4 +- src/views/zy/zyInfo/StudentZyInfoList.vue | 20 +-- src/views/zy/zyInfo/ZyInfoList.vue | 13 +- .../zy/zyInfoStudent/ZyInfoStudent.data.ts | 24 ++-- .../zy/zyInfoStudent/ZyInfoStudentList.vue | 62 ++++++++- .../components/ZyInfoStudentScoreForm.vue | 129 ++++++++++++++++++ .../components/ZyInfoStudentScoreModal.vue | 75 ++++++++++ 12 files changed, 386 insertions(+), 58 deletions(-) create mode 100644 src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue create mode 100644 src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreModal.vue diff --git a/src/views/site/pjjgPage/studentPjjgTeaList.vue b/src/views/site/pjjgPage/studentPjjgTeaList.vue index 608c9c7..9974c15 100644 --- a/src/views/site/pjjgPage/studentPjjgTeaList.vue +++ b/src/views/site/pjjgPage/studentPjjgTeaList.vue @@ -54,13 +54,17 @@ diff --git a/src/views/site/studentWdkc/studentMenu.vue b/src/views/site/studentWdkc/studentMenu.vue index 2a8efaf..398eba3 100644 --- a/src/views/site/studentWdkc/studentMenu.vue +++ b/src/views/site/studentWdkc/studentMenu.vue @@ -20,11 +20,11 @@ - 当前作业 - 历史作业 + 课程作业 + 课程测验 - 课堂调查 + 问卷调查 讨论区 @@ -59,12 +59,13 @@ function getGzt(zytype){ console.log(`🚀 ~ getGzt ~ type:`, zytype) - var href = "/stuzy/dqkcDqzy"; + var href = ""; if(zytype=='dqzy'){ href = "/stuzy/studentDqzy"; - }else if(zytype=='lszy'){ - href = "/stuzy/studentLszy"; } + // else if(zytype=='lszy'){ + // href = "/stuzy/studentLszy"; + // } router.push({path:href,query: {rwbh,xqxn,type}}); } diff --git a/src/views/zy/zyCjwt/ZyCjwt.api.ts b/src/views/zy/zyCjwt/ZyCjwt.api.ts index 04ef6cb..ad1fc2a 100644 --- a/src/views/zy/zyCjwt/ZyCjwt.api.ts +++ b/src/views/zy/zyCjwt/ZyCjwt.api.ts @@ -36,8 +36,17 @@ export const list = (params) => defHttp.get({ url: Api.list, params }); * @param handleSuccess */ export const deleteOne = (params,handleSuccess) => { - return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { - handleSuccess(); + createConfirm({ + iconType: 'warning', + title: '确认删除', + content: '是否删除选中数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + return defHttp.delete({url: Api.deleteOne, params}, {joinParamsToUrl: true}).then(() => { + handleSuccess(); + }); + } }); } diff --git a/src/views/zy/zyCjwt/components/ZyCjwtForm.vue b/src/views/zy/zyCjwt/components/ZyCjwtForm.vue index 2e5248a..0950e83 100644 --- a/src/views/zy/zyCjwt/components/ZyCjwtForm.vue +++ b/src/views/zy/zyCjwt/components/ZyCjwtForm.vue @@ -4,7 +4,7 @@ - + @@ -65,8 +65,8 @@ /** * 新增 */ - function add() { - edit({}); + function add(record) { + edit(record); } /** diff --git a/src/views/zy/zyCjwt/components/ZyCjwtModal.vue b/src/views/zy/zyCjwt/components/ZyCjwtModal.vue index ce140fe..14651c1 100644 --- a/src/views/zy/zyCjwt/components/ZyCjwtModal.vue +++ b/src/views/zy/zyCjwt/components/ZyCjwtModal.vue @@ -18,11 +18,11 @@ /** * 新增 */ - function add() { + function add(record) { title.value = '新增'; visible.value = true; nextTick(() => { - registerForm.value.add(); + registerForm.value.add(record); }); } diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue index 8e07f03..21840b9 100644 --- a/src/views/zy/zyInfo/StudentZyInfoList.vue +++ b/src/views/zy/zyInfo/StudentZyInfoList.vue @@ -9,11 +9,11 @@ - + @@ -189,7 +189,7 @@ var url = "/zyInfo/zyInfo/edit"; var params = {id:record.id,zyStatus:'1'}; defHttp.post({ url: url, params }).then((res) => { - handleSuccess(); + handleZySuccess(record.id); }); } }); @@ -202,6 +202,15 @@ function handleSuccess() { reload() } + + function handleZySuccess(zyid){ + setTimeout(()=>{handleSuccess()}, 1500); + + var url = "/zyInfo/zyInfo/editStudent"; + defHttp.get({ url: url, params:{id:zyid} }).then((res) => { + }); + + } /** diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts index 1954b91..03cad2b 100644 --- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts +++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts @@ -19,18 +19,18 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'createTime' }, - { - title: '作业附件', - align: "center", - dataIndex: 'filePath', - slots: { customRender: 'fileSlot' }, - }, - { - title: '在线预览', - align: "center", - dataIndex: 'filePath', - slots: { customRender: 'fileZxSlot' }, - }, + // { + // title: '作业附件', + // align: "center", + // dataIndex: 'filePath', + // slots: { customRender: 'fileSlot' }, + // }, + // { + // title: '在线预览', + // align: "center", + // dataIndex: 'filePath', + // slots: { customRender: 'fileZxSlot' }, + // }, { title: '外网相似律', align: "center", diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue index aa2210c..c0f4085 100644 --- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue +++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue @@ -48,6 +48,8 @@ + + @@ -61,12 +63,15 @@ import ZyInfoStudentModal from './components/ZyInfoStudentModal.vue' import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; + import ZyInfoStudentScoreModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentScoreModal.vue' + const queryParam = ref({}); const mainId = ref(''); const toggleSearchStatus = ref(false); const registerModal = ref(); + const registerScoreModal = ref(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { @@ -76,7 +81,7 @@ import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; canResize:false, useSearchForm: false, actionColumn: { - width: 120, + width: 220, fixed: 'right', }, beforeFetch: (params) => { @@ -124,6 +129,11 @@ import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; registerModal.value.disableSubmit = false; registerModal.value.edit(record); } + + function handleScore(record: Recordable) { + registerScoreModal.value.disableSubmit = false; + registerScoreModal.value.edit(record); + } /** * 详情 @@ -153,17 +163,61 @@ import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; function handleSuccess() { reload(); } + + function handleDown(record){ + downloadFile(text); + } /** * 操作栏 */ function getTableAction(record) { - return [ + if(record.filePath){ + if(record.score){ + var list = [ + { + label: '详情', + onClick: handleDetail.bind(null, record), + }, + { + label: '下载', + onClick: handleDown.bind(null, record), + }, + { + label: '预览', + onClick: yulanFile.bind(null, record), + }]; + return list; + }else{ + var list = [ + { + label: '评分', + onClick: handleScore.bind(null, record), + }, + { + label: '详情', + onClick: handleDetail.bind(null, record), + }, + { + label: '下载', + onClick: handleDown.bind(null, record), + }, + { + label: '预览', + onClick: yulanFile.bind(null, record), + }]; + return list; + } + + }else{ + var list = [ { label: '详情', onClick: handleDetail.bind(null, record), - }, - ]; + },]; + return list; + } + } /** diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue new file mode 100644 index 0000000..5797352 --- /dev/null +++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreForm.vue @@ -0,0 +1,129 @@ + + + + + diff --git a/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreModal.vue b/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreModal.vue new file mode 100644 index 0000000..5d25f19 --- /dev/null +++ b/src/views/zy/zyInfoStudent/components/ZyInfoStudentScoreModal.vue @@ -0,0 +1,75 @@ + + + + +