Merge remote-tracking branch 'yx/master-20250818-hz' into master-20250627bk

This commit is contained in:
joshen
2025-08-27 10:24:33 +08:00

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;