From 4e17a696d0898e0d04ddb01542cd7233e3892867 Mon Sep 17 00:00:00 2001 From: huangzhe <3451701311@qq.com> Date: Wed, 27 Aug 2025 10:19:29 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=AD=BE=E5=88=B0?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=8F=AF=E7=A9=BF=E7=A9=BA=E5=80=BC=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 23 +++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index ea5e1836..9381c5ae 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -768,7 +768,12 @@
- 签到时间 +
+
+ +
+ 签到时间 +
@@ -2625,7 +2630,7 @@ export default defineComponent({ return } console.log(value, "---------------") - nextTick(handleSelectSignDateTime) + computedMin(signDateTimeType.value) }, {deep: true}) const nums = ref(0); @@ -3661,10 +3666,10 @@ export default defineComponent({ const handleSureStu = async () => { // 检测开课前后的数值是否正确 if ( !(isNumber(state.afterStartValue) && isNumber(state.beforeValue))) { - if(!(state.afterStartValue === null && state.beforeValue === null)) { message.warning("开始前或开始后数值有误，请重新填写") return - } + // if(!(state.afterStartValue === null && state.beforeValue === null)) { + // } } function isNumber(value){ return typeof value === 'number' && !isNaN(value); @@ -5139,11 +5144,19 @@ export default defineComponent({ return } + computedMin(type) + } + + /** + * 计算面授时间 + * */ + function computedMin(type){ + // 面授开课时间 const classStartTime = dayjs(state.xjkkinputV3[0]) // 面授结束时间 const classEndTime = dayjs(state.xjkkinputV3[1]) - console.log("classStartTime", classStartTime, "classEndTime", classEndTime) + // console.log("classStartTime", classStartTime, "classEndTime", classEndTime) const { endSignTime, startSignTime } = getDayOfStartAndEnd() signDateTimeType.value = type; From 605e486318918e1e0f33f025a178bc3025bfa5c1 Mon Sep 17 00:00:00 2001 From: huangzhe <3451701311@qq.com> Date: Wed, 27 Aug 2025 10:29:46 +0800 Subject: [PATCH 2/6] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E7=AD=BE?= =?UTF-8?q?=E5=88=B0=E6=97=B6=E9=97=B4=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/courselibrary/CoursewareManage.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 9381c5ae..306c7c57 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -3666,7 +3666,7 @@ export default defineComponent({ const handleSureStu = async () => { // 检测开课前后的数值是否正确 if ( !(isNumber(state.afterStartValue) && isNumber(state.beforeValue))) { - message.warning("开始前或开始后数值有误，请重新填写") + message.warning("签到时间数值有误，请重新填写") return // if(!(state.afterStartValue === null && state.beforeValue === null)) { // } From 37acef45f718982534e1551b45ae8e39d38ed2ff Mon Sep 17 00:00:00 2001 From: huangzhe <3451701311@qq.com> Date: Mon, 1 Sep 2025 21:24:36 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexProject.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/indexProject.js b/src/api/indexProject.js index 571eacfb..b132b93c 100644 --- a/src/api/indexProject.js +++ b/src/api/indexProject.js @@ -5,11 +5,11 @@ export const userGetUserOrg = (obj) => https.get('/organization/all/tree', obj) // 请求所属组织接口 export const userInfo = (obj) => https.post('/user/info', obj) // 项目列表 -export const boeuProjectPageList = (obj) => http.post('/boeu/project/pageList', obj) +export const boeuProjectPageList = (obj) => http.post('/report/boeu/project/pageList', obj) // 文章列表 export const boeuArticlePageList = (obj) => http.post('/boeu/article/pageList', obj ) // 课程分页列表 -export const boeuCourseListPageV2 = (obj) => http.post('/boeu/course/List/page/v2', obj ) +export const boeuCourseListPageV2 = (obj) => http.post('/report/boeu/course/List/page/v2', obj ) // 考试列表分页 export const boeuExamPageListV2 = (obj) => http.post('/boeu/exam/pageList/v2', obj ) // 问答分页列表 From 54ed5d4635a3f54030f1422e259ac1a3b658b038 Mon Sep 17 00:00:00 2001 From: huangzhe <3451701311@qq.com> Date: Tue, 2 Sep 2025 11:22:40 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?= =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/indexProject.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/api/indexProject.js b/src/api/indexProject.js index b132b93c..4fb8ba55 100644 --- a/src/api/indexProject.js +++ b/src/api/indexProject.js @@ -7,13 +7,13 @@ export const userInfo = (obj) => https.post('/user/info', obj) // 项目列表 export const boeuProjectPageList = (obj) => http.post('/report/boeu/project/pageList', obj) // 文章列表 -export const boeuArticlePageList = (obj) => http.post('/boeu/article/pageList', obj ) +export const boeuArticlePageList = (obj) => http.post('/report/boeu/article/pageList', obj ) // 课程分页列表 export const boeuCourseListPageV2 = (obj) => http.post('/report/boeu/course/List/page/v2', obj ) // 考试列表分页 export const boeuExamPageListV2 = (obj) => http.post('/boeu/exam/pageList/v2', obj ) // 问答分页列表 -export const boeuQuestionPageList= (obj) => http.post('/boeu/question/pageList', obj ) +export const boeuQuestionPageList= (obj) => http.post('/report/boeu/question/pageList', obj ) //柱状体左侧获取数据接口 export const dataStatisticsSelectV1= (obj) => http.post('/data/statistics/select/v1', obj ) //柱状体右侧获取数据接口 From 12a87153e47fb0c29e36c5ed749d2bdbb2e50e71 Mon Sep 17 00:00:00 2001 From: huangzhe <3451701311@qq.com> Date: Tue, 2 Sep 2025 16:02:21 +0800 Subject: [PATCH 5/6] =?UTF-8?q?feat:=20=E6=8A=8A=20baseurl=20=E5=88=87?= =?UTF-8?q?=E5=9B=9E=20/report?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/configz.js | 2 +- src/api/indexProject.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/configz.js b/src/api/configz.js index d27809e8..89cdcd8d 100644 --- a/src/api/configz.js +++ b/src/api/configz.js @@ -12,7 +12,7 @@ import Cookies from 'vue-cookies' // export const BATCH_IMPORT_SCORE = process.env.VUE_APP_BASE_API + '/admin/offcourse/batchImportScore' axios.defaults.withCredentials = true; const http = axios.create({ - baseURL: '/', + baseURL: '/report', timeout: 1000 * 15, // headers: { "Content-Type": "multipart/form-data" }, headers: {"Content-Type": "application/json"}, diff --git a/src/api/indexProject.js b/src/api/indexProject.js index 4fb8ba55..571eacfb 100644 --- a/src/api/indexProject.js +++ b/src/api/indexProject.js @@ -5,15 +5,15 @@ export const userGetUserOrg = (obj) => https.get('/organization/all/tree', obj) // 请求所属组织接口 export const userInfo = (obj) => https.post('/user/info', obj) // 项目列表 -export const boeuProjectPageList = (obj) => http.post('/report/boeu/project/pageList', obj) +export const boeuProjectPageList = (obj) => http.post('/boeu/project/pageList', obj) // 文章列表 -export const boeuArticlePageList = (obj) => http.post('/report/boeu/article/pageList', obj ) +export const boeuArticlePageList = (obj) => http.post('/boeu/article/pageList', obj ) // 课程分页列表 -export const boeuCourseListPageV2 = (obj) => http.post('/report/boeu/course/List/page/v2', obj ) +export const boeuCourseListPageV2 = (obj) => http.post('/boeu/course/List/page/v2', obj ) // 考试列表分页 export const boeuExamPageListV2 = (obj) => http.post('/boeu/exam/pageList/v2', obj ) // 问答分页列表 -export const boeuQuestionPageList= (obj) => http.post('/report/boeu/question/pageList', obj ) +export const boeuQuestionPageList= (obj) => http.post('/boeu/question/pageList', obj ) //柱状体左侧获取数据接口 export const dataStatisticsSelectV1= (obj) => http.post('/data/statistics/select/v1', obj ) //柱状体右侧获取数据接口 From c4e8e8fa60d6aa919806fdec849470f25deef93e Mon Sep 17 00:00:00 2001 From: huangzhe <3451701311@qq.com> Date: Tue, 2 Sep 2025 17:00:12 +0800 Subject: [PATCH 6/6] =?UTF-8?q?Revert=20"feat:=20=E6=8A=8A=20baseurl=20?= =?UTF-8?q?=E5=88=87=E5=9B=9E=20/report"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 12a87153e47fb0c29e36c5ed749d2bdbb2e50e71. --- src/api/configz.js | 2 +- src/api/indexProject.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/api/configz.js b/src/api/configz.js index 89cdcd8d..d27809e8 100644 --- a/src/api/configz.js +++ b/src/api/configz.js @@ -12,7 +12,7 @@ import Cookies from 'vue-cookies' // export const BATCH_IMPORT_SCORE = process.env.VUE_APP_BASE_API + '/admin/offcourse/batchImportScore' axios.defaults.withCredentials = true; const http = axios.create({ - baseURL: '/report', + baseURL: '/', timeout: 1000 * 15, // headers: { "Content-Type": "multipart/form-data" }, headers: {"Content-Type": "application/json"}, diff --git a/src/api/indexProject.js b/src/api/indexProject.js index 571eacfb..4fb8ba55 100644 --- a/src/api/indexProject.js +++ b/src/api/indexProject.js @@ -5,15 +5,15 @@ export const userGetUserOrg = (obj) => https.get('/organization/all/tree', obj) // 请求所属组织接口 export const userInfo = (obj) => https.post('/user/info', obj) // 项目列表 -export const boeuProjectPageList = (obj) => http.post('/boeu/project/pageList', obj) +export const boeuProjectPageList = (obj) => http.post('/report/boeu/project/pageList', obj) // 文章列表 -export const boeuArticlePageList = (obj) => http.post('/boeu/article/pageList', obj ) +export const boeuArticlePageList = (obj) => http.post('/report/boeu/article/pageList', obj ) // 课程分页列表 -export const boeuCourseListPageV2 = (obj) => http.post('/boeu/course/List/page/v2', obj ) +export const boeuCourseListPageV2 = (obj) => http.post('/report/boeu/course/List/page/v2', obj ) // 考试列表分页 export const boeuExamPageListV2 = (obj) => http.post('/boeu/exam/pageList/v2', obj ) // 问答分页列表 -export const boeuQuestionPageList= (obj) => http.post('/boeu/question/pageList', obj ) +export const boeuQuestionPageList= (obj) => http.post('/report/boeu/question/pageList', obj ) //柱状体左侧获取数据接口 export const dataStatisticsSelectV1= (obj) => http.post('/data/statistics/select/v1', obj ) //柱状体右侧获取数据接口