lex 1 год назад
Родитель
Сommit
52d2220d1e

BIN
src/school/train-planning/images/icon-orchestra.png


+ 33 - 0
src/school/train-planning/modal/practice-class/index.module.less

@@ -51,6 +51,10 @@
     display: flex;
     align-items: center;
 
+    .maxWidth2 {
+      max-width: 200px;
+    }
+
     .maxWidth {
       max-width: 120px;
     }
@@ -87,6 +91,10 @@
     color: #777777;
     line-height: 17px;
     max-width: 200px;
+
+    .maxWidth {
+      max-width: 120px;
+    }
   }
 
   .title {
@@ -138,3 +146,28 @@
   border-radius: 10px;
   overflow: hidden;
 }
+
+.orchestraInfo {
+  display: flex;
+  align-items: center;
+  background: #F6F6F6;
+  border-radius: 13px;
+  padding: 6px 8px;
+  margin: 0 15px 12px;
+
+  .iconOrchestra {
+    flex-shrink: 0;
+    width: 15px;
+    height: 15px;
+    background: url('../../images/icon-orchestra.png') no-repeat;
+    background-size: contain;
+    margin-right: 4px;
+  }
+
+  .orchestran {
+    font-size: 12px;
+    color: #777777;
+    line-height: 17px;
+    max-width: 300px;
+  }
+}

+ 21 - 4
src/school/train-planning/modal/practice-class/index.tsx

@@ -208,7 +208,11 @@ export default defineComponent({
                       title: () => (
                         <div class={styles.content}>
                           <div class={styles.teacherName}>
-                            {item.teacherName ? (
+                            <div class={[styles.name, styles.maxWidth2, 'van-ellipsis']}>
+                              {item.name}
+                            </div>
+
+                            {/* {item.teacherName ? (
                               <div class={[styles.name, styles.maxWidth, 'van-ellipsis']}>
                                 {item.teacherName}
                               </div>
@@ -216,11 +220,19 @@ export default defineComponent({
                               <div class={[styles.name, 'van-ellipsis']} style={{ color: 'red' }}>
                                 暂未设置伴学老师
                               </div>
-                            )}
-                            <Tag type="primary">{item.name}</Tag>
+                            )} */}
+                            {/* <Tag type="primary">{item.name}</Tag> */}
                           </div>
                           <div class={[styles.orchestraName, 'van-ellipsis']}>
-                            {item.orchestraName}
+                            {item.teacherName ? (
+                              <div class={[styles.maxWidth, 'van-ellipsis']}>
+                                {item.teacherName}
+                              </div>
+                            ) : (
+                              <div class={['van-ellipsis']} style={{ color: 'red' }}>
+                                暂未设置伴学老师
+                              </div>
+                            )}
                           </div>
                         </div>
                       ),
@@ -252,6 +264,11 @@ export default defineComponent({
                       <p class={styles.name}>总课时</p>
                     </GridItem>
                   </Grid>
+
+                  <div class={styles.orchestraInfo}>
+                    <i class={styles.iconOrchestra}></i>
+                    <p class={[styles.orchestran, 'van-ellipsis']}>{item.orchestraName}</p>
+                  </div>
                 </CellGroup>
               ))}
             </CheckboxGroup>