diff --git a/src/router/routes/modules/stuzy/stuzy.ts b/src/router/routes/modules/stuzy/stuzy.ts index db84bef..e838b54 100644 --- a/src/router/routes/modules/stuzy/stuzy.ts +++ b/src/router/routes/modules/stuzy/stuzy.ts @@ -22,6 +22,22 @@ const stuzy: AppRouteModule = { }, component: () => import('/@/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue'), }, + { + path: 'studentDqzy', + name: 'studentDqzy', + meta: { + title: '当前作业', + }, + component: () => import('/@/views/zy/zyInfo/StudentZyInfoList.vue'), + }, + { + path: 'studentLszy', + name: 'studentLszy', + meta: { + title: '历史作业', + }, + component: () => import('/@/views/zy/zyInfo/SutdentZyInfoHistoryList.vue'), + }, ] } diff --git a/src/router/routes/modules/zy/zy.ts b/src/router/routes/modules/zy/zy.ts index 7397137..11430be 100644 --- a/src/router/routes/modules/zy/zy.ts +++ b/src/router/routes/modules/zy/zy.ts @@ -46,14 +46,6 @@ const zuoye: AppRouteModule = { title: '历史作业', }, }, - { - path: 'studentMain', - name: 'studentMain_', - component: () => import('/@/views/site/studentWdkc/studentMain.vue'), - meta: { - title: '我的课程', - }, - }, { path: 'dqkcGongju', name: 'dqkcGongju', @@ -62,6 +54,14 @@ const zuoye: AppRouteModule = { title: '课程工具', }, }, + { + path: 'tuGonggao', + name: 'tuGonggao', + component: () => import('/@/views/zy/zyGonggao/ZyGonggaoList.vue'), + meta: { + title: '公告', + }, + }, { path: 'dqkcWenjuan', @@ -71,7 +71,7 @@ const zuoye: AppRouteModule = { title: '当前问卷', }, }, - + ] } diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue index dfc0886..3ed208f 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMain.vue @@ -4,6 +4,9 @@ + +
课程名称：{{kcxxInfo.kcmc}}
+ @@ -35,13 +38,18 @@ //当前路由信息 const { currentRoute } = useRouter(); const { query } = unref(currentRoute); - const { rwbh } = query;//获取传递参数 + const { rwbh,xqxn } = query;//获取传递参数 let router = useRouter(); + const kcxxInfo = ref(''); //进入就加载 onMounted(() => { console.log('rwbh:',rwbh); + defHttp.get({ url: '/ktgl/kcKechengbiao/getKcxxByRwbhXqxn', params: { rwbh: rwbh,xqxn:xqxn } }).then((res) => { + console.log(`🚀 ~ 1111 defHttp.get ~ res:`, res) + kcxxInfo.value = res; + }); }); diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue index 3a22bba..a30b583 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue @@ -10,19 +10,22 @@ 课程介绍 - 公告 + 公告 教学单元内容 - 当前作业 - 历史作业 + 课程作业 + 课程测验 - + + 问卷调查 + + 资源库 @@ -65,7 +68,10 @@ href = "/zy/dqkcWenjuan"; }else if(zytype=='lszy'){ href = "/zy/dqkcLszy"; + }else if(zytype=='gonggao'){ + href = "/zy/tuGonggao"; } + router.push({path:href,query: {rwbh,xqxn,type}}); } diff --git a/src/views/site/renKeJiaoCheng/index.vue b/src/views/site/renKeJiaoCheng/index.vue index fad77fa..ca5e5f8 100644 --- a/src/views/site/renKeJiaoCheng/index.vue +++ b/src/views/site/renKeJiaoCheng/index.vue @@ -1,7 +1,7 @@ @@ -76,9 +83,10 @@ import { defHttp } from '/@/utils/http/axios'; import { useMessage } from "/@/hooks/web/useMessage"; import { useRouter } from 'vue-router'; - import ZyInfoModal from './components/ZyInfoModal.vue' - import ZyInfoStudentListModal from '/@/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue' - import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue' + import ZyInfoModal from './components/ZyInfoModal.vue'; + import ZyInfoStudentListModal from '/@/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue'; + import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue'; + import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue'; @@ -93,6 +101,7 @@ const registerModal = ref(); const ZyInfoStudentListModalPage = ref(); const ZyInfoStudentModalPage = ref(); + const XxhbbksListModalPage = ref(); const current = ref(0); const total = ref(0); const pageNo = ref(0); @@ -132,15 +141,50 @@ registerModal.value.disableSubmit = true; registerModal.value.edit(record); } - /** - * 作业信息 - */ + + //获取选课人数 + function openXkrs(record){ + console.log(`🚀 ~ openXkrs ~ record:`, record) + ZyInfoStudentModalPage.value.disableSubmit = true; + XxhbbksListModalPage.value.init(record); + } + function handleZyxx(record){ ZyInfoStudentListModalPage.value.disableSubmit = true; ZyInfoStudentListModalPage.value.init(record); + + } + + function handleShangchuan(record){ + ZyInfoStudentModalPage.value.disableSubmit = false; + var param = {mainId:record.id,zyfj:record.filePath} + ZyInfoStudentModalPage.value.edit(param); } + /** + * 删除事件 + */ + async function handleDelete(record) { + await deleteOne({ id: record.id }, handleSuccess); + } + 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) => { + handleSuccess(); + }); + } + }); + } + /** * 成功回调 @@ -172,6 +216,8 @@ queryParam.value.rwbh = rwbh; queryParam.value.xqxn = xqxn; queryParam.value.sflssj = '1'; + queryParam.value.column="startTime"; + queryParam.value.order="desc"; defHttp.get({ url: '/zyInfo/zyInfo/list', params: queryParam.value }).then(res => { console.log(`🚀 ~ defHttp.get ~ res:`, res) total.value = res.total; @@ -195,6 +241,7 @@ diff --git a/src/views/zy/zyInfo/ZyInfoList.vue b/src/views/zy/zyInfo/ZyInfoList.vue index 81c397d..aefd0b5 100644 --- a/src/views/zy/zyInfo/ZyInfoList.vue +++ b/src/views/zy/zyInfo/ZyInfoList.vue @@ -9,21 +9,21 @@ - + - + @@ -39,15 +39,14 @@
- -
{{item.zyStatus_dictText}}
+ +
{{item.zyStatus_dictText}}
- -
【{{item.zyType_dictText}}】{{item.title}}
+
{{item.title}}
 时间：{{item.startTime}} - {{item.endTime}} - {{item.xnxq}}-{{item.xkxs}}人选课 +
{{item.xnxq}}
 编辑 发布 @@ -71,6 +70,7 @@ + @@ -82,9 +82,10 @@ import { defHttp } from '/@/utils/http/axios'; import { useMessage } from "/@/hooks/web/useMessage"; import { useRouter } from 'vue-router'; - import ZyInfoModal from './components/ZyInfoModal.vue' - import ZyInfoStudentListModal from '/@/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue' - import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue' + import ZyInfoModal from './components/ZyInfoModal.vue'; + import ZyInfoStudentListModal from '/@/views/zy/zyInfoStudent/ZyInfoStudentListModal.vue'; + import ZyInfoStudentModal from '/@/views/zy/zyInfoStudent/components/ZyInfoStudentModal.vue'; + import XxhbbksListModal from '/@/views/kc/xxhbbks/XxhbbksListModal.vue'; @@ -99,6 +100,7 @@ const registerModal = ref(); const ZyInfoStudentListModalPage = ref(); const ZyInfoStudentModalPage = ref(); + const XxhbbksListModalPage = ref(); const current = ref(0); const total = ref(0); const pageNo = ref(0); @@ -115,6 +117,14 @@ sm: { span: 16 }, }); + function classFun(type){ + if(type == '0'){ + return "background: #a7a6a6"; + }else if(type == '1'){ + return "background: #18a689"; + } + + } /** * 新增事件 */ @@ -139,17 +149,26 @@ registerModal.value.edit(record); } + //查看作业信息 function handleZyxx(record){ ZyInfoStudentListModalPage.value.disableSubmit = true; ZyInfoStudentListModalPage.value.init(record); } + //上传作业附件 function handleShangchuan(record){ ZyInfoStudentModalPage.value.disableSubmit = false; var param = {mainId:record.id,zyfj:record.filePath} ZyInfoStudentModalPage.value.edit(param); } + + //获取选课人数 + function openXkrs(record){ + console.log(`🚀 ~ openXkrs ~ record:`, record) + ZyInfoStudentModalPage.value.disableSubmit = true; + XxhbbksListModalPage.value.init(record); + } /** * 删除事件 @@ -158,6 +177,7 @@ await deleteOne({ id: record.id }, handleSuccess); } + //发布作业 async function handleFabu(record){ createConfirm({ iconType: 'warning', @@ -205,7 +225,7 @@ queryParam.value.pageSize = pageSize; queryParam.value.rwbh = rwbh; queryParam.value.xqxn = xqxn; - queryParam.value.sflssj = '0'; + // queryParam.value.sflssj = '0'; queryParam.value.column="startTime"; queryParam.value.order="asc"; defHttp.get({ url: '/zyInfo/zyInfo/list', params: queryParam.value }).then(res => { @@ -263,7 +283,7 @@ } .rotate { transform: rotate(45deg); - background: rgb(28, 132, 198); + // background: rgb(28, 132, 198); color: #fff; padding: 19px 10px 3px 10px; position: relative; diff --git a/src/views/zy/zyInfo/components/ZyInfoForm.vue b/src/views/zy/zyInfo/components/ZyInfoForm.vue index 788bdcb..bf088e6 100644 --- a/src/views/zy/zyInfo/components/ZyInfoForm.vue +++ b/src/views/zy/zyInfo/components/ZyInfoForm.vue @@ -2,16 +2,16 @@ - - + + - + @@ -33,33 +33,37 @@ - - + + + + 说明：是否在外部网络资源内进行查重 + + + + + + + + + + + + 说明：是否在本课程所有提交的作业资源内进行查重 + + + + - - + + + 说明：是否对AI撰写相似度进行查重 - - - - - - - - - - - - - - - - - + + @@ -115,7 +119,7 @@ //表单验证 const validatorRules = { title: [{ required: true, message: '请输入作业名称!'},], - zyType: [{ required: true, message: '请输入类型!'},], + // zyType: [{ required: true, message: '请输入类型!'},], startTime: [{ required: true, message: '请输入开始时间!'},], endTime: [{ required: true, message: '请输入结束时间!'},], wwcc: [{ required: true, message: '请输入外网是否查重!'},], @@ -233,4 +237,10 @@ overflow-y: auto; padding: 24px 24px 24px 24px; } + .spanSm{ + top: -22px; + position: inherit; + padding: 0 0 0 164px; + color: #a9a9a9; + } diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts index a3002a5..1954b91 100644 --- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts +++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts @@ -14,12 +14,23 @@ export const columns: BasicColumn[] = [ align: "center", dataIndex: 'createBy' }, + { + title: '提交时间', + align: "center", + dataIndex: 'createTime' + }, { 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 d1a1513..aa2210c 100644 --- a/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue +++ b/src/views/zy/zyInfoStudent/ZyInfoStudentList.vue @@ -41,6 +41,10 @@ 无文件 下载 + @@ -56,6 +60,7 @@ import { downloadFile } from '/@/utils/common/renderUtils'; import ZyInfoStudentModal from './components/ZyInfoStudentModal.vue' import JDictSelectTag from '/@/components/Form/src/jeecg/components/JDictSelectTag.vue'; +import { getFileAccessHttpUrl } from '/@/utils/common/compUtils'; const queryParam = ref({}); const mainId = ref(''); @@ -98,6 +103,12 @@ sm: { span: 16 }, }); + function yulanFile(text){ + // let url = "https://view.officeapps.live.com/op/view.aspx?src="+encodeURIComponent(getFileAccessHttpUrl(text)); + // let url = "https://view.officeapps.live.com/op/view.aspx?src="+encodeURIComponent(getFileAccessHttpUrl(text)); + let url = "https://view.xdocin.com/view?src="+encodeURIComponent('https://view.xdocin.com/demo/view.docx'); + window.open(url,"_blank") + } /** * 新增事件 */