更新

src/components/layout/layoutTop.tsx

@@ -4,12 +4,8 @@ import {
   onMounted,
   nextTick,
   onUnmounted,
-<<<<<<< HEAD
-  reactive
-=======
   reactive,
   computed
->>>>>>> e68448baeccfde14389272046acf029ff561a578
 } from 'vue';
 import styles from './index.module.less';
 import { NImage, NBadge, NPopover, NIcon, NModal, NTooltip } from 'naive-ui';
@@ -231,7 +227,7 @@ export default defineComponent({
             </p>
           </div>
           <div class={styles.layoutRight}>
-            {/* <NTooltip showArrow={false}>
+            <NTooltip showArrow={false}>
               {{
                 trigger: () => (
                   <div
@@ -265,11 +261,7 @@ export default defineComponent({
                 ),
                 default: '邀请学生'
               }}
-<<<<<<< HEAD
-            </NTooltip>*/}
-=======
             </NTooltip>
->>>>>>> e68448baeccfde14389272046acf029ff561a578
             <NPopover
               width={380}
               class={styles.popoverClassModel}
@@ -487,22 +479,17 @@ export default defineComponent({
               }></SuggestionOption>
           </NModal>
 
-<<<<<<< HEAD
-          {/* {state.addStudentVisible ? (
-            <div v-model:show={state.addStudentVisible} class={['n-modal-mask', styles.popBox]}>
-=======
           {state.addStudentVisible ? (
             <div
               v-model:show={state.addStudentVisible}
               class={['n-modal-mask', styles.popBox]}>
->>>>>>> e68448baeccfde14389272046acf029ff561a578
               <AddStudentModel
                 activeRow={state.activeRow}
                 onClose={() => {
                   state.addStudentVisible = false;
                 }}></AddStudentModel>
             </div>
-          ) : null} */}
+          ) : null}
         </div>
       </>
     );