hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-10 11:26:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch '104/master-20250627bk' into master-20250627bk

Browse Source
This commit is contained in:
670788339
2025-09-04 16:38:19 +08:00
parent f7ebf381c2 64b625f7a4
commit 37863aee7f
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/api/indexProject.js
View File

@@ -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 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 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 ) export const dataStatisticsSelectV1= (obj) => http.post('/data/statistics/select/v1', obj )
//柱状体右侧获取数据接口 //柱状体右侧获取数据接口

25
src/views/courselibrary/CoursewareManage.vue
View File

@@ -768,7 +768,12 @@
</div> </div>
<div class="cstm_items" style="align-items: flex-start"> <div class="cstm_items" style="align-items: flex-start">
<div class="signbox"> <div class="signbox">
<span style="margin-right: 3px">签到时间</span> <div class="signbox" style="position: relative; top: 11px">
<div class="sign">
<img src="@/assets/images/coursewareManage/asterisk.png" alt="" />
</div>
<span style="margin-right: 3px">签到时间</span>
</div>
</div> </div>
<div style="display: flex;flex-flow: column"> <div style="display: flex;flex-flow: column">
<section> <section>
@@ -2625,7 +2630,7 @@ export default defineComponent({
return return
} }
console.log(value, "---------------") console.log(value, "---------------")
nextTick(handleSelectSignDateTime) computedMin(signDateTimeType.value)
}, {deep: true}) }, {deep: true})
const nums = ref(0); const nums = ref(0);
@@ -3661,10 +3666,10 @@ export default defineComponent({
const handleSureStu = async () => { const handleSureStu = async () => {
// 检测开课前后的数值是否正确 // 检测开课前后的数值是否正确
if ( !(isNumber(state.afterStartValue) && isNumber(state.beforeValue))) { if ( !(isNumber(state.afterStartValue) && isNumber(state.beforeValue))) {
if(!(state.afterStartValue === null && state.beforeValue === null)) { message.warning("签到时间数值有误，请重新填写")
message.warning("开始前或开始后数值有误，请重新填写")
return return
} // if(!(state.afterStartValue === null && state.beforeValue === null)) {
// }
} }
function isNumber(value){ function isNumber(value){
return typeof value === 'number' && !isNaN(value); return typeof value === 'number' && !isNaN(value);
@@ -5139,11 +5144,19 @@ export default defineComponent({
return return
} }
computedMin(type)
}
/**
* 计算面授时间
* */
function computedMin(type){
// 面授开课时间 // 面授开课时间
const classStartTime = dayjs(state.xjkkinputV3[0]) const classStartTime = dayjs(state.xjkkinputV3[0])
// 面授结束时间 // 面授结束时间
const classEndTime = dayjs(state.xjkkinputV3[1]) const classEndTime = dayjs(state.xjkkinputV3[1])
console.log("classStartTime", classStartTime, "classEndTime", classEndTime) // console.log("classStartTime", classStartTime, "classEndTime", classEndTime)
const { endSignTime, startSignTime } = getDayOfStartAndEnd() const { endSignTime, startSignTime } = getDayOfStartAndEnd()
signDateTimeType.value = type; signDateTimeType.value = type;