lex 1 rok temu
rodzic
commit
998523438a

+ 4 - 0
src/views/classList/index.module.less

@@ -723,6 +723,10 @@
     --n-border: 1px solid #198CFE !important;
     --n-height: max(38px, 32Px) !important;
     border-radius: 8px !important;
+    --n-opacity-disabled: 0.7 !important;
+    --n-border-disabled: 1px solid #198CFE !important;
+
+    // 1px solid #289bff
 
     .text {
       display: flex;

+ 1 - 1
src/views/classList/modals/TrainingDetails.tsx

@@ -192,7 +192,7 @@ export default defineComponent({
             )}
           </div>
 
-          {!studnetInfo.value.fileExpireFlag && (
+          {(studnetInfo.value.fileExpireDay || 0 > 0) && (
             <div class={styles.expireDateTip}>
               <i class={styles.expireDateIcon}></i>
               <span>

+ 2 - 1
src/views/classList/work-item/index.tsx

@@ -44,7 +44,8 @@ export default defineComponent({
       <div
         class={[
           styles.workItem,
-          props.item.fileList?.expireFlag && styles['work-content-disabled']
+          (props.item.fileList?.expireFlag || !props.item.fileList?.fileType) &&
+            styles['work-content-disabled']
         ]}>
         <div
           class={[styles['work-content']]}

+ 195 - 195
src/views/studentList/modals/comment-work/index.module.less

@@ -1,196 +1,196 @@
-.commonWork {
-  width: 473px;
-  // height: 309px;
-  background: #FFFFFF;
-  border-radius: 16px;
-  position: relative;
-  padding: 0 30px 35px;
-
-  .downMoveBg {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 473px;
-    height: 121px;
-  }
-
-  .dingPng {
-    width: 162px;
-    height: 98px;
-    position: absolute;
-    left: 50%;
-    margin-left: -81px;
-    top: -49px;
-    z-index: 100;
-  }
-
-  .closeAble {
-    cursor: pointer;
-    width: 25px;
-    height: 25px;
-    position: absolute;
-    top: 18px;
-    right: 20px;
-  }
-
-  h2 {
-    margin-top: 64px;
-    height: 33px;
-    font-size: 24px;
-    font-family: PingFangSC-Semibold, PingFang SC;
-    font-weight: 600;
-    color: #000000;
-    line-height: 33px;
-    text-align: center;
-    margin-bottom: 15px;
-  }
-
-  // p {
-  //   font-size: 18px;
-  //   font-family: PingFangSC-Regular, PingFang SC;
-  //   font-weight: 400;
-  //   color: #777777;
-  //   line-height: 30px;
-  // }
-
-  .header {
-    display: flex;
-    align-items: center;
-    padding: 0 0 13px;
-
-    .navatar {
-      width: 60px;
-      height: 60px;
-      border-radius: 50%;
-      padding: 2px;
-      border: 1px solid #198CFE;
-      margin-right: 15px;
-      flex-shrink: 0;
-      background-color: #fff !important;
-
-      :global {
-        img {
-          border-radius: 50%;
-        }
-      }
-    }
-
-    .userInfo {
-      padding-top: 4px;
-      flex: 1;
-
-      h3 {
-        font-size: max(17px, 14Px);
-        font-weight: 600;
-        color: #131415;
-        line-height: 28px;
-      }
-
-      p {
-        font-size: max(16px, 12Px);
-        color: #777777;
-        line-height: 28px;
-      }
-    }
-  }
-
-
-  .textarea {
-    margin-top: 8px;
-    background-color: #F2F4F7 !important;
-    border-radius: 10px;
-    --n-border: 1px solid #F2F4F7 !important;
-
-    :global {
-      .n-input-wrapper {
-        padding-bottom: 32px;
-      }
-
-      .n-input__textarea-el {
-        font-weight: 500;
-        color: #131415;
-      }
-    }
-  }
-
-  :global {
-    .n-button {
-      min-width: 156px;
-    }
-  }
-
-  .submitAppBtn {
-    // line-height: 45px;
-    background: linear-gradient(305deg, #40C8FF 0%, #3192FF 100%);
-    border-radius: 24px;
-    border: none;
-
-    :global {
-      .n-button__border {
-        display: none;
-      }
-
-      .n-button__state-border {
-        display: none;
-      }
-    }
-
-  }
-}
-
-.removeVisiable1 {
-  width: 473px;
-
-  :global {
-    .n-card-header {
-      font-size: max(22px, 16Px);
-    }
-  }
-
-  .studentRemove {
-    padding: 20px 40px 0;
-
-    p {
-      font-size: max(18px, 14Px);
-      color: #777777;
-      line-height: 30px;
-
-      span {
-        color: #EA4132;
-      }
-    }
-
-    .selectBtn {
-      display: flex;
-      justify-content: center;
-      padding-top: 13px;
-      padding-bottom: 8px;
-
-
-      :global {
-        .n-checkbox {
-          display: flex;
-          align-items: center;
-          --n-border-radius: 50% !important;
-        }
-
-        .n-checkbox__label {
-          font-size: max(16px, 12Px);
-          color: #777777;
-          line-height: 24px;
-        }
-      }
-    }
-  }
-
-  .btnGroupModal {
-    padding: 32px 0;
-
-    :global {
-      .n-button {
-        height: 47px;
-        min-width: 156px;
-      }
-    }
-  }
+.commonWork {
+  width: 560px;
+  // height: 309px;
+  background: #FFFFFF;
+  border-radius: 24px;
+  position: relative;
+  padding: 0 30px 35px;
+
+  .downMoveBg {
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 560px;
+    height: 121px;
+  }
+
+  .dingPng {
+    width: 162px;
+    height: 98px;
+    position: absolute;
+    left: 50%;
+    margin-left: -81px;
+    top: -49px;
+    z-index: 100;
+  }
+
+  .closeAble {
+    cursor: pointer;
+    width: 25px;
+    height: 25px;
+    position: absolute;
+    top: 18px;
+    right: 20px;
+  }
+
+  h2 {
+    margin-top: 64px;
+    height: 33px;
+    font-size: 24px;
+    font-family: PingFangSC-Semibold, PingFang SC;
+    font-weight: 600;
+    color: #000000;
+    line-height: 33px;
+    text-align: center;
+    margin-bottom: 15px;
+  }
+
+  // p {
+  //   font-size: 18px;
+  //   font-family: PingFangSC-Regular, PingFang SC;
+  //   font-weight: 400;
+  //   color: #777777;
+  //   line-height: 30px;
+  // }
+
+  .header {
+    display: flex;
+    align-items: center;
+    padding: 0 0 13px;
+
+    .navatar {
+      width: 60px;
+      height: 60px;
+      border-radius: 50%;
+      padding: 2px;
+      border: 1px solid #198CFE;
+      margin-right: 15px;
+      flex-shrink: 0;
+      background-color: #fff !important;
+
+      :global {
+        img {
+          border-radius: 50%;
+        }
+      }
+    }
+
+    .userInfo {
+      padding-top: 4px;
+      flex: 1;
+
+      h3 {
+        font-size: max(17px, 14Px);
+        font-weight: 600;
+        color: #131415;
+        line-height: 28px;
+      }
+
+      p {
+        font-size: max(16px, 12Px);
+        color: #777777;
+        line-height: 28px;
+      }
+    }
+  }
+
+
+  .textarea {
+    margin-top: 8px;
+    background-color: #F2F4F7 !important;
+    border-radius: 10px;
+    --n-border: 1px solid #F2F4F7 !important;
+
+    :global {
+      .n-input-wrapper {
+        padding-bottom: 32px;
+      }
+
+      .n-input__textarea-el {
+        font-weight: 500;
+        color: #131415;
+      }
+    }
+  }
+
+  :global {
+    .n-button {
+      min-width: 156px;
+    }
+  }
+
+  .submitAppBtn {
+    // line-height: 45px;
+    background: linear-gradient(305deg, #40C8FF 0%, #3192FF 100%);
+    border-radius: 24px;
+    border: none;
+
+    :global {
+      .n-button__border {
+        display: none;
+      }
+
+      .n-button__state-border {
+        display: none;
+      }
+    }
+
+  }
+}
+
+.removeVisiable1 {
+  width: 473px;
+
+  :global {
+    .n-card-header {
+      font-size: max(22px, 16Px);
+    }
+  }
+
+  .studentRemove {
+    padding: 20px 40px 0;
+
+    p {
+      font-size: max(18px, 14Px);
+      color: #777777;
+      line-height: 30px;
+
+      span {
+        color: #EA4132;
+      }
+    }
+
+    .selectBtn {
+      display: flex;
+      justify-content: center;
+      padding-top: 13px;
+      padding-bottom: 8px;
+
+
+      :global {
+        .n-checkbox {
+          display: flex;
+          align-items: center;
+          --n-border-radius: 50% !important;
+        }
+
+        .n-checkbox__label {
+          font-size: max(16px, 12Px);
+          color: #777777;
+          line-height: 24px;
+        }
+      }
+    }
+  }
+
+  .btnGroupModal {
+    padding: 32px 0;
+
+    :global {
+      .n-button {
+        height: 47px;
+        min-width: 156px;
+      }
+    }
+  }
 }

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

@@ -185,7 +185,7 @@ export default defineComponent({
               </NButton>
             )}
           </div>
-          {!teacherInfo.value.fileExpireFlag && (
+          {(teacherInfo.value.fileExpireDay || 0) > 0 && (
             <div class={styles.expireDateTip}>
               <i class={styles.expireDateIcon}></i>
               <span>