From efc8756c1c623f9317df3bf82d4d6829aa2882b1 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Mon, 20 May 2024 23:01:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=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/stuzy/stuzy.ts | 8 + .../kc/wjxWjxx/components/WjxWjxxTmlbForm.vue | 4 +- src/views/site/common/header.vue | 5 +- src/views/site/index.vue | 2 +- .../checkKecheng/dqxqkcDetail.vue | 24 +- .../checkKecheng/dqxqkcMenu.vue | 2 +- .../checkKecheng/history/kcHistoryMenu.vue | 2 +- src/views/site/studentJlrkb/index.vue | 2 +- src/views/site/studentWdkc/studentMenu.vue | 7 +- src/views/site/studentWdkc/studentZyxx.vue | 26 +- src/views/zy/zyInfo/ZyInfo.data.ts | 2 +- src/views/zy/zyInfo/ZyInfoLiebiaoList.vue | 3 +- src/views/zy/zyInfo/ZyInfoList.vue | 3 +- src/views/zy/zyInfo/components/ZyInfoForm.vue | 20 +- src/views/zy/zyTlq/StuZyTlqList.vue | 189 ++++++++++++++ src/views/zy/zyTlq/TlqJiaohuList.vue | 48 +++- src/views/zy/zyTlq/TlqJiaohuListMain.vue | 230 ++++++++++++++++++ src/views/zy/zyTlq/ZyTlqList.vue | 2 +- 18 files changed, 541 insertions(+), 38 deletions(-) create mode 100644 src/views/zy/zyTlq/StuZyTlqList.vue create mode 100644 src/views/zy/zyTlq/TlqJiaohuListMain.vue diff --git a/src/router/routes/modules/stuzy/stuzy.ts b/src/router/routes/modules/stuzy/stuzy.ts index d86cb38..dd44419 100644 --- a/src/router/routes/modules/stuzy/stuzy.ts +++ b/src/router/routes/modules/stuzy/stuzy.ts @@ -62,6 +62,14 @@ const stuzy: AppRouteModule = { title: '通知公告', }, }, + { + path: 'stuTlq', + name: 'stuTlq', + component: () => import('/@/views/zy/zyTlq/StuZyTlqList.vue'), + meta: { + title: '通知公告', + }, + }, ] } diff --git a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue index 9943e6c..059a346 100644 --- a/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue +++ b/src/views/kc/wjxWjxx/components/WjxWjxxTmlbForm.vue @@ -39,7 +39,7 @@
- + @@ -73,7 +73,7 @@ - + diff --git a/src/views/site/common/header.vue b/src/views/site/common/header.vue index e92989e..8310336 100644 --- a/src/views/site/common/header.vue +++ b/src/views/site/common/header.vue @@ -52,14 +52,11 @@ - - 听课笔记 - 今日课表 - 进六日课表 + 近六日课表 我的课程 diff --git a/src/views/site/index.vue b/src/views/site/index.vue index 9dde6d6..256b155 100644 --- a/src/views/site/index.vue +++ b/src/views/site/index.vue @@ -55,7 +55,7 @@ - + diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue index 2ceb2d9..45dabfc 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcDetail.vue @@ -20,9 +20,18 @@ 预览
- + + +
+ 教学日历： + + + + + 提交 + 预览 + +
@@ -105,6 +114,7 @@ const baseApiUrl = globSetting.domainUrl; const jxdgInfo = ref({ id:'', filePath:null, + jxrlFilePath:null, kcjs:'' }); @@ -140,6 +150,14 @@ const baseApiUrl = globSetting.domainUrl; let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2); window.open(url,"_blank") } + + function openJxrlPdf(record){ + var url2 = getFileAccessHttpUrl(record.jxrlPdfPath) + console.log(`🚀 ~ openPdf ~ url2:`, url2) + let url = baseApiUrl+"/generic/web/viewer.html?file="+encodeURIComponent(url2); + window.open(url,"_blank") + } + //常见问题回调刷新 diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue index 5f49f41..690d917 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/dqxqkcMenu.vue @@ -14,7 +14,7 @@ 教学单元内容 - + 课程作业 课程测验 diff --git a/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryMenu.vue b/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryMenu.vue index bba8a7b..d2b7533 100644 --- a/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryMenu.vue +++ b/src/views/site/renKeJiaoCheng/checkKecheng/history/kcHistoryMenu.vue @@ -14,7 +14,7 @@ 教学单元内容 - + 课程作业 课程测验 diff --git a/src/views/site/studentJlrkb/index.vue b/src/views/site/studentJlrkb/index.vue index cc39037..64b9c67 100644 --- a/src/views/site/studentJlrkb/index.vue +++ b/src/views/site/studentJlrkb/index.vue @@ -1,7 +1,7 @@ + + + + diff --git a/src/views/zy/zyTlq/TlqJiaohuList.vue b/src/views/zy/zyTlq/TlqJiaohuList.vue index 73c0d69..1e02bda 100644 --- a/src/views/zy/zyTlq/TlqJiaohuList.vue +++ b/src/views/zy/zyTlq/TlqJiaohuList.vue @@ -16,23 +16,27 @@
-
+
- +
-
+
发表内容：
@@ -46,10 +50,10 @@
附件：
-
+
- 发表 + 发表
@@ -125,18 +129,25 @@ dayjs.extend(relativeTime); console.log(`🚀 ~ awaitdefHttp.get ~ res:`, res) tlqInfo.value = res; }); - // loadData(1) } - async function loadData(arg){ - await defHttp.get({ url: '/zyTlqContent/zyTlqContent/list', params: { pageSize: pageSize,pageNo:arg, mainId:id,column:'createTime',order:'desc' } }).then((res) => { + function loadData(arg){ + defHttp.get({ url: '/zyTlqContent/zyTlqContent/list', params: { mainId:id+"",column:'createTime',order:'desc' } }).then((res) => { console.log(`🚀 ~ defHttp.get ~ res:`, res) dataSource.value = res.records; total.value = res.total; }); } + + function submitForm(){ + formData.value.mainId = id; + defHttp.post({ url: '/zyTlqContent/zyTlqContent/add', params: formData.value}).then((res) => { + loadData(1); + }); + } //进入就加载 onMounted(() => { getTlqInfo(); + loadData(1); }); @@ -203,4 +214,17 @@ dayjs.extend(relativeTime); margin: 0 8px 8px 0; vertical-align: top; } +/deep/.ant-upload.ant-upload-select-picture-card { + width: 80px; + height: 80px; + margin-right: 8px; + margin-bottom: 8px; + text-align: center; + vertical-align: top; + background-color: #fafafa; + border: 1px dashed #d9d9d9; + border-radius: 2px; + cursor: pointer; + transition: border-color 0.3s; +} diff --git a/src/views/zy/zyTlq/TlqJiaohuListMain.vue b/src/views/zy/zyTlq/TlqJiaohuListMain.vue new file mode 100644 index 0000000..1e02bda --- /dev/null +++ b/src/views/zy/zyTlq/TlqJiaohuListMain.vue @@ -0,0 +1,230 @@ + + + + + diff --git a/src/views/zy/zyTlq/ZyTlqList.vue b/src/views/zy/zyTlq/ZyTlqList.vue index 19bd147..0ce72fe 100644 --- a/src/views/zy/zyTlq/ZyTlqList.vue +++ b/src/views/zy/zyTlq/ZyTlqList.vue @@ -98,7 +98,7 @@ * 发布 */ function handleFabu(record) { - defHttp.post({ url: '/zyTlq/zyTlq/edit', params: { id: record.id,sffb: "6" } }).then(res => { + defHttp.post({ url: '/zyTlq/zyTlq/edit', params: { id: record.id,sffb: "1" } }).then(res => { total.value = 1; pageNo.value = 0; loadData(1); From 0592793e4ca084ba8545ddded4cd092c76c11c73 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Tue, 21 May 2024 08:41:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?2024=E5=B9=B45=E6=9C=8821=E6=97=A5=20?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=99=E5=AD=A6=E5=8D=95=E5=85=83=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/routes/modules/stuzy/stuzy.ts | 9 + src/views/site/studentWdkc/studentMenu.vue | 5 +- .../downloadAssembly.vue | 44 ++ src/views/zy/jiaoXueDanYuanNeiRong/index2.vue | 54 +- .../zy/jiaoXueDanYuanNeiRong/stuIndex.vue | 509 ++++++++++++++++++ 5 files changed, 605 insertions(+), 16 deletions(-) create mode 100644 src/views/zy/jiaoXueDanYuanNeiRong/downloadAssembly.vue create mode 100644 src/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue diff --git a/src/router/routes/modules/stuzy/stuzy.ts b/src/router/routes/modules/stuzy/stuzy.ts index d86cb38..eb5d5f1 100644 --- a/src/router/routes/modules/stuzy/stuzy.ts +++ b/src/router/routes/modules/stuzy/stuzy.ts @@ -62,6 +62,15 @@ const stuzy: AppRouteModule = { title: '通知公告', }, }, + { + path: 'stuJiaoXueDanYuanNeiRong', + name: 'stuJiaoXueDanYuanNeiRong', + component: () => import('/@/views/zy/jiaoXueDanYuanNeiRong/stuIndex.vue'), + meta: { + title: '教学单元内容', + }, + }, + ] } diff --git a/src/views/site/studentWdkc/studentMenu.vue b/src/views/site/studentWdkc/studentMenu.vue index 1111071..f3c2e54 100644 --- a/src/views/site/studentWdkc/studentMenu.vue +++ b/src/views/site/studentWdkc/studentMenu.vue @@ -11,7 +11,7 @@ 课程介绍 通知公告 - 教学单元 + 教学单元 @@ -65,6 +65,9 @@ href = "/stuzy/studentMain"; }else if(zytype=='tzgg'){//通知公告 href = "/stuzy/StudentGonggaoList"; + }else if(zytype == 'stuJiaoXueDanYuanNeiRong'){ + router.push({ name: 'stuJiaoXueDanYuanNeiRong', query: { rwbh,xqxn,type } }); + return; } router.push({path:href,query: {rwbh,xqxn,type}}); diff --git a/src/views/zy/jiaoXueDanYuanNeiRong/downloadAssembly.vue b/src/views/zy/jiaoXueDanYuanNeiRong/downloadAssembly.vue new file mode 100644 index 0000000..40f93b4 --- /dev/null +++ b/src/views/zy/jiaoXueDanYuanNeiRong/downloadAssembly.vue @@ -0,0 +1,44 @@ + + \ No newline at end of file diff --git a/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue b/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue index 08bf861..219ad0a 100644 --- a/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue +++ b/src/views/zy/jiaoXueDanYuanNeiRong/index2.vue @@ -3,15 +3,22 @@
- - 保存 - 刷新 - 新增标题 + + 保存 + 刷新 + 新增标题 + 预览 +
- -
+ +