Jelajahi Sumber

修复问题

lex 1 tahun lalu
induk
melakukan
0f0201ecf1

+ 1 - 1
public/version.json

@@ -1 +1 @@
-{"version":1707115257898}
+{"version":1707121822563}

TEMPAT SAMPAH
src/components/layout/images/icon_1_1.png


TEMPAT SAMPAH
src/components/layout/images/icon_1_2.png


TEMPAT SAMPAH
src/components/layout/images/palyIcon.png


TEMPAT SAMPAH
src/components/layout/images/palyNormal.png


+ 2 - 1
src/components/layout/layoutSilder.tsx

@@ -84,7 +84,8 @@ export default defineComponent({
         normalIcon: iconHomeWork,
         isActive: false,
         id: 9,
-        path: '/homework-record'
+        path: '/homework-record',
+        lightList: ['/homework-record-detail']
       },
       {
         activeIcon: icon_1_1,

+ 2 - 0
src/views/attend-class/model/class-work/index.tsx

@@ -258,7 +258,9 @@ export default defineComponent({
           title={'布置作业'}
           blockScroll={false}>
           <AssignHomework
+            homeworkType="CLASSWORK"
             classGroupId={props.classGroupId}
+            courseScheduleId={props.courseScheduleId}
             item={forms.selectItem}
             trainList={[]}
             onClose={() => (forms.assignHomeworkStatus = false)}

+ 1 - 1
src/views/home/components/practiceData.tsx

@@ -142,7 +142,7 @@ export default defineComponent({
           boundaryGap: true,
           axisLabel: {
             show: true,
-            interval: 0
+            interval: 3
           },
           data: payForm.dateList
         },

+ 6 - 4
src/views/home/components/trainData.tsx

@@ -242,7 +242,7 @@ export default defineComponent({
           boundaryGap: true,
           axisLabel: {
             show: true,
-            interval: 0
+            interval: 3
           },
           data: payForm.dateList
           // splitLine: {
@@ -279,15 +279,17 @@ export default defineComponent({
         grid: {
           left: '1%',
           right: '1%',
-          top: '2  %',
-          bottom: 0,
+          // top: '2  %',
+          // bottom: 0,
+          // containLabel: true
+          top: 80,
+          bottom: 80,
           containLabel: true
         },
         series: [
           {
             // smooth: true,
             data: payForm.studentList,
-            symbolSize: 10,
             type: 'line',
             name: '不合格人数',
             symbol: 'circle',

+ 3 - 2
src/views/homework-record/index.tsx

@@ -93,8 +93,9 @@ export default defineComponent({
       if (state.popSelectYearList.length > 0) {
         state.searchForm.gradeYear = state.popSelectYearList[1].id;
       }
-      // getList();
+      //
       setCache({ current: state.searchForm, saveKey: route.path });
+      getList();
     };
 
     const getModalHeight = () => {
@@ -236,7 +237,7 @@ export default defineComponent({
               <CSelect
                 {...({
                   options: [
-                    { id: '', name: '作业对象' },
+                    { id: '', name: '全部对象' },
                     { id: 'PERSON', name: '个人' },
                     { id: 'CLASS', name: '班级' }
                   ],

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

@@ -485,6 +485,7 @@ export default defineComponent({
           blockScroll={false}>
           <AssignHomework
             classGroupId={props.classGroupId}
+            homeworkType={props.courseScheduleId ? 'CLASSWORK' : 'HOMEWORK'}
             courseScheduleId={props.courseScheduleId}
             item={{
               title: forms.title,

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

@@ -97,8 +97,8 @@ export default defineComponent({
         // });
         const { data } = await materialQueryPage({
           ...state.searchGroup,
-          ...state.pagination,
-          subjectId: prepareStore.getSubjectId
+          ...state.pagination
+          // subjectId: prepareStore.getSubjectId
         });
         state.loading = false;
         const tempRows = data.rows || [];

+ 2 - 2
vite.config.ts

@@ -23,10 +23,10 @@ function resolve(dir: string) {
 }
 // https://vitejs.dev/config/
 // https://github.com/vitejs/vite/issues/1930 .env
-// const proxyUrl = 'https://dev.kt.colexiu.com/';
+const proxyUrl = 'https://dev.kt.colexiu.com/';
 // const proxyUrl = 'http://192.168.3.14:7989';
 
-const proxyUrl = 'https://test.lexiaoya.cn';
+// const proxyUrl = 'https://test.lexiaoya.cn';
 const now = new Date().getTime();
 export default defineConfig(() => {
   return {