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

Merge branch 'master_1202' into test20250220

Browse Source
This commit is contained in:
joshen
2025-03-20 08:32:55 +08:00
parent 5259198523 980d70c589
commit 372de0dc6d
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -781,7 +781,7 @@
</div>
</div>
</div>
</div>
<!-- 无数据样式 -->
<div class="notable" v-if="tableData6.length === 0">
@@ -975,7 +975,7 @@
:placeholder="[' 开始时间', ' 结束时间']"
:disabled="editBeginClass"
/> -->
<a-date-picker
<a-date-picker
style="width: 45%; height: 40px; border-radius: 8px"
:show-time="{ format: 'HH:mm' }"
:format="['YYYY-MM-DD HH:mm','YYYY/MM/DD HH:mm']"
@@ -1172,7 +1172,7 @@
<span v-if="xjkkradioVEnd" style="color: #6d7584">天</span>
</div>
</div>
<div class="cstm_items">
<div class="signbox">
<span style="margin-right: 3px">评估设置</span>
@@ -2317,7 +2317,7 @@ export default defineComponent({
const store = useStore();
const sysTypeOptions = computed(() => store.state.content_type);
const durationText = computed(() => state.xjkkinputV3?.length==2?dayjs(state.xjkkinputV3[1]).diff(dayjs(state.xjkkinputV3[0]),'minute')|| '请输入持续时间':'请输入持续时间');
const state = reactive({
tableStudentChange: null,
isAssessmentId: null,
@@ -3474,6 +3474,7 @@ function onFocusEnd(){
};
const logT = () => {
state.examInfo = {};
state.EditTestId = null;
};
const removePG = () => {
console.log("11111");
@@ -3679,7 +3680,7 @@ function onFocusEnd(){
}).catch(err=>{
message.error(err.message=='timeout of 15000ms exceeded'?'系统超时，请稍后再试':err.data.msg)
state.tableCoursePlanLoading = false
res ={
res ={
data:{data:{
"pageNo": "1",
"pageSize": "10",
@@ -4019,7 +4020,8 @@ function onFocusEnd(){
endTime: endTime,
evalFlag: Number(state.assessmentId) > 0 && state.checked4 ? 1 : 0,
assessmentId: state.checked4==1?Number(state.assessmentId):0,
testId: state.examInfo.examinationName ? state.EditTestId : null,
// testId: state.examInfo.examinationName ? state.EditTestId : null,
testId: state.examInfo.examinationName ? (state.examInfo.examinationTestId ? state.EditTestId : null): null,
homeWorkId: state.EditWorkId,
name: state.xjkkinputV1,
signFlag: state.xjkkradioV1 ? 1 : 0, //是否允许未报名的签到:1是0否
@@ -4030,12 +4032,11 @@ function onFocusEnd(){
// teacher: state.member.name,
offteachers: state.offteachers,
workInfo: state.workInfo, //提交的作业信息
//提交的考试信息
// examInfo: state.examInfo, //提交的考试信息
beforeStart: state.beforeValue, //考勤 开始前
afterStart: state.afterStartValue, //考勤 开始后
score: state.scoreParams,
};
//todo 为了合并代码
if(state.kk_eidt){
console.log("编辑 gx state.kk_eidt",state.kk_eidt)
console.log("编辑 gx state.kk_eidt",state.examInfo)
@@ -4119,7 +4120,7 @@ function onFocusEnd(){
});
state.cstm_hs = false;
};
let editBeginClass = ref(false)
//编辑开课
const handelEditStu = async (item) => {
@@ -4364,7 +4365,7 @@ function onFocusEnd(){
align: "center",
customRender: ({ record }) =>
record.examinationScore ? record.examinationScore : "-",
},
{
title: "结业状态",
@@ -5301,13 +5302,13 @@ function onFocusEnd(){
};
const disabledDateTime = () => {
// const dateOnlyStart = new Date(state.xjkkinputV3[0].split(' ')[0]);
// const dateOnlyEnd = new Date(state.xjkkinputV3[1].split(' ')[0]);
// const dateOnlyStart = new Date(state.xjkkinputV3[0].split(' ')[0]);
// const dateOnlyEnd = new Date(state.xjkkinputV3[1].split(' ')[0]);
// if(dateOnlyStart.getTime()==dateOnlyEnd.getTime()){
// const currentMinute = dayjs(state.xjkkinputV3[0]).minute();
// return {
// disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()),
// disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1),
// disabledHours: () => range(0, dayjs(state.xjkkinputV3[0]).hour()).splice(0, dayjs(state.xjkkinputV3[0]).hour()),
// disabledMinutes: () => range(0, currentMinute+1).splice(0, currentMinute+1),
// };
// }
};