From 07562e53eed85a7328efbf8a4220b28709f8f32d Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Wed, 28 Dec 2022 15:44:28 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=8E=88=E8=AF=BE?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/course/Mylecnotes.vue | 193 +++++++++++++++++++++----------- 1 file changed, 126 insertions(+), 67 deletions(-) diff --git a/src/views/course/Mylecnotes.vue b/src/views/course/Mylecnotes.vue index 04684589..8c272fe4 100644 --- a/src/views/course/Mylecnotes.vue +++ b/src/views/course/Mylecnotes.vue @@ -1,104 +1,163 @@ @@ -107,4 +166,4 @@ export default { display: flex; padding-top: 10px; } - \ No newline at end of file + From 991fe1a86cae29843ce1965d89ae6c52d90e20ba Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Wed, 28 Dec 2022 15:45:16 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/boe/courseRecord.js | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 src/api/boe/courseRecord.js diff --git a/src/api/boe/courseRecord.js b/src/api/boe/courseRecord.js new file mode 100644 index 00000000..33dda498 --- /dev/null +++ b/src/api/boe/courseRecord.js @@ -0,0 +1,42 @@ +/**我的授课记录*/ +import ajax from '@/api/boe/boeApiAjax.js' +import axios from 'axios' +import { getToken } from '@/utils/token' +const baseURL = process.env.VUE_APP_BOE_BASE_API; + + + +/** + * 导出授课记录 + * + * @param {Object} kid + */ +const courseRecordExport = function(data) { + return axios.request({ + baseURL, + url: '/b1/system/teacher/teacher-course-export', + method: 'post', + data:data, + headers:{'Content-Type':'application/json;charset=utf-8'}, + responseType: 'blob' + }) + + // return ajax.postJson('/b1/system/teacher/teacher-course-export',data); +} + +/** + * 授课记录列表 + * + * @param {Object} kid + */ +const courseRecordList = function(data) { + return ajax.postJson('/b1/system/teacher/teacher-course-list',data); +} + + + +export default { + courseRecordExport, + courseRecordList + +} From 46ee7eb86d13c8c823207627c24edb1cac17a8c4 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Wed, 28 Dec 2022 15:50:16 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E9=9A=90=E8=97=8F=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/course/Mylecnotes.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/course/Mylecnotes.vue b/src/views/course/Mylecnotes.vue index 8c272fe4..295f1fb7 100644 --- a/src/views/course/Mylecnotes.vue +++ b/src/views/course/Mylecnotes.vue @@ -56,17 +56,17 @@ width="100px" prop="score" > - - - + + --> From 2737d73b9d173852c8f9dcc009a14f1818ffc4f7 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 28 Dec 2022 16:44:33 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E7=9A=84=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/tools.js | 23 +++++++++++++++++++++++ src/views/portal/course/Index.vue | 18 ++++++++++++------ 2 files changed, 35 insertions(+), 6 deletions(-) diff --git a/src/utils/tools.js b/src/utils/tools.js index c027ce3c..185fb2cc 100644 --- a/src/utils/tools.js +++ b/src/utils/tools.js @@ -156,6 +156,29 @@ export function formatDate(date){ } +export function formatDateByFmt(date,fmt) { + if(/(y+)/.test(fmt)){ + fmt = fmt.replace(RegExp.$1,(date.getFullYear()+'').substr(4-RegExp.$1.length)); + } + let o = { + 'M+':date.getMonth() + 1, + 'd+':date.getDate(), + 'h+':date.getHours(), + 'm+':date.getMinutes(), + 's+':date.getSeconds() + }; + + // 遍历这个对象 + for(let k in o){ + if(new RegExp(`(${k})`).test(fmt)){ + // console.log(`${k}`) + let str = o[k] + ''; + fmt = fmt.replace(RegExp.$1,(RegExp.$1.length===1)?str:('00'+str).substr(str.length)); + } + } + return fmt; +} + /** * 把日期格式化为显示时间，yyyy-MM-dd * @param {Object} date diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 2577c4b5..609ac9d3 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -101,7 +101,7 @@
- 授课时间：{{ cinfo.startTime }} + 授课时间：{{ cinfo.startTime }}
@@ -321,7 +321,7 @@ import scene from "@/api/modules/scene.js"; import apiUserGroup from "@/api/modules/usergroup.js"; import interactBar from "@/components/Portal/interactBar.vue"; import courseImage from "@/components/Course/courseImage.vue"; -import { courseType, getType, toScore,formatDate,formatUserNumber } from "@/utils/tools.js"; +import { courseType, getType, toScore,formatDate,formatUserNumber,formatDateByFmt } from "@/utils/tools.js"; import { deepClone, param } from "../../../utils"; import apiSearchterm from "@/api/modules/searchterm.js"; import apiPlace from "@/api/phase2/place.js" @@ -564,7 +564,7 @@ export default { row.checked=false; }) item.checked=true; - + this.searchData(); }, handleOptionClick(item,list){ @@ -806,6 +806,11 @@ export default { } }, async search() { + //测试时间格式化 + // let s=1650973801; + // var d = new Date(1650973801*1000); + // console.log(formatDateByFmt(d,'yyyy-MM-dd hh:mm'),'data'); + let that = this; if (this.keyword) { apiSearchterm.save({ keyword: this.course.keyword, type: 1 }); @@ -857,9 +862,10 @@ export default { res.result.list.forEach(item => { // item.startTime if(item.startTime != '') { - let time = item.startTime.split('-'); - item.startTime = `${time[0]}年${time[1]}月${time[2]}日` - } + item.startTime=formatDateByFmt(new Date(item.startTime*1000),'yyyy-MM-dd hh:mm') + //let time = item.startTime.split('-'); + //item.startTime = `${time[0]}年${time[1]}月${time[2]}日` + } //教师转化 if(item.teacher){ let dotIdx=item.teacher.indexOf(','); From a37bfb9d28cc788984c516d24159b2edc02bf016 Mon Sep 17 00:00:00 2001 From: weinan2087 Date: Wed, 28 Dec 2022 16:49:40 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E3=80=81=E5=88=86=E9=A1=B5=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/course/Mylecnotes.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/views/course/Mylecnotes.vue b/src/views/course/Mylecnotes.vue index 295f1fb7..c39bd6ad 100644 --- a/src/views/course/Mylecnotes.vue +++ b/src/views/course/Mylecnotes.vue @@ -2,12 +2,13 @@
-
+
搜索
重置
+
导出
-
导出
+
@@ -65,12 +66,12 @@ > + -->
- +
+