lex 1 vuosi sitten
vanhempi
commit
5e37e9f234

+ 4 - 2
src/views/classList/components/afterWorkDetail.tsx

@@ -208,13 +208,15 @@ export default defineComponent({
               <p>
                 布置时间:
                 {state.workInfo.createTime
-                  ? dayjs(state.workInfo.createTime).format('YYYY-MM-DD')
+                  ? dayjs(state.workInfo.createTime).format('YYYY-MM-DD HH:mm')
                   : '--'}{' '}
                 |{' '}
                 <span>
                   截止时间:
                   {state.workInfo.expireDate
-                    ? dayjs(state.workInfo.expireDate).format('YYYY-MM-DD')
+                    ? dayjs(state.workInfo.expireDate).format(
+                        'YYYY-MM-DD HH:mm'
+                      )
                     : '--'}
                 </span>
               </p>

+ 4 - 2
src/views/homework-record/detail/index.tsx

@@ -209,13 +209,15 @@ export default defineComponent({
                       布置时间:
                       {state.workInfo.createTime &&
                         dayjs(state.workInfo.createTime).format(
-                          'YYYY-MM-DD'
+                          'YYYY-MM-DD HH:mm'
                         )}{' '}
                       |{' '}
                       <span>
                         截止时间:
                         {state.workInfo.expireDate &&
-                          dayjs(state.workInfo.expireDate).format('YYYY-MM-DD')}
+                          dayjs(state.workInfo.expireDate).format(
+                            'YYYY-MM-DD HH:mm'
+                          )}
                       </span>
                     </p>
                   )}

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

@@ -378,11 +378,11 @@ export default defineComponent({
                         <h2>{item.teacherName}</h2>
                         <p>
                           布置时间:
-                          {dayjs(item.createTime).format('YYYY-MM-DD')}
+                          {dayjs(item.createTime).format('YYYY-MM-DD HH:mm')}
                           <span> | </span>
                           <span style={{ color: '#EA4132' }}>
                             截止时间:
-                            {dayjs(item.expireDate).format('YYYY-MM-DD')}
+                            {dayjs(item.expireDate).format('YYYY-MM-DD HH:mm')}
                           </span>
                         </p>
                       </div>

+ 3 - 3
src/views/prepare-lessons/model/select-resources/select-item/index.tsx

@@ -59,7 +59,7 @@ export default defineComponent({
         type: 'MUSIC', //
         name: '',
         bookVersionId: null,
-        // subjectId: prepareStore.getSubjectId,
+        subjectId: prepareStore.getSubjectId,
         sourceType: formatType(type.value),
         musicalInstrumentId: null as any,
         enableFlag: true
@@ -77,8 +77,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
src/views/studentList/components/studentAfterWork.tsx

@@ -138,7 +138,7 @@ export default defineComponent({
           key: 'createTime',
           render(row: any) {
             return row.createTime
-              ? dayjs(row.createTime).format('YYYY-MM-DD')
+              ? dayjs(row.createTime).format('YYYY-MM-DD HH:mm')
               : '--';
           }
         },
@@ -147,7 +147,7 @@ export default defineComponent({
           key: 'expireDate',
           render(row: any) {
             return row.expireDate
-              ? dayjs(row.expireDate).format('YYYY-MM-DD')
+              ? dayjs(row.expireDate).format('YYYY-MM-DD HH:mm')
               : '--';
           }
         },

+ 2 - 1
src/views/studentList/modals/comment-work/index.tsx

@@ -97,7 +97,8 @@ export default defineComponent({
           <div class={styles.userInfo}>
             <h3>{props.workInfo.studentName}</h3>
             <p>
-              提交时间:{dayjs(props.workInfo.submitTime).format('YYYY-MM-DD')}
+              提交时间:
+              {dayjs(props.workInfo.submitTime).format('YYYY-MM-DD HH:mm')}
             </p>
           </div>
         </div>

+ 2 - 2
src/views/studentList/modals/studentTraomomhDetails.tsx

@@ -138,13 +138,13 @@ export default defineComponent({
                   开始时间:
                   {teacherInfo.value.createTime
                     ? dayjs(new Date(teacherInfo.value.createTime)).format(
-                        'YYYY-MM-DD'
+                        'YYYY-MM-DD HH:mm'
                       )
                     : '--'}{' '}
                   | 结束时间:
                   {teacherInfo.value.expireDate
                     ? dayjs(new Date(teacherInfo.value.expireDate)).format(
-                        'YYYY-MM-DD'
+                        'YYYY-MM-DD HH:mm'
                       )
                     : '--'}
                 </p>