Merge branch 'iteration-20240506' into jenkins

src/views/homework-record/index.module.less

@@ -160,6 +160,10 @@
   }
 }
 
+.theTooltip {
+  max-width: 650px !important;
+}
+
 .item {
   cursor: pointer;
   background: #F7F9FF;

src/views/homework-record/index.tsx

@@ -10,6 +10,7 @@ import {
   NModal,
   NSpace,
   NSpin,
+  NTooltip,
   useMessage
 } from 'naive-ui';
 import SearchInput from '@/components/searchInput';
@@ -154,7 +155,7 @@ export default defineComponent({
               if (child.trainingType === 'PRACTICE' && child.musicName) {
                 pTitle += pTitle
                   ? '《' + child.musicName + '》'
-                  : '练习曲目《' + child.musicName + '》';
+                  : '练习曲目:《' + child.musicName + '》';
 
                 if (trainingContent) {
                   const tempList = [
@@ -168,7 +169,7 @@ export default defineComponent({
               if (child.trainingType === 'EVALUATION' && child.musicName) {
                 eTitle += eTitle
                   ? '《' + child.musicName + '》'
-                  : '评测曲目《' + child.musicName + '》';
+                  : '评测曲目:《' + child.musicName + '》';
 
                 if (trainingContent) {
                   const tempList = [
@@ -553,23 +554,51 @@ export default defineComponent({
                         <span class={styles.title}>作业内容：</span>
                         <div class={styles.pSection}>
                           {item.pTitle && (
-                            <p class={[styles.text, styles.p1]}>
-                              {/* {item.pTitle} */}
-                              <TheTooltip
-                                maxWidth={500}
-                                content={item.pTitle}
-                                style={{ maxWidth: '100% !important' }}
-                              />
-                            </p>
+                            <NTooltip
+                              trigger="hover"
+                              class={styles.theTooltip}
+                              delay={500}>
+                              {{
+                                trigger: () => (
+                                  <p
+                                    class={[
+                                      styles.text,
+                                      styles.p1,
+                                      styles.theTooltip
+                                    ]}>
+                                    {item.pTitle}
+                                  </p>
+                                ),
+                                default: () => item.pTitle
+                              }}
+                            </NTooltip>
                           )}
                           {item.eTitle && (
-                            <p class={[styles.text, styles.p2]}>
-                              <TheTooltip
-                                maxWidth={500}
-                                content={item.eTitle}
-                                style={{ maxWidth: '100% !important' }}
-                              />
-                            </p>
+                            // <p class={[styles.text, styles.p2]}>
+                            //   <TheTooltip
+                            //     maxWidth={500}
+                            //     content={item.eTitle}
+                            //     style={{ maxWidth: '100% !important' }}
+                            //   />
+                            // </p>
+                            <NTooltip
+                              trigger="hover"
+                              class={styles.theTooltip}
+                              delay={500}>
+                              {{
+                                trigger: () => (
+                                  <p
+                                    class={[
+                                      styles.text,
+                                      styles.p2,
+                                      styles.theTooltip
+                                    ]}>
+                                    {item.pTitle}
+                                  </p>
+                                ),
+                                default: () => item.pTitle
+                              }}
+                            </NTooltip>
                           )}
                         </div>
                       </div>

src/views/prepare-lessons/components/lesson-main/courseware-presets/index.tsx

@@ -401,12 +401,13 @@ export default defineComponent({
       }
     };
 
-    const selectChildObj = (item: any, index: number) => {
+    const selectChildObj = (item: any) => {
       const obj: any = {};
       item?.forEach((child: any) => {
         if (child.id === forms.wikiCategoryIdChild) {
           obj.selected = true;
           obj.name = child.name;
+          obj.label = child.name;
         }
       });
       return obj;
@@ -521,11 +522,10 @@ export default defineComponent({
                         <span
                           class={[
                             styles.textBtn,
-                            selectChildObj(item.instruments, index).selected &&
+                            selectChildObj(item.instruments).selected &&
                               styles.textBtnActive
                           ]}>
-                          {selectChildObj(item.instruments, index).label ||
-                            item.label}
+                          {selectChildObj(item.instruments).label || item.label}
                           <i class={styles.iconArrow}></i>
                         </span>
                       </NPopselect>

src/views/setting/components/schoolInfo/index.tsx

@@ -128,13 +128,26 @@ export default defineComponent({
               </NButton>
 
               {row.status === 'ACTIVATION' ? (
-                <NButton
-                  disabled={row.jobType === 'ADMIN'}
-                  type="primary"
-                  text
-                  onClick={() => handleChange(row)}>
-                  冻结
-                </NButton>
+                <>
+                  <NButton
+                    disabled={row.jobType === 'ADMIN'}
+                    type="primary"
+                    text
+                    onClick={() => handleChange(row)}>
+                    冻结
+                  </NButton>
+                  {row.jobType === 'TEACHER' && (
+                    <NButton
+                      type="primary"
+                      text
+                      onClick={() => {
+                        data.changeVisiable = true;
+                        data.activeRow = row;
+                      }}>
+                      转交管理
+                    </NButton>
+                  )}
+                </>
               ) : (
                 <NButton
                   class={styles.errorBtn}
@@ -143,18 +156,6 @@ export default defineComponent({
                   解冻
                 </NButton>
               )}
-
-              {row.jobType === 'TEACHER' && (
-                <NButton
-                  type="primary"
-                  text
-                  onClick={() => {
-                    data.changeVisiable = true;
-                    data.activeRow = row;
-                  }}>
-                  转交管理
-                </NButton>
-              )}
             </NSpace>
           )
         }