lex 1 year ago
parent
commit
56892a79de

+ 49 - 44
src/views/home/index.tsx

@@ -95,7 +95,7 @@ export default defineComponent({
         currentClass: null,
         name: '',
         upgradeFlag: false, // 是否为历史班
-        gradeLevel: '',
+        gradeLevel: null as any,
         gradeYear: null
       } as any,
       popSelectOptions: [] as any,
@@ -432,49 +432,54 @@ export default defineComponent({
               <h3 class={styles.rightTitle}>
                 <div class={styles.titleDot}></div>上课记录
               </h3>
-              {forms.classSelect?.currentClass && (
-                <div class={styles.classSearchList}>
-                  <NSelect
-                    v-model:value={forms.classSelect.gradeYear}
-                    class={styles.lookMoreSearch}
-                    placeholder="全部学年"
-                    options={forms.popSelectYearList}
-                    labelField="name"
-                    valueField="id"
-                    onUpdate:value={(val: any) => {
-                      forms.classSelect.gradeYear = val;
-                      getCourseSchedulePage();
-                    }}></NSelect>
-                  <NSelect
-                    v-model:value={forms.classSelect.gradeLevel}
-                    class={styles.lookMoreSearch}
-                    placeholder="全部学级"
-                    options={forms.popSelectLevelList}
-                    labelField="name"
-                    valueField="id"
-                    onUpdate:value={(val: any) => {
-                      forms.classSelect.gradeLevel = val;
-                      getCourseSchedulePage();
-                    }}></NSelect>
-                  <NSelect
-                    v-model:value={forms.classSelect.currentClass}
-                    class={styles.lookMoreSearch}
-                    placeholder="选择班级"
-                    options={forms.popSelectOptions}
-                    onUpdate:value={(val: any) => {
-                      forms.popSelectOptions.forEach((item: any) => {
-                        if (item.value === val) {
-                          forms.classSelect.currentGradeNum =
-                            item.currentGradeNum;
-                          forms.classSelect.currentClass = item.value;
-                          forms.classSelect.name = item.label;
-                          forms.classSelect.upgradeFlag = item.upgradeFlag;
-                          getCourseSchedulePage();
-                        }
-                      });
-                    }}></NSelect>
-                </div>
-              )}
+
+              <div class={styles.classSearchList}>
+                <NSelect
+                  v-model:value={forms.classSelect.gradeYear}
+                  class={styles.lookMoreSearch}
+                  placeholder="全部学年"
+                  options={forms.popSelectYearList}
+                  labelField="name"
+                  valueField="id"
+                  onUpdate:value={async (val: any) => {
+                    forms.classSelect.gradeYear = val;
+                    forms.lastClassSelect.currentClass = null;
+                    forms.classSelect.currentClass = null;
+                    await getClassList();
+                    await getCourseSchedulePage();
+                  }}></NSelect>
+                <NSelect
+                  v-model:value={forms.classSelect.gradeLevel}
+                  class={styles.lookMoreSearch}
+                  placeholder="全部学级"
+                  options={forms.popSelectLevelList}
+                  labelField="name"
+                  valueField="id"
+                  onUpdate:value={async (val: any) => {
+                    forms.classSelect.gradeLevel = val;
+                    forms.lastClassSelect.currentClass = null;
+                    forms.classSelect.currentClass = null;
+                    await getClassList();
+                    await getCourseSchedulePage();
+                  }}></NSelect>
+                <NSelect
+                  v-model:value={forms.classSelect.currentClass}
+                  class={styles.lookMoreSearch}
+                  placeholder="选择班级"
+                  options={forms.popSelectOptions}
+                  onUpdate:value={(val: any) => {
+                    forms.popSelectOptions.forEach((item: any) => {
+                      if (item.value === val) {
+                        forms.classSelect.currentGradeNum =
+                          item.currentGradeNum;
+                        forms.classSelect.currentClass = item.value;
+                        forms.classSelect.name = item.label;
+                        forms.classSelect.upgradeFlag = item.upgradeFlag;
+                        getCourseSchedulePage();
+                      }
+                    });
+                  }}></NSelect>
+              </div>
             </div>
             <NSpin show={forms.classLoading} style={{ minHeight: '40vh' }}>
               {Object.keys(teachList.value).length > 0 && (

+ 7 - 7
src/views/prepare-lessons/components/lesson-main/train/assign-homework.tsx

@@ -101,13 +101,13 @@ export default defineComponent({
         if (err) {
           return;
         }
-        const item = forms.classList.find(
-          (item: any) => item.value === forms.classGroupId
-        );
-        if (item && item.preStudentNum <= 0) {
-          message.error('当前班级暂无学生,无法布置作业');
-          return;
-        }
+        // const item = forms.classList.find(
+        //   (item: any) => item.value === forms.classGroupId
+        // );
+        // if (item && item.preStudentNum <= 0) {
+        //   message.error('当前班级暂无学生,无法布置作业');
+        //   return;
+        // }
 
         forms.uploading = true;
         try {