Merge branch 'dev_lyj' into dev

src/layouts/components/NavBar/index.vue

@@ -8,25 +8,16 @@
       <error-log></error-log>
       <!-- <avatar></avatar> -->
       <div class="fontSelect">
-        <div
-          v-for="(item, index) in fontList"
-          :key="index"
-          class="font"
-          @click="changeFont(index)"
-        >
+        <div v-for="(item, index) in fontList" :key="index" class="font" @click="changeFont(index)">
           <div class="label">{{ item.label }}</div>
         </div>
       </div>
-      <div
-        v-show="curSelectedIndex != -1"
-        class="community"
-        @click="openModalFlag"
-      >
+      <div v-show="curSelectedIndex != -1" class="community" @click="openModalFlag">
         <img src="~@/assets/img/DataCenter/shift.png" alt />
         {{
         curSelectedIndex != -1
-            ? screeningList[curSelectedIndex - 1].title
-            : ""
+        ? screeningList[curSelectedIndex - 1] ? screeningList[curSelectedIndex - 1].title
+        : "" :''
         }}
       </div>
 
@@ -34,17 +25,8 @@
         <img src="~@/assets/img/DataCenter/user.png" alt />
         <avatar></avatar>
       </div>
-      <el-popover
-        placement="top-start"
-        width="200"
-        trigger="click"
-        popper-class="message-pop"
-      >
-        <div
-          v-for="(item, index) in messageList"
-          :key="index"
-          class="message-box mb-24"
-        >
+      <el-popover placement="top-start" width="200" trigger="click" popper-class="message-pop">
+        <div v-for="(item, index) in messageList" :key="index" class="message-box mb-24">
           <div class="top-box mb-12">
             <span class="blue-dot mt-5 mr-8"></span>
             <span class="top-text">{{ item.date }}</span>