From 391eec3114a17e68652434c6eae610799d80290e Mon Sep 17 00:00:00 2001
From: ludc <ludc@vci-tech.com>
Date: 星期四, 16 一月 2025 11:13:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/page/index/top/index.vue | 150 ++++++++++++++-----------------------------------
1 files changed, 44 insertions(+), 106 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/page/index/top/index.vue b/Source/plt-web/plt-web-ui/src/page/index/top/index.vue
index 49677d6..ad400a3 100644
--- a/Source/plt-web/plt-web-ui/src/page/index/top/index.vue
+++ b/Source/plt-web/plt-web-ui/src/page/index/top/index.vue
@@ -4,8 +4,7 @@
<div v-if="showCollapse"
:class="[{ 'avue-breadcrumb--active': isCollapse }]"
class="avue-breadcrumb">
- <i class="icon-navicon"
- @click="setCollapse"></i>
+ <i class="icon-navicon" @click="setCollapse"></i>
</div>
</div>
<div class="top-bar__title">
@@ -27,14 +26,15 @@
<top-color></top-color>
</div>
</el-tooltip>
- <el-tooltip v-if="showDebug"
- :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"
- effect="dark"
- placement="bottom">
- <div class="top-bar__item">
- <top-logs></top-logs>
- </div>
- </el-tooltip>
+ <!-- 閿欒鏃ュ織-->
+ <!-- <el-tooltip v-if="showDebug"-->
+ <!-- :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"-->
+ <!-- effect="dark"-->
+ <!-- placement="bottom">-->
+ <!-- <div class="top-bar__item">-->
+ <!-- <top-logs></top-logs>-->
+ <!-- </div>-->
+ <!-- </el-tooltip>-->
<el-tooltip v-if="showLock"
:content="$t('navbar.lock')"
effect="dark"
@@ -51,13 +51,14 @@
<top-theme></top-theme>
</div>
</el-tooltip>
- <el-tooltip :content="$t('navbar.notice')"
- effect="dark"
- placement="bottom">
- <div class="top-bar__item top-bar__item--show">
- <top-notice></top-notice>
- </div>
- </el-tooltip>
+ <!-- 娑堟伅閫氱煡-->
+ <!-- <el-tooltip :content="$t('navbar.notice')"-->
+ <!-- effect="dark"-->
+ <!-- placement="bottom">-->
+ <!-- <div class="top-bar__item top-bar__item--show">-->
+ <!-- <top-notice></top-notice>-->
+ <!-- </div>-->
+ <!-- </el-tooltip>-->
<el-tooltip :content="$t('navbar.language')"
effect="dark"
placement="bottom">
@@ -74,29 +75,22 @@
@click="handleScreen"></i>
</div>
</el-tooltip>
- <img :src="userInfo.avatar"
- class="top-bar__img">
- <el-dropdown>
- <span class="el-dropdown-link">
+ <el-tooltip content="涓汉淇℃伅">
+ <div>
+ <img :src="avatar"
+ class="top-bar__img"
+ @click="gotoInfo">
+ </div>
+ </el-tooltip>
+
+ <el-tooltip content="閫�鍑虹櫥褰�">
+ <div>
+ <span style="font-size: 16px" @click="logout">
{{ userInfo.userName }}
- <i class="el-icon-arrow-down el-icon--right"></i>
</span>
- <el-dropdown-menu slot="dropdown">
- <el-dropdown-item>
- <router-link to="/">{{ $t('navbar.dashboard') }}</router-link>
- </el-dropdown-item>
- <el-dropdown-item @click.native="changePasswordHandler">
- <!-- <router-link to="/info/index">{{ $t('navbar.userinfo') }}</router-link>-->
- 淇敼瀵嗙爜
- </el-dropdown-item>
- <el-dropdown-item v-if="this.website.switchMode" @click.native="switchDept"
- >{{ $t('navbar.switchDept') }}
- </el-dropdown-item>
- <el-dropdown-item divided
- @click.native="logout">{{ $t('navbar.logOut') }}
- </el-dropdown-item>
- </el-dropdown-menu>
- </el-dropdown>
+ </div>
+ </el-tooltip>
+
<el-dialog :visible.sync="userBox"
append-to-body
title="鐢ㄦ埛淇℃伅閫夋嫨"
@@ -104,21 +98,11 @@
<avue-form ref="form" v-model="userForm" :option="userOption" @submit="submitSwitch"/>
</el-dialog>
- <!-- 淇敼瀵嗙爜瀵硅瘽妗� -->
- <el-dialog
- v-dialogDrag
- :visible.sync="passwordVisible"
- append-to-body="true"
- class="avue-dialog"
- title="淇敼瀵嗙爜"
- width="50%">
- <avue-form ref="form" v-model="passwordForm" :option="passwordOption" @submit="submitSwitch"/>
- </el-dialog>
</div>
</div>
</template>
<script>
-import {resetRouter} from '@/router/router'
+import {resetRouter} from '../../../router/router'
import {mapGetters, mapState} from "vuex";
import {fullscreenToggel, listenfullscreen} from "@/util/util";
import topLock from "./top-lock";
@@ -144,52 +128,6 @@
name: "top",
data() {
return {
- passwordVisible: false,
- passwordForm: {},
- passwordOption: {
- submitText:'淇濆瓨',
- column: [
- {
- label: '鐧婚檰瀵嗙爜',
- prop: 'input',
- span: 24,
- labelWidth:"15%",
- rules: [
- {
- required: true,
- message: '璇疯緭鍏ョ櫥闄嗗瘑鐮�',
- trigger: 'blur'
- }
- ]
- },
- {
- label: '鏂扮櫥闄嗗瘑鐮�',
- prop: 'input1',
- span: 24,
- labelWidth:"15%",
- rules: [
- {
- required: true,
- message: '璇疯緭鍏ユ柊鐧婚檰瀵嗙爜',
- trigger: 'blur'
- }
- ]
- },
- {
- label: '鏂板瘑鐮佺櫥闄嗙‘璁�',
- prop: 'input2',
- span: 24,
- labelWidth:"15%",
- rules: [
- {
- required: true,
- message: '璇风‘璁ょ櫥闄嗗瘑鐮�',
- trigger: 'blur'
- }
- ]
- }
- ]
- },
userBox: false,
userForm: {
deptId: '',
@@ -246,6 +184,9 @@
listenfullscreen(this.setScreen);
},
computed: {
+ avatar(){
+ return this.userInfo.avatar
+ },
...mapState({
showDebug: state => state.common.showDebug,
showTheme: state => state.common.showTheme,
@@ -268,11 +209,6 @@
])
},
methods: {
- // 淇敼瀵嗙爜
- changePasswordHandler() {
- console.log('123');
- this.passwordVisible = true;
- },
handleScreen() {
fullscreenToggel();
},
@@ -281,6 +217,9 @@
},
setScreen() {
this.$store.commit("SET_FULLSCREN");
+ },
+ gotoInfo() {
+ this.$router.push({path: '/info'});
},
switchDept() {
const userId = this.userInfo.user_id;
@@ -292,13 +231,12 @@
roleColumn.display = true;
this.userBox = true;
},
- submitSwitch(form, done) {
- this.$store.dispatch("refreshToken", form).then(() => {
- this.userBox = false;
- this.$router.push({path: "/"});
- })
- done();
+
+ // 鍏抽棴淇敼瀵嗙爜瀵硅瘽妗�
+ passwordClose() {
+ this.$refs.form.resetFields();
},
+
logout() {
this.$confirm(this.$t("logoutTip"), this.$t("tip"), {
confirmButtonText: this.$t("submitText"),
--
Gitblit v1.9.3