From f42ec6eeca1ba4d9968055ae29997449986dfa8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com> Date: Fri, 10 May 2024 21:15:47 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=98=9F=EF=BC=9A?= =?UTF-8?q?=E8=AF=95=E5=8D=B7=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=E3=80=81?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AD=94=E5=8D=B7=E7=BB=93=E6=9E=9C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/kc/wjxWjxx/WjxWjxx.data.ts | 36 ++- src/views/kc/wjxWjxx/WjxWjxxList.vue | 283 +++++++++--------- .../kc/wjxWjxx/components/WjxWjxxForm.vue | 64 ++-- .../kc/wjxWjxx/components/WjxWjxxModal.vue | 10 +- .../wjxWjxx/components/WjxWjxxTmlbDjForm.vue | 4 +- .../components/WjxWjxxTmlbDjjgForm.vue | 8 +- .../components/WjxWjxxTmlbDjjgs.api.ts | 15 + .../components/WjxWjxxTmlbDjjgs.data.ts | 82 +++++ .../components/WjxWjxxTmlbDjjgsList.vue | 107 +++++++ .../components/WjxWjxxTmlbDjjgsModal.vue | 63 ++++ .../kc/wjxWjxx/components/WjxWjxxTmlbForm.vue | 6 +- 11 files changed, 503 insertions(+), 175 deletions(-) create mode 100644 src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.api.ts create mode 100644 src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts create mode 100644 src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue create mode 100644 src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue diff --git a/src/views/kc/wjxWjxx/WjxWjxx.data.ts b/src/views/kc/wjxWjxx/WjxWjxx.data.ts index 77e8ba7..02c4f5a 100644 --- a/src/views/kc/wjxWjxx/WjxWjxx.data.ts +++ b/src/views/kc/wjxWjxx/WjxWjxx.data.ts @@ -4,18 +4,28 @@ import { rules} from '/@/utils/helper/validator'; import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ + // { + // title: '创建人', + // align: "center", + // dataIndex: 'createBy' + // }, + // { + // title: '创建时间', + // align: "center", + // dataIndex: 'createTime', + // customRender:({text}) =>{ + // return !text?"":(text.length>10?text.substr(0,10):text); + // }, + // }, { - title: '创建人', + title: '学年学期', align: "center", - dataIndex: 'createBy' + dataIndex: 'xnxq' }, { - title: '创建时间', + title: '课程名称', align: "center", - dataIndex: 'createTime', - customRender:({text}) =>{ - return !text?"":(text.length>10?text.substr(0,10):text); - }, + dataIndex: 'kcmc' }, { title: '问卷名称', @@ -29,11 +39,21 @@ export const columns: BasicColumn[] = [ customRender: ({ text }) => { let dictMap = { '1': '调查', - '6': '考试', + '6': '随堂练', } return dictMap[text??'']; } }, + { + title: '开始时间', + align: "center", + dataIndex: 'startTime' + }, + { + title: '结束时间', + align: "center", + dataIndex: 'endTime' + }, { title: '问卷描述', align: "center", diff --git a/src/views/kc/wjxWjxx/WjxWjxxList.vue b/src/views/kc/wjxWjxx/WjxWjxxList.vue index 7af79da..3a27561 100644 --- a/src/views/kc/wjxWjxx/WjxWjxxList.vue +++ b/src/views/kc/wjxWjxx/WjxWjxxList.vue @@ -1,14 +1,22 @@ diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue index 8cb2eff..677859f 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxForm.vue @@ -8,15 +8,13 @@ - - - 调查 - 考试 - + + + + + + + @@ -24,37 +22,55 @@ - + + + + + + + + + + + + + + diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue new file mode 100644 index 0000000..1f60f4f --- /dev/null +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsModal.vue @@ -0,0 +1,63 @@ + + + + + diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue index 4333f79..bf961c8 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue @@ -140,7 +140,7 @@ function handleRemTmxx(record,index,list){ } } function getType(value,type){ - console.log(`🚀 ~ getType ~ value,type:`, value,type) + // console.log(`🚀 ~ getType ~ value,type:`, value,type) if(type=='3'){ return parseInt(value); }else if(type=='4'){ @@ -153,7 +153,7 @@ function edit(record){ title.value = record.title; mainId.value = record.id; defHttp.get({url:'/wjxWjxxTmlb/wjxWjxxTmlb/queryByMainId',params:{id:record.id}}).then(res =>{ - console.log(`🚀 ~ defHttp.get ~ res:`, res) + // console.log(`🚀 ~ defHttp.get ~ res:`, res) var list = res; for(var i=0;i Date: Fri, 10 May 2024 21:22:52 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E9=97=AE=E5=8D=B7=E6=98=9F=EF=BC=9A?= =?UTF-8?q?=E8=AF=95=E5=8D=B7=E9=A1=B5=E9=9D=A2=E8=B0=83=E6=95=B4=E3=80=81?= =?UTF-8?q?=E5=AD=A6=E7=94=9F=E7=AD=94=E5=8D=B7=E7=BB=93=E6=9E=9C=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/WjxWjxxTmlbDjjgs.data.ts | 36 ++++++++++++------- .../components/WjxWjxxTmlbDjjgsList.vue | 5 +-- .../components/WjxWjxxTmlbDjjgsModal.vue | 4 +-- 3 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts index 05f5d20..bfb9a6c 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgs.data.ts @@ -7,62 +7,74 @@ export const columns: BasicColumn[] = [ { title: '问卷名称', align: "center", - dataIndex: 'title' + dataIndex: 'title', + width: 200 }, { title: '学生', align: "center", - dataIndex: 'userName' + dataIndex: 'userName', + width: 100 }, { title: '得分', align: "center", - dataIndex: 'score' + dataIndex: 'score', + width: 80 }, { title: '总分数', align: "center", - dataIndex: 'totalScore' + dataIndex: 'totalScore', + width: 80 }, { title: '答卷时间', align: "center", - dataIndex: 'openTime' + dataIndex: 'openTime', + width: 150 }, { title: '交卷时间', align: "center", - dataIndex: 'commitTime' + dataIndex: 'commitTime', + width: 150 }, { title: '答卷用时', align: "center", - dataIndex: 'answerSfm' + dataIndex: 'answerSfm', + width: 80 }, { title: '学期学年', align: "center", - dataIndex: 'xqxn' + dataIndex: 'xqxn', + width: 80 }, { title: '课程名称', align: "center", - dataIndex: 'kcmc' + dataIndex: 'kcmc', + width: 200 }, { title: '开始时间', align: "center", - dataIndex: 'startTime' + dataIndex: 'startTime', + width: 150 }, { title: '结束时间', align: "center", - dataIndex: 'endTime' + dataIndex: 'endTime', + width: 150 }, { title: '问卷描述', align: "center", - dataIndex: 'content' + dataIndex: 'content', + width: 200 }, ]; diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue index 7df21f8..9b632ba 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbDjjgsList.vue @@ -2,9 +2,6 @@
- - @@ -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 @@ + + + + + From d10aee8470b3eb83797ba172b7bbfc4e44155ebd Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 13 May 2024 20:13:07 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=87=E6=8D=A2?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/routes/modules/zy/zy.ts | 2 +- src/views/zy/zyInfo/ZyInfo.data.ts | 50 +++---- ...nfoList copy.vue => ZyInfoLiebiaoList.vue} | 128 +++++++++++------- src/views/zy/zyInfo/ZyInfoList.vue | 4 +- src/views/zy/zyInfo/ZyInfoMainList.vue | 29 ++++ .../zy/zyInfoStudent/ZyInfoStudent.data.ts | 5 + 6 files changed, 133 insertions(+), 85 deletions(-) rename src/views/zy/zyInfo/{ZyInfoList copy.vue => ZyInfoLiebiaoList.vue} (68%) create mode 100644 src/views/zy/zyInfo/ZyInfoMainList.vue diff --git a/src/router/routes/modules/zy/zy.ts b/src/router/routes/modules/zy/zy.ts index 11430be..70a8d55 100644 --- a/src/router/routes/modules/zy/zy.ts +++ b/src/router/routes/modules/zy/zy.ts @@ -33,7 +33,7 @@ const zuoye: AppRouteModule = { { path: 'dqkcDqzy', name: 'dqkcDqzy', - component: () => import('/@/views/zy/zyInfo/ZyInfoList.vue'), + component: () => import('/@/views/zy/zyInfo/ZyInfoMainList.vue'), meta: { title: '当前作业', }, diff --git a/src/views/zy/zyInfo/ZyInfo.data.ts b/src/views/zy/zyInfo/ZyInfo.data.ts index 5d43ad3..207be31 100644 --- a/src/views/zy/zyInfo/ZyInfo.data.ts +++ b/src/views/zy/zyInfo/ZyInfo.data.ts @@ -9,16 +9,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'title' }, - { - title: '类型', - align: "center", - dataIndex: 'zyType_dictText' - }, - { - title: '描述', - align: "center", - dataIndex: 'content' - }, + // { + // title: '类型', + // align: "center", + // dataIndex: 'zyType_dictText' + // }, { title: '开始时间', align: "center", @@ -38,7 +33,7 @@ export const columns: BasicColumn[] = [ { title: '状态', align: "center", - dataIndex: 'zyStatus' + dataIndex: 'zyStatus_dictText' }, { title: '学年学期', @@ -46,34 +41,25 @@ export const columns: BasicColumn[] = [ dataIndex: 'xnxq' }, { - title: '外网是否查重', + title: '选课人数', align: "center", - dataIndex: 'wwcc_dictText' + dataIndex: 'xkxs' }, { - title: '外网通过率', + title: '未提交人数', align: "center", - dataIndex: 'wwtgl' + dataIndex: 'wtjnum', + customRender:({text}) =>{ + return text?text:"0"; + }, }, { - title: '内网查重', + title: '已提交人数', align: "center", - dataIndex: 'nwcc_dictText' - }, - { - title: '内网通过率', - align: "center", - dataIndex: 'nwtgl' - }, - { - title: 'aigc查重', - align: "center", - dataIndex: 'aigccc_dictText' - }, - { - title: 'aigc通过率', - align: "center", - dataIndex: 'aigctgl' + dataIndex: 'ytjnum', + customRender:({text}) =>{ + return text?text:"0"; + }, }, ]; diff --git a/src/views/zy/zyInfo/ZyInfoList copy.vue b/src/views/zy/zyInfo/ZyInfoLiebiaoList.vue similarity index 68% rename from src/views/zy/zyInfo/ZyInfoList copy.vue rename to src/views/zy/zyInfo/ZyInfoLiebiaoList.vue index 5040a44..58e5cb6 100644 --- a/src/views/zy/zyInfo/ZyInfoList copy.vue +++ b/src/views/zy/zyInfo/ZyInfoLiebiaoList.vue @@ -9,28 +9,18 @@ - - - - - - - + + - - - - - - 查询 重置 + 新增 - - - + @@ -92,21 +64,25 @@ import { list, deleteOne, batchDelete, getImportUrl, getExportUrl } from './ZyInfo.api'; import { downloadFile } from '/@/utils/common/renderUtils'; import ZyInfoModal from './components/ZyInfoModal.vue' + import { useMessage } from "/@/hooks/web/useMessage"; import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; + import ZyInfoStudentListModal from '/@/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue'; + import { defHttp } from '/@/utils/http/axios'; const queryParam = ref({}); const toggleSearchStatus = ref(false); const registerModal = ref(); + const ZyInfoStudentListModalPage = ref(); + const { createConfirm,createMessage } = useMessage(); //注册table数据 const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ tableProps: { - title: '作业发布', api: list, columns, canResize:false, useSearchForm: false, actionColumn: { - width: 120, + width: 220, fixed: 'right', }, beforeFetch: (params) => { @@ -182,29 +158,79 @@ * 操作栏 */ function getTableAction(record) { - return [ + var list = []; + if(record.zyStatus=='0'){ + list = [ + { + label: '编辑', + onClick: handleEdit.bind(null, record), + }, + { + label: '详情', + onClick: handleDetail.bind(null, record), + }, + { + label: '发布', + onClick: handleFabu.bind(null, record), + }, { + label: '删除', + popConfirm: { + title: '是否确认删除', + confirm: handleDelete.bind(null, record), + } + } + ]; + }else{ + list = [ { - label: '编辑', - onClick: handleEdit.bind(null, record), - }, - ]; + label: '详情', + onClick: handleDetail.bind(null, record), + }, + { + label: '作业', + onClick: handleZyxx.bind(null, record), + }, + ] + } + return list; } + //查看作业信息 + function handleZyxx(record){ + ZyInfoStudentListModalPage.value.disableSubmit = true; + ZyInfoStudentListModalPage.value.init(record); + + } + //发布作业 + async function handleFabu(record){ + createConfirm({ + iconType: 'warning', + title: '确认发布', + content: '是否发布作业数据', + okText: '确认', + cancelText: '取消', + onOk: () => { + var url = "/zyInfo/zyInfo/edit"; + var params = {id:record.id,zyStatus:'1'}; + defHttp.post({ url: url, params }).then((res) => { + handleZySuccess(record.id); + }); + } + }); + } + + + function handleZySuccess(zyid){ + var url = "/zyInfo/zyInfo/editStudent"; + defHttp.get({ url: url, params:{id:zyid} }).then((res) => { + }); + setTimeout(()=>{handleSuccess()}, 1500); + } /** * 下拉操作栏 */ function getDropDownAction(record) { return [ - { - label: '详情', - onClick: handleDetail.bind(null, record), - }, { - label: '删除', - popConfirm: { - title: '是否确认删除', - confirm: handleDelete.bind(null, record), - } - } ] } diff --git a/src/views/zy/zyInfo/ZyInfoList.vue b/src/views/zy/zyInfo/ZyInfoList.vue index aa709bc..128e67e 100644 --- a/src/views/zy/zyInfo/ZyInfoList.vue +++ b/src/views/zy/zyInfo/ZyInfoList.vue @@ -39,7 +39,7 @@
- +
{{item.zyStatus_dictText}}
@@ -47,6 +47,8 @@ 时间：{{item.startTime}} - {{item.endTime}}
{{item.xnxq}}
 +
未提交：{{item.wtjnum?item.wtjnum:0}}人;
已提交：{{item.ytjnum?item.ytjnum:0}}人
 + 编辑 发布 diff --git a/src/views/zy/zyInfo/ZyInfoMainList.vue b/src/views/zy/zyInfo/ZyInfoMainList.vue new file mode 100644 index 0000000..f5543ca --- /dev/null +++ b/src/views/zy/zyInfo/ZyInfoMainList.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts index 03cad2b..cb97f7a 100644 --- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts +++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts @@ -19,6 +19,11 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'createTime' }, + { + title: '评分', + align: "center", + dataIndex: 'score' + }, // { // title: '作业附件', // align: "center", From ccc8f37b85badbd8fd8896eebcc2e42b505f7015 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 13 May 2024 22:48:44 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E5=8F=8A=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/routes/modules/zy/zy.ts | 2 +- .../site/pjjgPage/studentPjjgTeaList.vue | 4 +-- .../checkKecheng/dqxqkcDetail.vue | 9 ++++++ .../checkKecheng/dqxqkcMenu.vue | 29 ++++++++++++------- src/views/site/renKeJiaoCheng/index.vue | 3 +- src/views/site/studentWdkc/studentMenu.vue | 15 ++++------ src/views/zy/zyInfo/StudentZyInfoList.vue | 22 ++++++++++++-- src/views/zy/zyInfo/ZyInfoList.vue | 1 - 8 files changed, 57 insertions(+), 28 deletions(-) diff --git a/src/router/routes/modules/zy/zy.ts b/src/router/routes/modules/zy/zy.ts index 70a8d55..3533bf7 100644 --- a/src/router/routes/modules/zy/zy.ts +++ b/src/router/routes/modules/zy/zy.ts @@ -49,7 +49,7 @@ const zuoye: AppRouteModule = { { path: 'dqkcGongju', name: 'dqkcGongju', - component: () => import('/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkcGongju.vue'), + component: () => import('/@/views/kc/detection/zyZhjsList.vue'), meta: { title: '课程工具', }, diff --git a/src/views/site/pjjgPage/studentPjjgTeaList.vue b/src/views/site/pjjgPage/studentPjjgTeaList.vue index 9974c15..06dc060 100644 --- a/src/views/site/pjjgPage/studentPjjgTeaList.vue +++ b/src/views/site/pjjgPage/studentPjjgTeaList.vue @@ -1,8 +1,8 @@