From c7bd6db3190ff5c4b55d004db0b9fa944604925f Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期五, 18 十月 2024 11:09:15 +0800
Subject: [PATCH] Merge branch 'lsf-topTask'
---
src/components/core/Header.vue | 36 ++++++++++++++++--------------------
1 files changed, 16 insertions(+), 20 deletions(-)
diff --git a/src/components/core/Header.vue b/src/components/core/Header.vue
index 1a14d18..3c742e0 100644
--- a/src/components/core/Header.vue
+++ b/src/components/core/Header.vue
@@ -1,20 +1,16 @@
<template>
<el-row align="middle" class="header">
- <el-col :span="1">
- <el-button
- @click="collapsedSider"
- icon="Fold"
- circle
- :class="rotateIcon"
- />
+ <el-col :span="12">
+ <el-space>
+ <el-button @click="collapsedSider" icon="Fold" circle :class="rotateIcon" />
+ <el-breadcrumb separator="/" style="white-space: nowrap">
+ <el-breadcrumb-item v-for="(t, i) in navTitles" :key="i">{{ t }}</el-breadcrumb-item>
+ </el-breadcrumb>
+ </el-space>
</el-col>
- <el-col :span="18">
- <el-breadcrumb separator="/" style="white-space: nowrap;">
- <el-breadcrumb-item v-for="(t, i) in navTitles" :key="i">{{t}}</el-breadcrumb-item>
- </el-breadcrumb>
- </el-col>
- <el-col :span="5" class="logout">
- <el-button icon="SwitchButton">閫�鍑虹櫥褰�</el-button>
+ <el-col :span="12" class="logout">
+ <FYBgTaskDialog></FYBgTaskDialog>
+ <el-button icon="SwitchButton">閫�鍑虹櫥褰�</el-button>
</el-col>
</el-row>
</template>
@@ -25,16 +21,16 @@
props: {
collapse: {
type: Boolean,
- default: false,
+ default: false
},
navTitles: {
type: Array,
- default: () => ['home','promotion list', 'promotion detail'],
+ default: () => ['home', 'promotion list', 'promotion detail']
}
},
data() {
return {
- isCollapsed: this.collapse,
+ isCollapsed: this.collapse
};
},
watch: {},
@@ -44,7 +40,7 @@
*/
rotateIcon() {
return ['menu-icon', this.isCollapsed ? 'rotate-icon' : ''];
- },
+ }
},
methods: {
/**
@@ -53,8 +49,8 @@
collapsedSider() {
this.isCollapsed = !this.isCollapsed;
this.$emit('collapsedSider', this.isCollapsed);
- },
- },
+ }
+ }
};
</script>
--
Gitblit v1.9.3