Browse Source

修复问题

lex 1 year ago
parent
commit
06e569402b

+ 1 - 1
src/components/card-type/index.tsx

@@ -119,7 +119,7 @@ export default defineComponent({
           isAnimation.value = false;
         }}
         onDragstart={(e: any) => {
-          console.log(e, 'dragstart');
+          console.log('dragstart', Date.now());
           e.dataTransfer.setData('text', JSON.stringify(props.item));
         }}>
         {/* 判断是否下架 */}

+ 6 - 3
src/views/classList/components/afterWork.tsx

@@ -25,16 +25,19 @@ import {
 } from '@/utils/dateFormat';
 import dayjs from 'dayjs';
 import TrainSettings from '../../attend-class/model/train-settings';
-import { use } from 'echarts';
 import TheEmpty from '/src/components/TheEmpty';
 export default defineComponent({
   name: 'afterWork',
   setup(props, { emit }) {
+    const router = useRouter();
+    const route = useRoute();
     const timer = ref<[number, number]>([
       getNowDateAndMonday(new Date().getTime()),
       getNowDateAndSunday(new Date().getTime())
     ]);
+    console.log(route.query, 'query');
     const state = reactive({
+      upgradeFlag: (route.query.upgradeFlag as any) == 0 ? true : false, // 是否为历史班
       searchForm: {
         status: null as any
       },
@@ -49,8 +52,7 @@ export default defineComponent({
       activeRow: null as any,
       detailVisiable: false
     });
-    const router = useRouter();
-    const route = useRoute();
+
     const search = () => {
       state.pagination.page = 1;
       getList();
@@ -252,6 +254,7 @@ export default defineComponent({
         </div>
         <NButton
           class={styles.addBtn}
+          disabled={state.upgradeFlag}
           type="primary"
           onClick={() => (state.addWorkVisible = true)}>
           布置作业

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

@@ -193,7 +193,8 @@ export default defineComponent({
                             query: {
                               name: row.name,
                               id: row.id,
-                              gradeYear: row.gradeYear
+                              gradeYear: row.gradeYear,
+                              upgradeFlag: row.upgradeFlag ? 1 : 0 // 是否为历史班
                             }
                           });
                         }}>
@@ -210,7 +211,8 @@ export default defineComponent({
                           query: {
                             name: row.name,
                             id: row.id,
-                            gradeYear: row.gradeYear
+                            gradeYear: row.gradeYear,
+                            upgradeFlag: row.upgradeFlag ? 1 : 0 // 是否为历史班
                           }
                         });
                       }}>

+ 7 - 4
src/views/home/index.tsx

@@ -86,6 +86,7 @@ export default defineComponent({
       lastClassSelect: {
         currentClass: null,
         name: '',
+        upgradeFlag: false, // 是否为历史班
         gradeYear: null as any,
         gradeLevel: null as any
       },
@@ -93,6 +94,7 @@ export default defineComponent({
         currentGradeNum: null,
         currentClass: null,
         name: '',
+        upgradeFlag: false, // 是否为历史班
         gradeLevel: '',
         gradeYear: null
       } as any,
@@ -123,6 +125,7 @@ export default defineComponent({
               forms.classSelect.currentClass =
                 forms.lastClassSelect.currentClass;
               forms.classSelect.name = forms.lastClassSelect.name;
+              forms.classSelect = forms.lastClassSelect.upgradeFlag;
             } else {
               const temp = item.classGroupList[0];
               forms.classSelect.currentGradeNum = item.currentGradeNum;
@@ -172,6 +175,7 @@ export default defineComponent({
         forms.lastClassSelect = {
           currentClass: tempRow.classGroupId,
           name: tempRow.classGroupName,
+          upgradeFlag: tempRow.upgradeFlag,
           gradeYear: tempRow.gradeYear + '',
           gradeLevel: tempRow.gradeLevel + ''
         };
@@ -182,7 +186,6 @@ export default defineComponent({
     const getYearList = async () => {
       try {
         const { data } = await getGradeYearList();
-        console.log(data, 'data getYearList');
         const temp = data || [];
         temp.forEach((i: any) => {
           i.name = i.name + '学年';
@@ -203,7 +206,6 @@ export default defineComponent({
     const getLevelList = async () => {
       try {
         const { data } = await getGradeLevelList();
-        console.log(data, 'data getLevelList');
         const temp = data || [];
         temp.forEach((i: any) => {
           i.name = i.name + '级';
@@ -466,6 +468,7 @@ export default defineComponent({
                             item.currentGradeNum;
                           forms.classSelect.currentClass = item.value;
                           forms.classSelect.name = item.label;
+                          forms.classSelect.upgradeFlag = item.upgradeFlag;
                           getCourseSchedulePage();
                         }
                       });
@@ -492,13 +495,13 @@ export default defineComponent({
                             'classDetailTabs',
                             'attendclass'
                           );
-                          console.log(forms.classSelect);
                           router.push({
                             path: '/classDetail',
                             query: {
                               name: forms.classSelect.name,
                               id: forms.classSelect.currentClass,
-                              gradeYear: forms.classSelect.gradeYear
+                              gradeYear: forms.classSelect.gradeYear,
+                              upgradeFlag: forms.classSelect.upgradeFlag ? 1 : 0 // 是否为历史班
                             }
                           });
                         }}>

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

@@ -46,7 +46,9 @@ export default defineComponent({
       try {
         const defaultSelectClassGroupId = prepareStore.getClassGroupId;
         console.log('defaultSelectClassGroupId:', defaultSelectClassGroupId);
-        const { data } = await classGroupList({ removeZeroClass: true });
+        const { data } = await classGroupList({
+          upgradeFlag: true
+        });
         const cList = data || [];
         const gradeList: any = [];
         cList.forEach((item: any) => {
@@ -55,7 +57,8 @@ export default defineComponent({
             classList.push({
               label: i.currentClass + '班',
               value: i.id,
-              lastStudy: i.lastStudy
+              lastStudy: i.lastStudy,
+              preStudentNum: i.preStudentNum
             });
 
             if (i.id === defaultSelectClassGroupId) {
@@ -98,6 +101,14 @@ 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;
+        }
+
         forms.uploading = true;
         try {
           const trainList = props.trainList || [];

+ 2 - 2
src/views/prepare-lessons/components/lesson-main/train/index.tsx

@@ -307,7 +307,7 @@ export default defineComponent({
                 e.preventDefault();
               }}
               onDrop={(e: any) => {
-                console.log(e, 'e');
+                console.log('onDrop', Date.now());
                 let dropItem = e.dataTransfer.getData('text');
                 dropItem = dropItem ? JSON.parse(dropItem) : {};
                 // 判断是否有数据
@@ -458,7 +458,7 @@ export default defineComponent({
                   forms.removeVisiable1 = false;
                   // prepareStore.setCoursewareList([]);
 
-                  console.log(prepareStore.getTrainList, 'getCourseware1');
+                  // console.log(prepareStore.getTrainList, 'getCourseware1');
                 }}>
                 确定
               </NButton>

+ 1 - 1
src/views/prepare-lessons/components/resource-main/components/select-music/index.tsx

@@ -164,6 +164,7 @@ export default defineComponent({
       getList();
 
       eventGlobal.on('onTrainDragItem', (item: any) => {
+        console.log('onTrainDragItem', Date.now());
         onAdd(item);
       });
     });
@@ -246,7 +247,6 @@ export default defineComponent({
                 typeList: tList
               };
 
-              console.log(train, '1212');
               eventGlobal.emit('onTrainAddItem', train);
             }}
           />