|
@@ -50,11 +50,11 @@ export const formatDateToDay = () => {
|
|
|
//
|
|
|
const hours = dayjs().hour();
|
|
|
if (hours < 12) {
|
|
|
- return '早上好!'; //如果小时数小于12则输出“早上好!”
|
|
|
+ return '早上好'; //如果小时数小于12则输出“早上好!”
|
|
|
} else if (hours > 12 && hours < 18) {
|
|
|
- return '下午好!'; //如果小时数大于12并且小于18,输入“下午好!”
|
|
|
+ return '下午好'; //如果小时数大于12并且小于18,输入“下午好!”
|
|
|
} else {
|
|
|
- return '晚上好!'; //如果上面两个条件都不符合,则输出“晚上好!”
|
|
|
+ return '晚上好'; //如果上面两个条件都不符合,则输出“晚上好!”
|
|
|
}
|
|
|
};
|
|
|
|
|
@@ -139,7 +139,8 @@ export default defineComponent({
|
|
|
enableFlag: 1,
|
|
|
page: 1,
|
|
|
rows: 99,
|
|
|
- type: 'COURSEWARE'
|
|
|
+ type: 'COURSEWARE',
|
|
|
+ currentGradeNum: forms.applyClassItem.currentGradeNum
|
|
|
});
|
|
|
|
|
|
forms.list = data.rows.map((item: any) => {
|
|
@@ -208,9 +209,9 @@ export default defineComponent({
|
|
|
}
|
|
|
|
|
|
const classList: any = [];
|
|
|
- item.classGroupList.forEach((i: any, j: number) => {
|
|
|
+ item.classGroupList.forEach((i: any) => {
|
|
|
classList.push({
|
|
|
- label: j + 1 + '班',
|
|
|
+ label: i.currentClass + '班',
|
|
|
value: i.id,
|
|
|
lastStudy: i.lastStudy
|
|
|
});
|
|
@@ -235,7 +236,8 @@ export default defineComponent({
|
|
|
const { data } = await courseSchedulePage({
|
|
|
classGroupId: forms.classSelect.currentClass,
|
|
|
page: 1,
|
|
|
- rows: 6
|
|
|
+ rows: 6,
|
|
|
+ teacherId: userStore.getUserInfo.id
|
|
|
});
|
|
|
|
|
|
const result = data.rows || [];
|
|
@@ -437,7 +439,7 @@ export default defineComponent({
|
|
|
disabled={!forms.category}
|
|
|
{...({
|
|
|
options: [...forms.unitList],
|
|
|
- placeholder: '选择单元',
|
|
|
+ placeholder: '选择章节',
|
|
|
clearable: true
|
|
|
} as any)}
|
|
|
childrenField="knowledgeList"
|