diff --git a/src/router/routes/modules/site/site.ts b/src/router/routes/modules/site/site.ts index fed8860..cb93aba 100644 --- a/src/router/routes/modules/site/site.ts +++ b/src/router/routes/modules/site/site.ts @@ -78,6 +78,24 @@ const site: AppRouteModule = { title: '公开课', }, }, + { + path: 'teacherYiyueMore', + name: 'teacherYiyueMore', + component: () => import('/@/views/site/studentWdkc/teacherYiyueMore.vue'), + meta: { + // affix: true, + title: '教师已读', + }, + }, + { + path: 'studentYiyueMore', + name: 'studentYiyueMore', + component: () => import('/@/views/site/studentWdkc/studentYiyueMore.vue'), + meta: { + // affix: true, + title: '学生已读', + }, + }, { path: 'ktsbMore', name: 'ktsbMore', diff --git a/src/views/kc/wjxDcwj/WjxDcwjStuLiebiaoList.vue b/src/views/kc/wjxDcwj/WjxDcwjStuLiebiaoList.vue index 0937901..cb27c3e 100644 --- a/src/views/kc/wjxDcwj/WjxDcwjStuLiebiaoList.vue +++ b/src/views/kc/wjxDcwj/WjxDcwjStuLiebiaoList.vue @@ -147,11 +147,6 @@ * 操作栏 */ function getTableAction(record) { - - - // 开始测验 - // 正在批卷 - // 查看结果 if(record.flag == '-1'){ var list = [ { diff --git a/src/views/site/studentWdkc/studentDbtx.vue b/src/views/site/studentWdkc/studentDbtx.vue index 680181f..078e328 100644 --- a/src/views/site/studentWdkc/studentDbtx.vue +++ b/src/views/site/studentWdkc/studentDbtx.vue @@ -3,12 +3,58 @@
工作台
-
+ + + +
+ + + + +
{{index2+1}}、{{item.content}}
+
+ + 查看 + +
+
+ + 暂无提醒 + +
+
+
+ +
+ 查看更多 +
+
+ + + + +
{{index2+1}}、{{item.content}}
+
+ + 已读 + +
+
+ + 暂无提醒 + +
+
+ +
+
+ + +
{{index2+1}}、{{item.content}}
@@ -18,11 +64,10 @@ - 暂无通知 -
+ --> @@ -34,6 +79,8 @@ import { getSysConfig } from '/@/views/site/utils/index'; import { useUserStore } from '/@/store/modules/user'; const userStore = useUserStore(); const dataSource = ref([]); +const dataYySource = ref([]); +const activeKey = ref('1'); //进入就加载 onMounted(() => { loaddata() @@ -42,9 +89,17 @@ onMounted(() => { }, 60*1000); }); function loaddata(){ - defHttp.get({ url: '/zyDbtx/zyDbtx/list',params:{pageSize:10,pageNo:1,createBy:userStore.getUserInfo.username} }).then((res) => { + // defHttp.get({ url: '/zyDbtx/zyDbtx/list',params:{pageSize:10,pageNo:1,createBy:userStore.getUserInfo.username} }).then((res) => { + // dataSource.value = res.records; + // }); + + defHttp.get({ url: '/zyDbtx/zyDbtx/list',params:{pageSize:10,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) => { + dataYySource.value = res.records; + }); } function openKecheng(record){ diff --git a/src/views/site/studentWdkc/studentYiyueMore.vue b/src/views/site/studentWdkc/studentYiyueMore.vue new file mode 100644 index 0000000..d9d92ab --- /dev/null +++ b/src/views/site/studentWdkc/studentYiyueMore.vue @@ -0,0 +1,216 @@ + + + \ No newline at end of file diff --git a/src/views/site/studentWdkc/teacherDbtx.vue b/src/views/site/studentWdkc/teacherDbtx.vue index 0407f5e..3ab5aed 100644 --- a/src/views/site/studentWdkc/teacherDbtx.vue +++ b/src/views/site/studentWdkc/teacherDbtx.vue @@ -1,79 +1,123 @@ \ No newline at end of file diff --git a/src/views/zy/zyInfo/ZyInfoV2List.vue b/src/views/zy/zyInfo/ZyInfoV2List.vue index ed0e326..8a4f6fe 100644 --- a/src/views/zy/zyInfo/ZyInfoV2List.vue +++ b/src/views/zy/zyInfo/ZyInfoV2List.vue @@ -641,10 +641,10 @@ function getTableAction(record) { label: '撤回发布', onClick: handleNoScoreFabu.bind(null, record), }, - { - label: '标记作业', - onClick: handleSzyb.bind(null, record), - }, + // { + // label: '标记作业', + // onClick: handleSzyb.bind(null, record), + // }, { label: '下载', onClick: handleDown.bind(null, record.filePath), diff --git a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts index 88edc23..e5c9c7c 100644 --- a/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts +++ b/src/views/zy/zyInfoStudent/ZyInfoStudent.data.ts @@ -150,12 +150,12 @@ export const newcolumns: BasicColumn[] = [ // sorter: true, // }, - { - title: '标记作业', - align: "center", - dataIndex: 'cdlx_dictText', - sorter: true, - }, + // { + // title: '标记作业', + // align: "center", + // dataIndex: 'cdlx_dictText', + // sorter: true, + // }, ]; //列表数据