Browse Source

修改显示

lex 1 year ago
parent
commit
b66fd54e42

+ 16 - 9
src/views/attend-class/model/train-type/index.tsx

@@ -54,6 +54,10 @@ export default defineComponent({
       type: Boolean,
       default: false
     },
+    isLarge: {
+      type: Boolean,
+      default: false
+    },
     /** 是否下架 */
     offShelf: {
       type: Boolean,
@@ -179,7 +183,8 @@ export default defineComponent({
         <div
           class={[
             styles['train-content'],
-            props.isDisabled && !props.isCLassWork && styles.trainDisabled
+            props.isDisabled && !props.isCLassWork && styles.trainDisabled,
+            props.isLarge && styles.trainDisabled
           ]}
           onClick={() => {
             if (props.isDisabled && !props.isCLassWork) {
@@ -248,14 +253,16 @@ export default defineComponent({
                 预览
               </NButton>
             </div> */}
-          <img
-            src={iconDelete}
-            class={styles.iconDelete}
-            onClick={(e: MouseEvent) => {
-              e.stopPropagation();
-              emit('delete', props.item);
-            }}
-          />
+          {props.isDelete && (
+            <img
+              src={iconDelete}
+              class={styles.iconDelete}
+              onClick={(e: MouseEvent) => {
+                e.stopPropagation();
+                emit('delete', props.item);
+              }}
+            />
+          )}
         </div>
         <div class={styles['train-footer']}>
           <div class={styles.trainInfo}>

+ 2 - 1
src/views/classList/modals/classTrainingDetails.tsx

@@ -154,7 +154,8 @@ export default defineComponent({
                     style={{ marginBottom: '20px' }}
                     isDisabled={true}
                     isDelete={false}
-                    isCLassWork={false}
+                    isLarge
+                    isCLassWork={true}
                     item={item}></TrainType>
                 )
               )}

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

@@ -144,14 +144,22 @@ export default defineComponent({
     };
     const gotoWorkDetail = (row: any) => {
       console.log(row);
+      // router.push({
+      //   path: '/afterWorkDetail',
+      //   query: {
+      //     ...route.query,
+      //     teacherName: row.teacherName,
+      //     trainingId: row.id,
+      //     id: row.classGroupId,
+      //     name: row.classGroupName
+      //   }
+      // });
+
       router.push({
-        path: '/afterWorkDetail',
+        path: '/homework-record-detail',
         query: {
-          ...route.query,
-          teacherName: row.teacherName,
-          trainingId: row.id,
-          id: row.classGroupId,
-          name: row.classGroupName
+          id: row.id,
+          name: row.name
         }
       });
     };