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 ) //柱状体右侧获取数据接口 diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index ea5e1836..306c7c57 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("开始前或开始后数值有误,请重新填写") + 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;