From 996ba897101bbc959e035983c44d0bd4c5559fbb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 20 三月 2024 17:03:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/layout/components/Navbar.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 49 insertions(+), 8 deletions(-)
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index c79a894..a122c07 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -1,12 +1,17 @@
<template>
<div class="navbar">
- <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container" @toggleClick="toggleSideBar" />
+ <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
+ @toggleClick="toggleSideBar" />
- <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav"/>
- <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav"/>
+ <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'">
+
+
+
+
+ <template v-if="device !== 'mobile'">
<screenfull id="screenfull" class="right-menu-item hover-effect" />
<el-tooltip content="甯冨眬澶у皬" effect="dark" placement="bottom">
<size-select id="size-select" class="right-menu-item hover-effect" />
@@ -31,6 +36,17 @@
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
+
+ </div>
+ <div class="test-container">
+ <el-button-group style="vertical-align: text-bottom;">
+ <el-button @click="exchange(100)">鐪佸巺瑙掕壊</el-button>
+ <el-button @click="exchange(103)">鍖哄幙瑙掕壊</el-button>
+ <el-button @click="exchange(2)">杩愮淮瑙掕壊</el-button>
+ </el-button-group>
+ </div>
+ <div class="button-container">
+ <el-button type="primary" @click="toScreen">鍙鍖栧ぇ灞�</el-button>
</div>
</div>
</template>
@@ -45,7 +61,7 @@
import Search from '@/components/HeaderSearch'
import RuoYiGit from '@/components/RuoYi/Git'
import RuoYiDoc from '@/components/RuoYi/Doc'
-
+import { exchangeRole } from "@/api/system/role";
export default {
components: {
Breadcrumb,
@@ -81,6 +97,11 @@
}
},
methods: {
+ exchange(roleId) {
+ exchangeRole(roleId).then(response => {
+ this.$modal.msgSuccess("淇敼鎴愬姛");
+ }).catch(() => { });
+ },
toggleSideBar() {
this.$store.dispatch('app/toggleSideBar')
},
@@ -93,7 +114,13 @@
this.$store.dispatch('LogOut').then(() => {
location.href = '/index';
})
- }).catch(() => {});
+ }).catch(() => { });
+ },
+
+ toScreen() {
+ this.$router.push({
+ path: '/screen'
+ })
}
}
}
@@ -105,7 +132,7 @@
overflow: hidden;
position: relative;
background: #fff;
- box-shadow: 0 1px 4px rgba(0,21,41,.08);
+ box-shadow: 0 1px 4px rgba(0, 21, 41, .08);
.hamburger-container {
line-height: 46px;
@@ -113,7 +140,7 @@
float: left;
cursor: pointer;
transition: background .3s;
- -webkit-tap-highlight-color:transparent;
+ -webkit-tap-highlight-color: transparent;
&:hover {
background: rgba(0, 0, 0, .025)
@@ -186,4 +213,18 @@
}
}
}
+.test-container {
+ margin: 0 20px;
+ height: 100%;
+ float: right;
+ display: flex;
+ align-items: center;
+}
+.button-container {
+ margin: 0 20px;
+ height: 100%;
+ float: right;
+ display: flex;
+ align-items: center;
+}
</style>
--
Gitblit v1.8.0