From 3fce634eeb56f9425d5e745b1d4333da962fc3d7 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期五, 25 八月 2023 11:19:10 +0800
Subject: [PATCH] 1.新增功能菜单

---
 src/layout/components/Navbar.vue |   70 +++++++++++++++++++++++++++--------
 1 files changed, 54 insertions(+), 16 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 88cc92e..3b02761 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -71,8 +71,36 @@
             </el-badge>
           </el-tooltip>
 
-          <div style=" font-size: 18px;font-family: 'Microsoft YaHei';color:#AAAAAA;padding:0 8px;cursor: pointer">
+          <div style=" font-size: 18px;font-family: 'Microsoft YaHei';color:#AAAAAA;cursor: pointer;margin-right:5px">
             {{ stu_torgname }}
+
+            <!--            <el-dropdown v-if="stu_torgname.toString().length>0" class="avatar-container" trigger="hover">-->
+            <!--              <div class="avatar-wrapper">-->
+            <!--                <div style="display: flex;align-items: center;margin-top: -5px">-->
+
+            <!--                  <i class="el-icon-office-building" style="font-weight: bolder;font-size: 18px;margin-right: 5px;color:#A7A7A7" />-->
+            <!--                  <div style=" font-size: 18px;font-family: 'Microsoft YaHei';color:#AAAAAA">{{ stu_torgname }}</div>-->
+            <!--                </div>-->
+
+            <!--              </div>-->
+            <!--              <el-dropdown-menu-->
+            <!--                v-if="stu_torgname.toString().length>0"-->
+            <!--                slot="dropdown"-->
+            <!--                class="user-dropdown"-->
+            <!--                style="text-align: center"-->
+            <!--              >-->
+            <!--                <el-dropdown-item-->
+            <!--                  v-for="(item,index) in $stu_torg"-->
+            <!--                  :key="item.torg_code"-->
+            <!--                  :divided="index!==0"-->
+            <!--                >-->
+            <!--                  &lt;!&ndash;                  @click.native="changeTrog(item)"&ndash;&gt;-->
+            <!--                  <span style="display:block;">{{ item.torg_name }}</span>-->
+            <!--                </el-dropdown-item>-->
+
+            <!--              </el-dropdown-menu>-->
+            <!--            </el-dropdown>-->
+
           </div>
           <!--        <el-tooltip content="Global Size" effect="dark" placement="bottom">-->
           <!--          <size-select id="size-select" class="right-menu-item hover-effect" />-->
@@ -164,7 +192,7 @@
 import MenuItemEx from './Sidebar/MenuItemEx'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
-import { getCookie } from '@/utils/auth'
+import { getCookie, setCookie } from '@/utils/auth'
 import { UpdateUserPassword } from '@/api/user'
 import Search from '@/components/HeaderSearch'
 import Screenfull from '@/components/Screenfull'
@@ -172,6 +200,9 @@
 import RightPanel from '@/components/RightPanel'
 import Settings from '../components/Settings/index'
 import * as signalR from '@aspnet/signalr'
+import { ButtonData } from '@/api/basicSettings'
+import Vue from 'vue'
+import store from '@/store'
 
 export default {
   components: {
@@ -209,8 +240,8 @@
       }
     }
     return {
-      usercode: '',
-      username: '',
+      usercode: localStorage.getItem('usercode'),
+      username: localStorage.getItem('username'),
       form: {
         password: '',
         newpassword: ''
@@ -224,7 +255,7 @@
           { required: true, validator: validatePassword2, trigger: ['blur', 'change'] }
         ]
       },
-      stu_torgname: '',
+      stu_torgname: localStorage.getItem('torg_name'),
       show: false,
       signalr: null
     }
@@ -234,12 +265,11 @@
   ],
   created() {
     // this.$signalr.start()
-    this.usercode = getCookie('navTabId')
-    this.username = getCookie('username')
-    this.stu_torgname = getCookie('stu_torgname') === '' ? '绯荤粺绠＄悊鍛�' : getCookie('stu_torgname')
+    // Vue.prototype.$ButtonData = JSON.parse(localStorage.getItem('ButtonData'))
   },
   mounted() {
-    this.getHubConnectionBuilder()
+    // this.getHubConnectionBuilder()
+
   },
   computed: {
     ...mapGetters([
@@ -271,6 +301,16 @@
     }
   },
   methods: {
+    // changeTrog(val) {
+    //   if (val.torg_name !== this.stu_torgname) {
+    //     this.stu_torgname = val.torg_name
+    //     localStorage.setItem('torg_code', val.torg_code)
+    //     localStorage.setItem('torg_name', val.torg_name)
+    //
+    //     store.dispatch('user/getMenu')
+    //     // this.$store.state.tagsView.visitedViews = this.$store.state.tagsView.visitedViews.filter(i => i.title === '绯荤粺棣栭〉')
+    //   }
+    // },
     // 寤虹珛hub杩炴帴
     async getHubConnectionBuilder() {
       const url = 'http://121.196.36.24:8019/chatHub'
@@ -332,11 +372,11 @@
       this.$store.dispatch('app/toggleSideBar')
     },
     async logout() {
-      localStorage.removeItem('token')
-      await this.signalr.stop()
-      this.signalr.off('SendCustomUserMessage')
+      // await this.signalr.stop()
+      // this.signalr.off('SendCustomUserMessage')
       await this.$store.dispatch('user/logout')
-      this.$message.success('閫�鍑烘垚鍔燂紒')
+      localStorage.removeItem('token')
+      this.$notify.success('閫�鍑烘垚鍔燂紒')
       this.$router.push(`/login`)
     },
     editPassword() {
@@ -349,14 +389,12 @@
       this.$refs.dialogForm.validate(valid => {
         if (valid) {
           const data = {
-            usercode: this.usercode,
-            username: this.username,
             password: this.form.password,
             newpassword: this.form.newpassword
           }
           UpdateUserPassword(data).then(res => {
             if (res.code === '200') {
-              this.$message.success('淇敼鎴愬姛锛�')
+              this.$notify.success('淇敼鎴愬姛锛�')
               this.dialogVisible = false
             }
           })

--
Gitblit v1.9.3