lex-xin 3 月之前
父節點
當前提交
991fbb405a

+ 5 - 3
src/components/card-type/index.module.less

@@ -10,7 +10,7 @@
   //   }
   // }
 
-  
+
 
   // 图片禁止拖动
   img {
@@ -47,7 +47,7 @@
   :global {
     .n-card--bordered {
       border: 1Px solid rgba(202, 228, 244, 1) !important;
-  
+
       &:hover {
         border: 1Px solid rgba(0, 122, 254, 1) !important;
       }
@@ -58,7 +58,7 @@
     :global {
       .n-card--bordered {
         border: 1Px solid #F51C08 !important;
-    
+
         &:hover {
           border: 1Px solid #F51C08 !important;
           box-shadow: 0 0 0 2px rgba(245, 28, 8, 0.2);
@@ -183,6 +183,7 @@
       width: 13Px;
       height: 13Px;
       margin-top: 1px;
+      flex-shrink: 0;
     }
 
     .titleContent {
@@ -199,6 +200,7 @@
   .btnGroup {
     position: absolute;
     right: 12px;
+    flex-shrink: 0;
     display: flex;
     align-items: center;
 

+ 4 - 1
src/views/classList/index.tsx

@@ -163,7 +163,10 @@ export default defineComponent({
         },
         {
           title: '班级乐器',
-          key: 'instrumentName'
+          key: 'instrumentName',
+          render(row: any) {
+            return row.instrumentName || '--';
+          }
         },
         {
           title: '学生人数',

+ 79 - 79
src/views/prepare-lessons/components/lesson-main/courseware-presets/related.module.less

@@ -1,80 +1,80 @@
-.related {
-  height: 100%;
-
-  :global {
-    .n-tabs-tab-pad {
-      width: 24px !important;
-    }
-
-    .n-tabs-nav {
-      padding: 12px 20px 24px;
-      position: relative;
-    }
-
-    .n-tabs-tab {
-      color: #8B8D98;
-      font-size: max(18px, 13Px);
-      padding-top: 12px;
-      padding-bottom: 6px;
-      line-height: 22px;
-
-      &.n-tabs-tab--active {
-        font-weight: 600 !important;
-        color: #131415 !important;
-      }
-    }
-
-    .n-tabs-tab__label {
-      z-index: 10;
-    }
-
-    .n-tabs-bar {
-      height: 10px;
-      background: linear-gradient(90deg, #77BBFF 0%, rgba(163, 231, 255, 0.22) 100%);
-      z-index: 0;
-      bottom: 6px;
-    }
-
-    .n-tab-pane {
-      padding-top: 0 !important;
-    }
-
-    .n-tabs-nav__suffix {
-      padding-left: 0 !important;
-    }
-
-    .n-tabs.n-tabs--top .n-tabs-nav-scroll-wrapper::after {
-      box-shadow: none !important;
-    }
-  }
-
-  .iconScreen {
-    margin-top: 6px;
-    position: absolute;
-    right: 20px;
-    font-size: 18px;
-    color: var(--n-color);
-    font-weight: bold;
-    width: 22px;
-    height: 22px;
-    cursor: pointer;
-  }
-
-  .homerowkTabs {
-    :global {
-      .n-tabs-tab-pad {
-        width: 15px !important;
-      }
-
-      .n-tabs-tab {
-        color: #8B8D98;
-        font-size: max(18px, 13Px);
-      }
-
-      .v-x-scroll {
-        padding-right: 40px;
-      }
-    }
-  }
-
+.related {
+  height: 100%;
+
+  :global {
+    .n-tabs-tab-pad {
+      width: 24px !important;
+    }
+
+    .n-tabs-nav {
+      padding: 12px 20px 20px;
+      position: relative;
+    }
+
+    .n-tabs-tab {
+      color: #8B8D98;
+      font-size: max(18px, 13Px);
+      padding-top: 12px;
+      padding-bottom: 6px;
+      line-height: 22px;
+
+      &.n-tabs-tab--active {
+        font-weight: 600 !important;
+        color: #131415 !important;
+      }
+    }
+
+    .n-tabs-tab__label {
+      z-index: 10;
+    }
+
+    .n-tabs-bar {
+      height: 10px;
+      background: linear-gradient(90deg, #77BBFF 0%, rgba(163, 231, 255, 0.22) 100%);
+      z-index: 0;
+      bottom: 6px;
+    }
+
+    .n-tab-pane {
+      padding-top: 0 !important;
+    }
+
+    .n-tabs-nav__suffix {
+      padding-left: 0 !important;
+    }
+
+    .n-tabs.n-tabs--top .n-tabs-nav-scroll-wrapper::after {
+      box-shadow: none !important;
+    }
+  }
+
+  .iconScreen {
+    margin-top: 6px;
+    position: absolute;
+    right: 20px;
+    font-size: 18px;
+    color: var(--n-color);
+    font-weight: bold;
+    width: 22px;
+    height: 22px;
+    cursor: pointer;
+  }
+
+  .homerowkTabs {
+    :global {
+      .n-tabs-tab-pad {
+        width: 15px !important;
+      }
+
+      .n-tabs-tab {
+        color: #8B8D98;
+        font-size: max(18px, 13Px);
+      }
+
+      .v-x-scroll {
+        padding-right: 40px;
+      }
+    }
+  }
+
 }

+ 61 - 61
src/views/prepare-lessons/components/lesson-main/courseware-presets/select-related/resource-search-group/index.module.less

@@ -1,62 +1,62 @@
-.searchGroup {
-  padding: 0 20px;
-  display: flex;
-
-  .searchSelect2 {
-    width: 100px;
-    margin-right: 12px;
-  }
-
-  .searchSelect {
-    padding: 0 0 20px;
-    display: flex;
-    justify-content: flex-start;
-    gap: 0px 16px;
-  }
-
-  :global {
-
-    .n-base-selection,
-    .n-input {
-      border-radius: 8px;
-      min-height: 40px;
-      height: 40px;
-      font-size: max(15px, 12Px);
-      --n-height: 40px !important;
-    }
-  }
-}
-
-.inputSearch {
-  :global {
-    .n-input-wrapper {
-      padding-left: 12px;
-      padding-right: 4px;
-    }
-  }
-
-  .searchBtn {
-    height: 34px;
-    border-radius: 8px;
-    font-size: 15px;
-    font-weight: 500;
-  }
-}
-
-.btnType {
-  gap: 0px 6px !important;
-
-  :global {
-    .n-button {
-      height: 28px;
-      padding: 0 13px;
-      font-size: 15px;
-      color: rgba(0, 0, 0, .6);
-
-      &.n-button--primary-type {
-        font-weight: bold;
-        color: #fff;
-      }
-    }
-  }
+.searchGroup {
+  padding: 4px 20px 0;
+  display: flex;
+
+  .searchSelect2 {
+    width: 100px;
+    margin-right: 12px;
+  }
+
+  .searchSelect {
+    padding: 0 0 20px;
+    display: flex;
+    justify-content: flex-start;
+    gap: 0px 16px;
+  }
+
+  :global {
+
+    .n-base-selection,
+    .n-input {
+      border-radius: 8px;
+      min-height: 40px;
+      height: 40px;
+      font-size: max(15px, 12Px);
+      --n-height: 40px !important;
+    }
+  }
+}
+
+.inputSearch {
+  :global {
+    .n-input-wrapper {
+      padding-left: 12px;
+      padding-right: 4px;
+    }
+  }
+
+  .searchBtn {
+    height: 34px;
+    border-radius: 8px;
+    font-size: 15px;
+    font-weight: 500;
+  }
+}
+
+.btnType {
+  gap: 0px 6px !important;
+
+  :global {
+    .n-button {
+      height: 28px;
+      padding: 0 13px;
+      font-size: 15px;
+      color: rgba(0, 0, 0, .6);
+
+      &.n-button--primary-type {
+        font-weight: bold;
+        color: #fff;
+      }
+    }
+  }
 }