From b023cb8fb9ecdbf8d5e320f79aa18f9ee1f163a4 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Fri, 2 Aug 2024 14:48:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/routes/modules/site/site.ts | 22 +- src/views/site/studentWdkc/studentDbtx.vue | 16 +- .../site/studentWdkc/studentWeiduMore.vue | 220 ++++++++++++++++++ .../site/studentWdkc/studentYiyueMore.vue | 29 +-- src/views/site/studentWdkc/teacherDbtx.vue | 14 +- .../site/studentWdkc/teacherWeiduMore.vue | 218 +++++++++++++++++ .../site/studentWdkc/teacherYiyueMore.vue | 4 +- src/views/zy/zyInfo/StudentZyInfoList.vue | 8 +- .../zy/zyInfoStudent/ZyInfoStudent.data.ts | 24 +- .../zyInfoStudentHp/ZyInfoStudentHpList.vue | 1 + 10 files changed, 516 insertions(+), 40 deletions(-) create mode 100644 src/views/site/studentWdkc/studentWeiduMore.vue create mode 100644 src/views/site/studentWdkc/teacherWeiduMore.vue diff --git a/src/router/routes/modules/site/site.ts b/src/router/routes/modules/site/site.ts index cb93aba..1658852 100644 --- a/src/router/routes/modules/site/site.ts +++ b/src/router/routes/modules/site/site.ts @@ -84,7 +84,16 @@ const site: AppRouteModule = { component: () => import('/@/views/site/studentWdkc/teacherYiyueMore.vue'), meta: { // affix: true, - title: '教师已读', + title: '已读', + }, + }, + { + path: 'teacherWeiduMore', + name: 'teacherWeiduMore', + component: () => import('/@/views/site/studentWdkc/teacherWeiduMore.vue'), + meta: { + // affix: true, + title: '未读', }, }, { @@ -93,7 +102,16 @@ const site: AppRouteModule = { component: () => import('/@/views/site/studentWdkc/studentYiyueMore.vue'), meta: { // affix: true, - title: '学生已读', + title: '已读', + }, + }, + { + path: 'studentWeiduMore', + name: 'studentWeiduMore', + component: () => import('/@/views/site/studentWdkc/studentWeiduMore.vue'), + meta: { + // affix: true, + title: '未读', }, }, { diff --git a/src/views/site/studentWdkc/studentDbtx.vue b/src/views/site/studentWdkc/studentDbtx.vue index 078e328..3b30b9b 100644 --- a/src/views/site/studentWdkc/studentDbtx.vue +++ b/src/views/site/studentWdkc/studentDbtx.vue @@ -6,6 +6,9 @@ +
+ 查看更多 +
@@ -24,9 +27,14 @@
- + +
- 查看更多 + 查看更多
@@ -93,11 +101,11 @@ function loaddata(){ // dataSource.value = res.records; // }); - defHttp.get({ url: '/zyDbtx/zyDbtx/list',params:{pageSize:10,pageNo:1,createBy:userStore.getUserInfo.username,flag:'0'} }).then((res) => { + defHttp.get({ url: '/zyDbtx/zyDbtx/list',params:{pageSize:5,pageNo:1,createBy:userStore.getUserInfo.username,flag:'0'} }).then((res) => { dataSource.value = res.records; }); - defHttp.get({ url: '/zyDbtx/zyDbtx/list',params:{pageSize:10,pageNo:1,createBy:userStore.getUserInfo.username,flag:'1'} }).then((res) => { + defHttp.get({ url: '/zyDbtx/zyDbtx/list',params:{pageSize:5,pageNo:1,createBy:userStore.getUserInfo.username,flag:'1'} }).then((res) => { dataYySource.value = res.records; }); } diff --git a/src/views/site/studentWdkc/studentWeiduMore.vue b/src/views/site/studentWdkc/studentWeiduMore.vue new file mode 100644 index 0000000..0a42184 --- /dev/null +++ b/src/views/site/studentWdkc/studentWeiduMore.vue @@ -0,0 +1,220 @@ + + + \ No newline at end of file diff --git a/src/views/site/studentWdkc/studentYiyueMore.vue b/src/views/site/studentWdkc/studentYiyueMore.vue index d9d92ab..b8dc3b3 100644 --- a/src/views/site/studentWdkc/studentYiyueMore.vue +++ b/src/views/site/studentWdkc/studentYiyueMore.vue @@ -8,7 +8,7 @@ @@ -17,11 +17,11 @@
{{ index + 1 }}、{{ item.content }}
 - 已读 + 查看 - + @@ -66,16 +66,17 @@ async function onPageChange() { await loadData(); } function openKecheng(record) { - var url = '/zy/zuoyeMain'; - if (record.type == '5') { - //当前作业 - url = '/zy/dqkcDqzy'; - } else if (record.type == '6') { - //测验消息 - url = '/zy/ceshiWenjuan'; - } else if (record.type == '7') { - //问卷消息 - url = '/zy/dcwjWenjuan'; + var url = "/stuzy/studentMain"; + if(record.type=='0'||record.type=='1'){//当前作业+评分 + url = "/stuzy/studentDqzy"; + }else if(record.type=='2'){//测验消息 + url = "/stuzy/stuCeshiWenjuan"; + }else if(record.type=='3'){//问卷消息 + url = "/stuzy/stuDcwjWenjuan"; + }else if(record.type=='4'){//讨论区 + url = "/stuzy/stuTlq"; + }else if(record.type=='9'){//通知公告 + url = "/stuzy/StudentGonggaoList"; } url = url + '?rwbh=' + record.rwbh + '&xqxn=' + getSysConfig().flag1 + '&teano=' + record.fbr; window.open(url, '_blank'); @@ -91,7 +92,7 @@ function loadData() { queryParam.value.pageSize = 10; queryParam.value.pageNo = pageNo; queryParam.value.createBy = userStore.getUserInfo.username; - queryParam.value.flag = '1' + queryParam.value.flag = '0' listData.value = []; list(queryParam.value).then((res) => { console.log('🤞', res); diff --git a/src/views/site/studentWdkc/teacherDbtx.vue b/src/views/site/studentWdkc/teacherDbtx.vue index 3ab5aed..76a08c0 100644 --- a/src/views/site/studentWdkc/teacherDbtx.vue +++ b/src/views/site/studentWdkc/teacherDbtx.vue @@ -5,6 +5,9 @@
+
+ 查看更多 +
@@ -23,7 +26,12 @@
- + +
查看更多
@@ -68,13 +76,13 @@ onMounted(() => { }); function loaddata() { defHttp - .get({ url: '/zyDbtx/zyDbtx/list', params: { pageSize: 10, pageNo: 1, createBy: userStore.getUserInfo.username, flag: '0' } }) + .get({ url: '/zyDbtx/zyDbtx/list', params: { pageSize: 5, pageNo: 1, createBy: userStore.getUserInfo.username, flag: '0' } }) .then((res) => { dataSource.value = res.records; }); defHttp - .get({ url: '/zyDbtx/zyDbtx/list', params: { pageSize: 10, pageNo: 1, createBy: userStore.getUserInfo.username, flag: '1' } }) + .get({ url: '/zyDbtx/zyDbtx/list', params: { pageSize: 5, pageNo: 1, createBy: userStore.getUserInfo.username, flag: '1' } }) .then((res) => { dataYySource.value = res.records; }); diff --git a/src/views/site/studentWdkc/teacherWeiduMore.vue b/src/views/site/studentWdkc/teacherWeiduMore.vue new file mode 100644 index 0000000..6ee6a4f --- /dev/null +++ b/src/views/site/studentWdkc/teacherWeiduMore.vue @@ -0,0 +1,218 @@ + + + \ No newline at end of file diff --git a/src/views/site/studentWdkc/teacherYiyueMore.vue b/src/views/site/studentWdkc/teacherYiyueMore.vue index d9d92ab..4a072ec 100644 --- a/src/views/site/studentWdkc/teacherYiyueMore.vue +++ b/src/views/site/studentWdkc/teacherYiyueMore.vue @@ -8,7 +8,7 @@ @@ -21,7 +21,7 @@ - + diff --git a/src/views/zy/zyInfo/StudentZyInfoList.vue b/src/views/zy/zyInfo/StudentZyInfoList.vue index 696914f..df875a1 100644 --- a/src/views/zy/zyInfo/StudentZyInfoList.vue +++ b/src/views/zy/zyInfo/StudentZyInfoList.vue @@ -23,7 +23,7 @@
- +
{{ callText(item) }}
@@ -33,8 +33,10 @@ 作业时间：{{ dayjs(item.startTime).format('YYYY.MM.DD HH:mm') }} ~ {{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }} 互评时间：{{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }} ~ {{ dayjs(item.endTime).format('YYYY.MM.DD HH:mm') }}未设置互评 -
作业评分：{{ item.zzdf ? item.zzdf : item.stuscore ? item.stuscore : '未评' }}分
-
互评分数:{{ item.xshpfs ? item.xshpfs : '未评' }}分
+ 作业得分：{{ item.stuscore ? item.stuscore : '未评' }}分 + 互评分数:{{ item.xshpfs ? item.xshpfs : '未评' }}分 + 绩效分数：{{ item.jxfs ? item.jxfs : '未评' }}分 + 总分:{{ item.zzdf ? item.zzdf : '未评' }}分
维普资源库查重:{{ getCctype(item, '1') }}
diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts index e5c9c7c..14e78a7 100644 --- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts +++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts @@ -184,12 +184,12 @@ export const columnsStu: BasicColumn[] = [ dataIndex: 'stuscore', // sorter: true, }, - { - title: '存档类型', - align: "center", - dataIndex: 'cdlx_dictText', - // sorter: true, - }, + // { + // title: '存档类型', + // align: "center", + // dataIndex: 'cdlx_dictText', + // // sorter: true, + // }, { title: '网络查重', align: "center", @@ -382,12 +382,12 @@ export const cdxxcolumns: BasicColumn[] = [ slots: { customRender: 'xnsftgaction' }, width: '100px' }, - { - title: '存档类型', - align: "center", - dataIndex: 'cdlx_dictText', - width: '100px' - }, + // { + // title: '存档类型', + // align: "center", + // dataIndex: 'cdlx_dictText', + // width: '100px' + // }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ diff --git a/src/views/zy/zyInfoStudentHp/ZyInfoStudentHpList.vue b/src/views/zy/zyInfoStudentHp/ZyInfoStudentHpList.vue index 83c2ad2..89ab47d 100644 --- a/src/views/zy/zyInfoStudentHp/ZyInfoStudentHpList.vue +++ b/src/views/zy/zyInfoStudentHp/ZyInfoStudentHpList.vue @@ -94,6 +94,7 @@ const { prefixCls, tableContext, onExportXls, onImportXls } = useListPage({ columns: columnsZyhp, canResize: false, useSearchForm: false, + pagination: false, actionColumn: { width: 120, fixed: 'right',