From 6657951e23782b3fd90cd283cbb895b8a775353a Mon Sep 17 00:00:00 2001 From: 田源 <lastanimals@163.com> Date: 星期二, 17 十月 2023 15:41:04 +0800 Subject: [PATCH] 整合代码 --- Source/UBCS-WEB/src/page/index/top/index.vue | 9 +++++++++ Source/UBCS-WEB/src/api/system/dept.js | 10 ++++++++++ Source/UBCS-WEB/src/views/system/user.vue | 5 ++++- 3 files changed, 23 insertions(+), 1 deletions(-) diff --git a/Source/UBCS-WEB/src/api/system/dept.js b/Source/UBCS-WEB/src/api/system/dept.js index 9f41441..09197b4 100644 --- a/Source/UBCS-WEB/src/api/system/dept.js +++ b/Source/UBCS-WEB/src/api/system/dept.js @@ -81,3 +81,13 @@ }) } +export const updateUserStatus = (params) => { + return request({ + url: '/api/ubcs-user/user/updateUserStatus ', + method: 'get', + params:{ + ...params + } + }) +} + diff --git a/Source/UBCS-WEB/src/page/index/top/index.vue b/Source/UBCS-WEB/src/page/index/top/index.vue index 443db48..f445e17 100644 --- a/Source/UBCS-WEB/src/page/index/top/index.vue +++ b/Source/UBCS-WEB/src/page/index/top/index.vue @@ -18,7 +18,11 @@ <top-search></top-search> </span> </div> + <div></div> <div class="top-bar__right"> + <el-tooltip style="margin-right: 35px"> + <p style="font-size: 20px;line-height: 20px">鏈郴缁熶负闈炴秹瀵嗗簲鐢ㄧ郴缁燂紝绂佹澶勭悊銆佸瓨鍌ㄣ�佷紶杈撴秹瀵嗕俊鎭�</p> + </el-tooltip> <el-tooltip v-if="showColor" effect="dark" :content="$t('navbar.color')" @@ -101,6 +105,9 @@ </el-dropdown-item> </el-dropdown-menu> </el-dropdown> + <el-tooltip effect="dark" style="margin-left: 15px"> + <p style="font-size: 16px">褰撳墠鐧诲綍鐢ㄦ埛锛歿{storedUsername}}</p> + </el-tooltip> <el-dialog title="鐢ㄦ埛淇℃伅閫夋嫨" append-to-body :visible.sync="userBox" @@ -137,6 +144,7 @@ name: "top", data() { return { + storedUsername: '', userBox: false, userForm: { deptId: '', @@ -191,6 +199,7 @@ }, mounted() { listenfullscreen(this.setScreen); + this.storedUsername = localStorage.getItem('username'); }, computed: { ...mapState({ diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue index 24ba2e6..c2adc42 100644 --- a/Source/UBCS-WEB/src/views/system/user.vue +++ b/Source/UBCS-WEB/src/views/system/user.vue @@ -177,7 +177,7 @@ resetPassword, unlock } from "@/api/system/user"; import {exportBlob} from "@/api/common"; -import {getDeptTree, getDeptLazyTree} from "@/api/system/dept"; +import {getDeptTree, getDeptLazyTree, updateUserStatus} from "@/api/system/dept"; import {getRoleTree} from "@/api/system/role"; import {getPostList} from "@/api/system/post"; import {mapGetters} from "vuex"; @@ -742,6 +742,9 @@ } }, created() { + updateUserStatus({userid:'1702600796324032513',status:'true'}).then(res=>{ + console.log(res) + }) this.selecload() const arr=JSON.parse(localStorage.getItem("updataid")) if(arr.user_id != '0' && arr.tenant_id !== '000000'){ -- Gitblit v1.9.3