From 306a9c4fde94c54d91aee5a69d59b993c7c707a1 Mon Sep 17 00:00:00 2001
From: wangting <wangting@vci-tech.com>
Date: 星期一, 30 十二月 2024 17:40:07 +0800
Subject: [PATCH] 调整菜单
---
Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue | 4 ++--
Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue | 17 ++++++++---------
Source/plt-web/plt-web-ui/src/page/index/sidebar/index.vue | 10 +++++-----
Source/plt-web/plt-web-ui/src/page/index/logo.vue | 22 ++++++++++------------
Source/plt-web/plt-web-ui/src/page/index/top/index.vue | 4 +---
5 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/page/index/logo.vue b/Source/plt-web/plt-web-ui/src/page/index/logo.vue
index 0db22fa..b2a514c 100644
--- a/Source/plt-web/plt-web-ui/src/page/index/logo.vue
+++ b/Source/plt-web/plt-web-ui/src/page/index/logo.vue
@@ -1,24 +1,21 @@
<template>
<div class="avue-logo">
<transition name="fade">
- <span v-if="keyCollapse"
- class="avue-logo_subtitle"
- key="0">
+ <span v-if="isCollapse" class="avue-logo_subtitle" key="0">
<img class="imgTop" :src=imgurl>
</span>
</transition>
<transition-group name="fade">
- <template v-if="!keyCollapse">
+ <template v-if="!isCollapse">
<span>
<img class="imgSpan" :src=imgurl>
</span>
- <span class="avue-logo_title"
- key="1">
+ <span class="avue-logo_title" key="1">
<span>
<img class="imgSpan" :src=imgurl>
</span>
<span class="indexTitle"> {{ website.indexTitle }}</span>
- </span>
+ </span>
</template>
</transition-group>
</div>
@@ -38,26 +35,25 @@
created() {
},
computed: {
- ...mapGetters(["website", "keyCollapse"])
+ ...mapGetters(["website", "isCollapse"])
},
methods: {}
};
</script>
-<style lang="scss">
+<style lang="scss" scoped>
.fade-leave-active {
- transition: opacity 0.2s;
+ transition: opacity 0.3s;
}
.fade-enter-active {
- transition: opacity 2.5s;
+ transition: opacity .3s;
}
.fade-enter,
.fade-leave-to {
opacity: 0;
}
-
.avue-logo {
position: fixed;
top: 0;
@@ -72,6 +68,8 @@
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
color: rgba(255, 255, 255, 0.8);
z-index: 1024;
+ -webkit-transition: width .2s;
+ transition: width .2s;
&_title {
display: block;
diff --git a/Source/plt-web/plt-web-ui/src/page/index/sidebar/index.vue b/Source/plt-web/plt-web-ui/src/page/index/sidebar/index.vue
index 476af59..67d7034 100644
--- a/Source/plt-web/plt-web-ui/src/page/index/sidebar/index.vue
+++ b/Source/plt-web/plt-web-ui/src/page/index/sidebar/index.vue
@@ -8,14 +8,14 @@
<el-menu unique-opened
:default-active="nowTagValue"
mode="vertical"
- :show-timeout="200"
- :collapse="keyCollapse"
+ :collapse="isCollapse"
+ :collapse-transition="false"
>
<sidebar-item :menu="menu"
:screen="screen"
first
:props="website.menu.props"
- :collapse="keyCollapse"></sidebar-item>
+ :collapse="isCollapse"></sidebar-item>
</el-menu>
</el-scrollbar>
</div>
@@ -32,14 +32,14 @@
inject: ["index"],
data() {
return {
-
+ collapse:true
};
},
created() {
this.index.openMenu();
},
computed: {
- ...mapGetters(["website", "menu", "tag", "keyCollapse", "screen", "menuId"]),
+ ...mapGetters(["website", "menu", "tag", "isCollapse", "screen", "menuId"]),
nowTagValue: function () {
return this.$router.$avueRouter.getValue(this.$route);
}
diff --git a/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue b/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
index ca20593..e6e5ba1 100644
--- a/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
+++ b/Source/plt-web/plt-web-ui/src/page/index/sidebar/sidebarItem.vue
@@ -14,14 +14,12 @@
:key="item[labelKey]"
:index="item[pathKey]">
<template slot="title">
- <div style="display: flex">
- <icon-show v-if="item[iconKey]" :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
- <div v-else>
- <i class="el-icon-setting" :font-size="iconSize"></i>
- </div>
- <span slot="title"
- :class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span>
- </div>
+ <div style="display: flex">
+ <icon-show v-if="item[iconKey]" :name="item[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
+ <i v-else class="el-icon-setting" :font-size="iconSize"></i>
+ <span slot="title"
+ :class="{'el-menu--display':collapse && first}">{{ generateTitle(item) }}</span>
+ </div>
</template>
<template v-for="(child,cindex) in item[childrenKey]">
<el-menu-item v-if="validatenull(child[childrenKey])"
@@ -30,7 +28,8 @@
:index="child[pathKey],cindex"
@click="open(child)">
<div style="display: flex">
- <icon-show :name="child[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
+ <icon-show v-if="child[iconKey]" :name="child[iconKey]" class="iconShowSpan" :style="{ height: iconSize, width: iconSize }"></icon-show>
+ <i v-else class="el-icon-setting" :font-size="iconSize"></i>
<span slot="title">{{ generateTitle(child) }}</span>
</div>
</el-menu-item>
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 4b22017..8df1854 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">
@@ -227,7 +226,6 @@
this.$store.commit("SET_FULLSCREN");
},
gotoInfo() {
- console.log('123')
this.$router.push({path: '/info'});
},
switchDept() {
diff --git a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue
index 17f529e..c2d4177 100644
--- a/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue
+++ b/Source/plt-web/plt-web-ui/src/views/modelingMenu/ui/Icons/index.vue
@@ -51,11 +51,11 @@
<pre style="font-size: 12px;color: #909399;margin-top: 0;padding:5px;background-color: #F5F7FA">涓婁紶鏂囦欢涓簀son鏂囦欢锛岀ず渚嬪涓�
[{
"name": "鍥炬爣搴撳悕:鍥炬爣鍚嶇О",
- "svg": "html浠ｇ爜"
+ "svg": "svg鐨刪tml浠ｇ爜"
},
{
"name": "鍥炬爣搴撳悕:鍥炬爣鍚嶇О",
- "svg": "html浠ｇ爜"
+ "svg": "svg鐨刪tml浠ｇ爜"
}]
鏂囦欢鍐呭椤讳弗鏍兼寜鐓хず渚嬫牸寮忥紝name涓哄浘鏍囧簱鍚�+鍥炬爣鍚嶇О锛屼互鈥�:鈥濆垎闅旓紝svg涓哄浘鏍噃tml浠ｇ爜</pre>
</el-dialog>
--
Gitblit v1.9.3