From a85d52de468179a907552e0c436892b46ef0b8de Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Mon, 27 Sep 2021 10:17:09 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.105:10010/r/zhba_enterprises
---
src/store/modules/common.js | 2
src/page/index/top/index.vue | 245 +++++++++++++++++++++-------------------
src/page/index/sidebar/index.vue | 80 +++++++-----
src/styles/element-ui.scss | 11 +
4 files changed, 189 insertions(+), 149 deletions(-)
diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue
index 9b883ef..fc8a917 100644
--- a/src/page/index/sidebar/index.vue
+++ b/src/page/index/sidebar/index.vue
@@ -1,48 +1,62 @@
<template>
<div class="avue-sidebar">
<logo></logo>
- <el-scrollbar style="height:100%">
- <div v-if="validatenull(menu)"
- class="avue-sidebar--tip">{{$t('menuTip')}}
+ <el-scrollbar style="height: 100%">
+ <div v-if="validatenull(menu)" class="avue-sidebar--tip">
+ {{ $t("menuTip") }}
</div>
- <el-menu unique-opened
- :default-active="nowTagValue"
- mode="vertical"
- :show-timeout="200"
- :collapse="keyCollapse">
- <sidebar-item :menu="menu"
- :screen="screen"
- first
- :props="website.menu.props"
- :collapse="keyCollapse"></sidebar-item>
+ <el-menu
+ unique-opened
+ :default-active="nowTagValue"
+ mode="vertical"
+ :show-timeout="200"
+ :collapse="keyCollapse"
+ background-color="#fff"
+ text-color="#000"
+ active-text-color="#ffd04b"
+ >
+ <sidebar-item
+ :menu="menu"
+ :screen="screen"
+ first
+ :props="website.menu.props"
+ :collapse="keyCollapse"
+ ></sidebar-item>
</el-menu>
</el-scrollbar>
</div>
</template>
<script>
- import {mapGetters} from "vuex";
- import logo from "../logo";
- import sidebarItem from "./sidebarItem";
+import { mapGetters } from "vuex";
+import logo from "../logo";
+import sidebarItem from "./sidebarItem";
- export default {
- name: "sidebar",
- components: {sidebarItem, logo},
- inject: ["index"],
- data() {
- return {};
+export default {
+ name: "sidebar",
+ components: { sidebarItem, logo },
+ inject: ["index"],
+ data() {
+ return {};
+ },
+ created() {
+ this.index.openMenu();
+ },
+ computed: {
+ ...mapGetters([
+ "website",
+ "menu",
+ "tag",
+ "keyCollapse",
+ "screen",
+ "menuId",
+ ]),
+ nowTagValue: function () {
+ return this.$router.$avueRouter.getValue(this.$route);
},
- created() {
- this.index.openMenu();
- },
- computed: {
- ...mapGetters(["website", "menu", "tag", "keyCollapse", "screen", "menuId"]),
- nowTagValue: function () {
- return this.$router.$avueRouter.getValue(this.$route);
- }
- },
- methods: {}
- };
+ },
+ methods: {},
+};
</script>
<style lang="scss" scoped>
</style>
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 72be84b..3c64cc1 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -1,52 +1,59 @@
<template>
<div class="avue-top">
<div class="top-bar__left">
- <div class="avue-breadcrumb"
- :class="[{ 'avue-breadcrumb--active': isCollapse }]"
- v-if="showCollapse">
- <i class="icon-navicon"
- @click="setCollapse"></i>
+ <div
+ class="avue-breadcrumb"
+ :class="[{ 'avue-breadcrumb--active': isCollapse }]"
+ v-if="showCollapse"
+ >
+ <i class="icon-navicon" @click="setCollapse"></i>
</div>
</div>
<div class="top-bar__title">
- <div class="top-bar__item top-bar__item--show"
- v-if="showMenu">
+ <div class="top-bar__item top-bar__item--show" v-if="showMenu">
<top-menu ref="topMenu"></top-menu>
</div>
- <span class="top-bar__item"
- v-if="showSearch">
+ <span class="top-bar__item" v-if="showSearch">
<top-search></top-search>
</span>
</div>
<div class="top-bar__right">
- <el-tooltip v-if="showColor"
- effect="dark"
- :content="$t('navbar.color')"
- placement="bottom">
+ <el-tooltip
+ v-if="showColor"
+ effect="dark"
+ :content="$t('navbar.color')"
+ placement="bottom"
+ >
<div class="top-bar__item">
<top-color></top-color>
</div>
</el-tooltip>
- <el-tooltip v-if="showDebug"
- effect="dark"
- :content="logsFlag?$t('navbar.bug'):logsLen+$t('navbar.bugs')"
- placement="bottom">
+ <el-tooltip
+ v-if="showDebug"
+ effect="dark"
+ :content="logsFlag ? $t('navbar.bug') : logsLen + $t('navbar.bugs')"
+ placement="bottom"
+ >
<div class="top-bar__item">
<top-logs></top-logs>
</div>
</el-tooltip>
- <el-tooltip v-if="showLock"
- effect="dark"
- :content="$t('navbar.lock')"
- placement="bottom">
+ <el-tooltip
+ v-if="showLock"
+ effect="dark"
+ :content="$t('navbar.lock')"
+ placement="bottom"
+ >
<div class="top-bar__item">
<top-lock></top-lock>
</div>
</el-tooltip>
- <el-tooltip v-if="showTheme"
- effect="dark"
- :content="$t('navbar.theme')"
- placement="bottom">
+ <el-tooltip
+ v-if="showTheme"
+ effect="dark"
+ :content="$t('navbar.theme')"
+ placement="bottom"
+ >
<div class="top-bar__item top-bar__item--show">
<top-theme></top-theme>
</div>
@@ -58,38 +65,47 @@
<top-notice></top-notice>
</div>
</el-tooltip> -->
- <el-tooltip effect="dark"
- :content="$t('navbar.language')"
- placement="bottom">
+ <el-tooltip
+ effect="dark"
+ :content="$t('navbar.language')"
+ placement="bottom"
+ >
<div class="top-bar__item top-bar__item--show">
<top-lang></top-lang>
</div>
</el-tooltip>
- <el-tooltip v-if="showFullScren"
- effect="dark"
- :content="isFullScren?$t('navbar.screenfullF'):$t('navbar.screenfull')"
- placement="bottom">
+ <el-tooltip
+ v-if="showFullScren"
+ effect="dark"
+ :content="
+ isFullScren ? $t('navbar.screenfullF') : $t('navbar.screenfull')
+ "
+ placement="bottom"
+ >
<div class="top-bar__item">
- <i :class="isFullScren?'icon-tuichuquanping':'icon-quanping'"
- @click="handleScreen"></i>
+ <i
+ :class="isFullScren ? 'icon-tuichuquanping' : 'icon-quanping'"
+ @click="handleScreen"
+ ></i>
</div>
</el-tooltip>
- <img class="top-bar__img"
- :src="userInfo.avatar">
+ <img class="top-bar__img" :src="userInfo.avatar" />
<el-dropdown>
<span class="el-dropdown-link">
- {{userInfo.userName}}
+ {{ 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>
+ <router-link to="/">{{ $t("navbar.dashboard") }}</router-link>
</el-dropdown-item>
<el-dropdown-item>
- <router-link to="/info/index">{{$t('navbar.userinfo')}}</router-link>
+ <router-link to="/info/index">{{
+ $t("navbar.userinfo")
+ }}</router-link>
</el-dropdown-item>
- <el-dropdown-item @click.native="logout"
- divided>{{$t('navbar.logOut')}}
+ <el-dropdown-item @click.native="logout" divided
+ >{{ $t("navbar.logOut") }}
</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
@@ -97,85 +113,84 @@
</div>
</template>
<script>
- import {resetRouter} from '@/router/router'
- import {mapGetters, mapState} from "vuex";
- import {fullscreenToggel, listenfullscreen} from "@/util/util";
- import topLock from "./top-lock";
- import topMenu from "./top-menu";
- import topSearch from "./top-search";
- import topTheme from "./top-theme";
- import topLogs from "./top-logs";
- import topColor from "./top-color";
- import topNotice from './top-notice'
- import topLang from "./top-lang";
+import { resetRouter } from "@/router/router";
+import { mapGetters, mapState } from "vuex";
+import { fullscreenToggel, listenfullscreen } from "@/util/util";
+import topLock from "./top-lock";
+import topMenu from "./top-menu";
+import topSearch from "./top-search";
+import topTheme from "./top-theme";
+import topLogs from "./top-logs";
+import topColor from "./top-color";
+import topNotice from "./top-notice";
+import topLang from "./top-lang";
- export default {
- components: {
- topLock,
- topMenu,
- topSearch,
- topTheme,
- topLogs,
- topColor,
- topNotice,
- topLang
+export default {
+ components: {
+ topLock,
+ topMenu,
+ topSearch,
+ topTheme,
+ topLogs,
+ topColor,
+ topNotice,
+ topLang,
+ },
+ name: "top",
+ data() {
+ return {};
+ },
+ filters: {},
+ created() {},
+ mounted() {
+ listenfullscreen(this.setScreen);
+ },
+ computed: {
+ ...mapState({
+ showDebug: (state) => state.common.showDebug,
+ showTheme: (state) => state.common.showTheme,
+ showLock: (state) => state.common.showLock,
+ showFullScren: (state) => state.common.showFullScren,
+ showCollapse: (state) => state.common.showCollapse,
+ showSearch: (state) => state.common.showSearch,
+ showMenu: (state) => state.common.showMenu,
+ showColor: (state) => state.common.showColor,
+ }),
+ ...mapGetters([
+ "userInfo",
+ "isFullScren",
+ "tagWel",
+ "tagList",
+ "isCollapse",
+ "tag",
+ "logsLen",
+ "logsFlag",
+ ]),
+ },
+ methods: {
+ handleScreen() {
+ fullscreenToggel();
},
- name: "top",
- data() {
- return {};
+ setCollapse() {
+ this.$store.commit("SET_COLLAPSE");
},
- filters: {},
- created() {
+ setScreen() {
+ this.$store.commit("SET_FULLSCREN");
},
- mounted() {
- listenfullscreen(this.setScreen);
- },
- computed: {
- ...mapState({
- showDebug: state => state.common.showDebug,
- showTheme: state => state.common.showTheme,
- showLock: state => state.common.showLock,
- showFullScren: state => state.common.showFullScren,
- showCollapse: state => state.common.showCollapse,
- showSearch: state => state.common.showSearch,
- showMenu: state => state.common.showMenu,
- showColor: state => state.common.showColor
- }),
- ...mapGetters([
- "userInfo",
- "isFullScren",
- "tagWel",
- "tagList",
- "isCollapse",
- "tag",
- "logsLen",
- "logsFlag"
- ])
- },
- methods: {
- handleScreen() {
- fullscreenToggel();
- },
- setCollapse() {
- this.$store.commit("SET_COLLAPSE");
- },
- setScreen() {
- this.$store.commit("SET_FULLSCREN");
- },
- logout() {
- this.$confirm(this.$t("logoutTip"), this.$t("tip"), {
- confirmButtonText: this.$t("submitText"),
- cancelButtonText: this.$t("cancelText"),
- type: "warning"
- }).then(() => {
- this.$store.dispatch("LogOut").then(() => {
- resetRouter();
- this.$router.push({path: "/login"});
- });
+ logout() {
+ this.$confirm(this.$t("logoutTip"), this.$t("tip"), {
+ confirmButtonText: this.$t("submitText"),
+ cancelButtonText: this.$t("cancelText"),
+ type: "warning",
+ }).then(() => {
+ this.$store.dispatch("LogOut").then(() => {
+ resetRouter();
+ this.$router.push({ path: "/login" });
});
- }
- }
- };
+ });
+ },
+ },
+};
</script>
<style lang="scss" scoped>
diff --git a/src/store/modules/common.js b/src/store/modules/common.js
index 9b99ee9..0cc276d 100644
--- a/src/store/modules/common.js
+++ b/src/store/modules/common.js
@@ -9,7 +9,7 @@
state: {
language: getStore({ name: 'language' }) || 'zh',
- isCollapse: false,
+ isCollapse: true,//默认菜单是否打开
isFullScren: false,
isMenu: true,
isShade: false,
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 95235b1..83ab6fd 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -299,3 +299,14 @@
// 统计图持证表格按钮过长
width: 320px !important;
}
+
+.el-menu.el-menu--popup.el-menu--popup-right-start {
+ //菜单折叠 弹窗样式
+ .el-menu-item span,
+ .el-menu-item i {
+ color: rgba($color: #000000, $alpha: 0.7) !important;
+ }
+ li:hover {
+ background-color: #bcdcfd !important;
+ }
+}
--
Gitblit v1.9.3