Browse Source

更新优化bug

lex 1 year ago
parent
commit
d6539a2e57

+ 5 - 2
src/views/classList/index.tsx

@@ -170,7 +170,7 @@ export default defineComponent({
                     学生调整
                   </NButton>
                   <NButton
-                  disabled={!(row.preStudentNum > 0)}
+                    disabled={!(row.preStudentNum > 0)}
                     type="primary"
                     text
                     onClick={() => classesBegin(row)}>
@@ -262,7 +262,10 @@ export default defineComponent({
           v-slots={{
             icon: () => (
               <>
-                <NImage class={styles.addBtnIcon} previewDisabled src={add}></NImage>
+                <NImage
+                  class={styles.addBtnIcon}
+                  previewDisabled
+                  src={add}></NImage>
               </>
             )
           }}>

+ 10 - 8
src/views/home/index.tsx

@@ -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"

+ 4 - 2
src/views/prepare-lessons/components/directory-main/index.tsx

@@ -12,6 +12,7 @@ export default defineComponent({
     const prepareStore = usePrepareStore();
     const show = ref(true);
     const forms = reactive({
+      showSelectBookStatus: false,
       coursewareStatus: false
     });
 
@@ -27,6 +28,7 @@ export default defineComponent({
         if (data.rows.length > 0) {
           prepareStore.setBaseCourseware(data.rows[0]);
         }
+        forms.showSelectBookStatus = true;
       } catch {
         //
       }
@@ -66,14 +68,14 @@ export default defineComponent({
     });
     return () => (
       <div class={styles.directoryList}>
-        {prepareStore.getBaseCourseware.id && (
+        {forms.showSelectBookStatus && (
           <div
             class={styles['select-directory']}
             onClick={() => (forms.coursewareStatus = true)}>
             <span
               class={['cr-ellipsis']}
               title={prepareStore.getBaseCourseware.name}>
-              {prepareStore.getBaseCourseware.name}
+              {prepareStore.getBaseCourseware.name || '请选择教材'}
             </span>
             <NIcon class={styles.iconArrow}>
               <svg

+ 1 - 1
src/views/prepare-lessons/components/lesson-main/courseware/index.tsx

@@ -44,7 +44,7 @@ export default defineComponent({
       forms.loadingStatus = true;
       try {
         // 判断是否有选择对应的课件
-        if (!prepareStore.getSelectKey) return;
+        if (!prepareStore.getSelectKey) return (forms.loadingStatus = false);
         const { data } = await queryCourseware({
           coursewareDetailKnowledgeId: prepareStore.getSelectKey,
           subjectId: prepareStore.getSubjectId,

+ 3 - 0
src/views/prepare-lessons/index.tsx

@@ -34,6 +34,9 @@ export default defineComponent({
       prepareStore.setSelectResourceStatus(false);
       prepareStore.setIsAddResource(false);
       prepareStore.setIsAddTrain(false);
+      prepareStore.setCoursewareList([]);
+      prepareStore.setTreeList([]);
+      prepareStore.setTrainList([]);
     });
     return () => (
       <div class={styles.prepareLessons}>