lex 1 year ago
parent
commit
0d7f841f1c
2 changed files with 17 additions and 16 deletions
  1. 2 3
      src/views/classList/components/afterWork.tsx
  2. 15 13
      src/views/homework-record/index.tsx

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

@@ -138,9 +138,8 @@ export default defineComponent({
           title: '作业状态',
           key: 'status',
           render(row: any) {
-            return row.status == 0 ? (
+            return !row.status ? (
               <div class={styles.indDot}>
-                {' '}
                 <span></span> 进行中
               </div>
             ) : (
@@ -212,7 +211,7 @@ export default defineComponent({
         path: '/afterWorkDetail',
         query: {
           ...route.query,
-          classGroupId: row.classGroupId,
+          classGroupId: route.query.id,
           teacherName: row.teacherName,
           trainingId: row.id
         }

+ 15 - 13
src/views/homework-record/index.tsx

@@ -386,8 +386,8 @@ export default defineComponent({
                           </span>
                         </p>
                       </div>
-                      <div class={item.status === 1 ? styles.over : styles.ing}>
-                        {item.status === 1 ? '已结束' : '进行中'}
+                      <div class={item.status ? styles.over : styles.ing}>
+                        {item.status ? '已结束' : '进行中'}
                       </div>
                     </div>
                     <div class={styles.content}>
@@ -437,17 +437,19 @@ export default defineComponent({
                         </div>
                       </div>
 
-                      <NButton
-                        class={styles.errorBtn}
-                        type="error"
-                        color="#F94D50"
-                        onClick={(e: any) => {
-                          e.stopPropagation();
-                          state.resetVisiable = true;
-                          state.resetItem = item;
-                        }}>
-                        撤回
-                      </NButton>
+                      {!item.status && (
+                        <NButton
+                          class={styles.errorBtn}
+                          type="error"
+                          color="#F94D50"
+                          onClick={(e: any) => {
+                            e.stopPropagation();
+                            state.resetVisiable = true;
+                            state.resetItem = item;
+                          }}>
+                          撤回
+                        </NButton>
+                      )}
                     </div>
                   </div>
                 ))}