dev:代码优化，该切计划和业务员

lms/nladmin-ui/src/layout/components/Navbar.vue

@@ -1,31 +1,32 @@
 <template>
   <div class="navbar">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
-    <breadcrumb v-if="!topNav" id="breadcrumb-container" class="breadcrumb-container" />
-    <top-nav v-if="topNav" id="topmenu-container" class="topmenu-container" />
+    <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
+    <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
 
     <div class="right-menu">
       <template v-if="device!=='mobile'">
         <search id="header-search" class="right-menu-item" />
 
         <!--        <el-tooltip content="项目文档" effect="dark" placement="bottom">
-          <Doc class="right-menu-item hover-effect" />
-        </el-tooltip>-->
+                  <Doc class="right-menu-item hover-effect" />
+                </el-tooltip>-->
 
         <el-tooltip content="全屏缩放" effect="dark" placement="bottom">
           <screenfull id="screenfull" class="right-menu-item hover-effect" />
         </el-tooltip>
+        <notice-icon class="right-menu-item"/>
+        <notice-icon-reader ref="noticeIconReader"/>
 
         <!--        <el-tooltip content="布局设置" effect="dark" placement="bottom">
-          <size-select id="size-select" class="right-menu-item hover-effect" />
-        </el-tooltip>-->
+                  <size-select id="size-select" class="right-menu-item hover-effect" />
+                </el-tooltip>-->
 
       </template>
       <img :src="Avatar" class="user-avatar">
       <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="hover">
         <div class="avatar-wrapper">
-          <!--          <img :src="Avatar" class="user-avatar" style="border: #f5141e 1px solid">-->
-          <span class="user-nickname">{{ user.personName }}</span>
+          <span class="user-nickname">{{ user.person_name }}</span>
         </div>
         <el-dropdown-menu slot="dropdown">
           <span style="display:block;" @click="show = true">
@@ -60,9 +61,13 @@ import Screenfull from '@/components/Screenfull'
 import SizeSelect from '@/components/SizeSelect'
 import Search from '@/components/HeaderSearch'
 import Avatar from '@/assets/images/avatar.png'
+import NoticeIcon from '@/views/system/notice/NoticeIcon.vue'
+import NoticeIconReader from '@/views/system/notice/NoticeIconReader.vue'
 
 export default {
   components: {
+    NoticeIconReader,
+    NoticeIcon,
     Breadcrumb,
     Hamburger,
     Screenfull,
@@ -71,6 +76,9 @@ export default {
     Doc,
     TopNav
   },
+  created() {
+    this.initWebSocket()
+  },
   data() {
     return {
       Avatar: Avatar,
@@ -118,6 +126,43 @@ export default {
       this.$store.dispatch('LogOut').then(() => {
         location.reload()
       })
+    },
+    initWebSocket() {
+      if (typeof (WebSocket) === 'undefined') {
+        this.$notify({
+          title: '提示',
+          message: '当前浏览器无法接收实时报警信息，请使用谷歌浏览器！',
+          type: 'warning',
+          duration: 0
+        })
+      }
+      // const wsUri = (process.env.VUE_APP_WS_API === '/' ? '/' : (process.env.VUE_APP_WS_API + '/')) + 'messageInfo'
+      const wsUri = window.g.prod.VUE_APP_BASE_API.replace('http', 'ws') + '/webSocket/' + 'messageInfo'
+      this.websock = new WebSocket(wsUri)
+      this.websock.onerror = this.webSocketOnError
+      this.websock.onmessage = this.webSocketOnMessage
+    },
+    webSocketOnError(e) {
+      this.$notify({
+        title: 'WebSocket连接发生错误',
+        type: 'error',
+        duration: 0
+      })
+    },
+    webSocketOnMessage(e) {
+      const data = JSON.parse(e.data)
+      if (data.msgType === 'INFO') {
+        console.log('data', data)
+        this.$bus.emit(data.msg.data, data.msg.msgType)
+      } else if (data.msgType === 'ERROR') {
+        this.$notify({
+          title: '',
+          message: data.msg,
+          dangerouslyUseHTMLString: true,
+          type: 'error',
+          duration: 0
+        })
+      }
     }
   }
 }

lms/nladmin-ui/src/layout/components/Sidebar/Logo.vue

@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import Logo from '@/assets/images/logo.png'
+import Logo from '@/assets/images/noblelift.png'
 import variables from '@/assets/styles/variables.scss'
 export default {
   name: 'SidebarLogo',