Merge branch 'iteration-0906' into 0906online

src/components/layout/layoutTop.tsx

@@ -13,8 +13,8 @@ import { useUserStore } from '@/store/modules/users';
 import inFront from './images/inFront.png';
 import inBack from './images/inBack.png';
 import submitBtn from './images/submitBtn.png';
-import sealing from './images/sealing.png'
-import boxBg from './images/boxBg.png'
+import sealing from './images/sealing.png';
+import boxBg from './images/boxBg.png';
 import { useRouter } from 'vue-router';
 import { storeToRefs } from 'pinia';
 import opinionIcon from './images/opinionIcon.png';
@@ -41,7 +41,7 @@ export default defineComponent({
     const gotoSchool = () => {
       router.push({ path: '/setting', query: { activeTab: 'school' } });
     };
-    const suggestionOptionRef = ref()
+    const suggestionOptionRef = ref();
     const resetPwd = () => {
       showWord.value = true;
     };
@@ -50,16 +50,15 @@ export default defineComponent({
       body.className = 'myBody body';
     }
 
-    const showOption = ()=>{
-      showSuggestionViseble.value = true
-      if(suggestionOptionRef.value){
-        suggestionOptionRef.value.onReset()
+    const showOption = () => {
+      showSuggestionViseble.value = true;
+      if (suggestionOptionRef.value) {
+        suggestionOptionRef.value.onReset();
       }
-      console.log(suggestionOptionRef.value,'suggestionOptionRef')
-    }
+      console.log(suggestionOptionRef.value, 'suggestionOptionRef');
+    };
 
     onMounted(() => {
-
       window.addEventListener('message', onImMessage);
       showImGroup.value = true;
 
@@ -99,16 +98,13 @@ export default defineComponent({
             <p>
               {/* {info.value.schoolInfos[0].tenantName} |{' '} */}
               {info.value?.schoolInfos[0]?.name || ''}
-              {'23:11'}
             </p>
           </div>
           <div class={styles.layoutRight}>
             <NTooltip>
               {{
                 trigger: () => (
-                  <div
-                    class={styles.optons}
-                    onClick={showOption}>
+                  <div class={styles.optons} onClick={showOption}>
                     <NImage src={opinionIcon} previewDisabled></NImage>
                   </div>
                 ),
@@ -264,10 +260,10 @@ export default defineComponent({
           <NModal
             class={['modalTitle', 'background', styles.suggestWrap]}
             v-model:show={showSuggestionViseble.value}
-            display-directive='show'
+            display-directive="show"
             showIcon={false}>
             <SuggestionOption
-            ref={suggestionOptionRef}
+              ref={suggestionOptionRef}
               onClose={() =>
                 (showSuggestionViseble.value = false)
               }></SuggestionOption>