Commit 54bfdc33 authored by 纪泽龙's avatar 纪泽龙

修复左边拦长短的问题

parent b43719f0
...@@ -266,3 +266,9 @@ ...@@ -266,3 +266,9 @@
position: relative; position: relative;
float: right; float: right;
} }
// 上传按钮
.hide {
.el-upload--picture-card {
display: none;
}
}
...@@ -118,11 +118,11 @@ ...@@ -118,11 +118,11 @@
.hideSidebar { .hideSidebar {
.sidebar-container { .sidebar-container {
width: 54px !important; // width: 54px !important;
} }
.main-container { .main-container {
margin-left: 54px; // margin-left: 54px;
} }
.submenu-title-noDropdown { .submenu-title-noDropdown {
......
...@@ -11,9 +11,11 @@ ...@@ -11,9 +11,11 @@
:on-success="handleUploadSuccess" :on-success="handleUploadSuccess"
:on-remove="handleRemove" :on-remove="handleRemove"
:on-preview="handleFileClick" :on-preview="handleFileClick"
:on-change="fileChange"
:show-file-list="true" :show-file-list="true"
:headers="headers" :headers="headers"
class="upload-file-uploader" class="upload-file-uploader"
:class="{hide:addShow}"
ref="upload" ref="upload"
> >
<!-- 上传按钮 --> <!-- 上传按钮 -->
...@@ -78,6 +80,7 @@ export default { ...@@ -78,6 +80,7 @@ export default {
type: Boolean, type: Boolean,
default: false, default: false,
}, },
}, },
data() { data() {
return { return {
...@@ -89,6 +92,7 @@ export default { ...@@ -89,6 +92,7 @@ export default {
modal:false, modal:false,
dialogVisible:false, dialogVisible:false,
dialogImageUrl:"", dialogImageUrl:"",
addShow:true,
}; };
}, },
computed: { computed: {
...@@ -163,6 +167,7 @@ export default { ...@@ -163,6 +167,7 @@ export default {
// 文件列表移除文件 // 文件列表移除文件
handleRemove(file, fileList) { handleRemove(file, fileList) {
console.log("列表移除", file, fileList); console.log("列表移除", file, fileList);
this.addShow = fileList.length>0 ?true:false;
this.$emit("remove", file); this.$emit("remove", file);
}, },
// 删除文件 // 删除文件
...@@ -197,9 +202,15 @@ export default { ...@@ -197,9 +202,15 @@ export default {
return ""; return "";
} }
}, },
// 当改变列表改变时
fileChange(file,fileList){
this.addShow = fileList.length>0 ?true:false;
}
}, },
created() { created() {
// this.fileList = this.list; // this.fileList = this.list;
this.addShow = this.fileArr.length>0 ?true:false;
}, },
}; };
</script> </script>
...@@ -223,4 +234,5 @@ export default { ...@@ -223,4 +234,5 @@ export default {
.ele-upload-list__item-content-action .el-link { .ele-upload-list__item-content-action .el-link {
margin-right: 10px; margin-right: 10px;
} }
</style> </style>
...@@ -179,7 +179,7 @@ export default { ...@@ -179,7 +179,7 @@ export default {
vertical-align: top; vertical-align: top;
display: inline-block; display: inline-block;
word-break: break-all; word-break: break-all;
max-width: 280px; max-width: 250px;
} }
} }
} }
......
...@@ -6,12 +6,17 @@ ...@@ -6,12 +6,17 @@
> >
<template v-for="(item, index) in topMenus"> <template v-for="(item, index) in topMenus">
<!-- <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber" --> <!-- <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber" -->
<el-menu-item :style="" :index="item.path" :key="index" v-if="index < visibleNumber"> <el-menu-item
:style=""
<!-- 导航栏左侧图标 --> :index="item.path"
<!-- <svg-icon :icon-class="item.meta.icon" /> --> :key="index"
{{ item.meta.title }}</el-menu-item> v-if="index < visibleNumber"
<div class="menu-item-div"></div> >
<!-- 导航栏左侧图标 -->
<!-- <svg-icon :icon-class="item.meta.icon" /> -->
{{ item.meta.title }}
</el-menu-item>
<!-- <div class="menu-item-div"></div> -->
</template> </template>
<!-- 顶部菜单超出数量折叠 --> <!-- 顶部菜单超出数量折叠 -->
...@@ -32,7 +37,7 @@ ...@@ -32,7 +37,7 @@
<script> <script>
import { constantRoutes } from "@/router"; import { constantRoutes } from "@/router";
import '../../common/font/font.css' import "../../common/font/font.css";
export default { export default {
data() { data() {
return { return {
...@@ -41,7 +46,7 @@ export default { ...@@ -41,7 +46,7 @@ export default {
// 是否为首次加载 // 是否为首次加载
isFrist: false, isFrist: false,
// 当前激活菜单的 index // 当前激活菜单的 index
currentIndex: undefined currentIndex: undefined,
}; };
}, },
computed: { computed: {
...@@ -55,9 +60,9 @@ export default { ...@@ -55,9 +60,9 @@ export default {
if (menu.hidden !== true) { if (menu.hidden !== true) {
// 兼容顶部栏一级菜单内部跳转 // 兼容顶部栏一级菜单内部跳转
if (menu.path === "/") { if (menu.path === "/") {
topMenus.push(menu.children[0]); topMenus.push(menu.children[0]);
} else { } else {
topMenus.push(menu); topMenus.push(menu);
} }
} }
}); });
...@@ -73,12 +78,14 @@ export default { ...@@ -73,12 +78,14 @@ export default {
this.routers.map((router) => { this.routers.map((router) => {
for (var item in router.children) { for (var item in router.children) {
if (router.children[item].parentPath === undefined) { if (router.children[item].parentPath === undefined) {
if(router.path === "/") { if (router.path === "/") {
router.children[item].path = "/redirect/" + router.children[item].path; router.children[item].path =
"/redirect/" + router.children[item].path;
} else { } else {
if(!this.ishttp(router.children[item].path)) { if (!this.ishttp(router.children[item].path)) {
router.children[item].path = router.path + "/" + router.children[item].path; router.children[item].path =
} router.path + "/" + router.children[item].path;
}
} }
router.children[item].parentPath = router.path; router.children[item].parentPath = router.path;
} }
...@@ -103,17 +110,17 @@ export default { ...@@ -103,17 +110,17 @@ export default {
} }
var routes = this.activeRoutes(activePath); var routes = this.activeRoutes(activePath);
if (routes.length === 0) { if (routes.length === 0) {
activePath = this.currentIndex || this.routers[0].path activePath = this.currentIndex || this.routers[0].path;
this.activeRoutes(activePath); this.activeRoutes(activePath);
} }
return activePath; return activePath;
}, },
}, },
beforeMount() { beforeMount() {
window.addEventListener('resize', this.setVisibleNumber) window.addEventListener("resize", this.setVisibleNumber);
}, },
beforeDestroy() { beforeDestroy() {
window.removeEventListener('resize', this.setVisibleNumber) window.removeEventListener("resize", this.setVisibleNumber);
}, },
mounted() { mounted() {
this.setVisibleNumber(); this.setVisibleNumber();
...@@ -126,6 +133,7 @@ export default { ...@@ -126,6 +133,7 @@ export default {
}, },
// 菜单选择事件 // 菜单选择事件
handleSelect(key, keyPath) { handleSelect(key, keyPath) {
console.log(key)
this.currentIndex = key; this.currentIndex = key;
if (this.ishttp(key)) { if (this.ishttp(key)) {
// http(s):// 路径新窗口打开 // http(s):// 路径新窗口打开
...@@ -148,14 +156,14 @@ export default { ...@@ -148,14 +156,14 @@ export default {
} }
}); });
} }
if(routes.length > 0) { if (routes.length > 0) {
this.$store.commit("SET_SIDEBAR_ROUTERS", routes); this.$store.commit("SET_SIDEBAR_ROUTERS", routes);
} }
return routes; return routes;
}, },
ishttp(url) { ishttp(url) {
return url.indexOf('http://') !== -1 || url.indexOf('https://') !== -1 return url.indexOf("http://") !== -1 || url.indexOf("https://") !== -1;
} },
}, },
}; };
</script> </script>
...@@ -176,33 +184,39 @@ export default { ...@@ -176,33 +184,39 @@ export default {
} }
.el-menu--horizontal > .el-menu-item.is-active { .el-menu--horizontal > .el-menu-item.is-active {
border-bottom: 3px solid #{'var(--theme)'}; border-bottom: 3px solid #{"var(--theme)"};
/* box-shadow: inset 2px 2px 20px #5CD9D4; */ /* box-shadow: inset 2px 2px 20px #5CD9D4; */
color: #5CD9D4; color: #5cd9d4;
} }
/* submenu item */ /* submenu item */
.el-menu--horizontal > .el-submenu .el-submenu__title { .el-menu--horizontal > .el-submenu .el-submenu__title {
height: 50px !important; height: 50px !important;
line-height: 50px !important; line-height: 50px !important;
} }
.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover, .el-menu--horizontal > .el-menu-item:not(.is-disabled):focus{ .el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus {
background-color: rgba(0, 0, 0, 0); background-color: rgba(0, 0, 0, 0);
/* opacity: 0; */ /* opacity: 0; */
/* box-shadow: inset 2px 2px 20px #5CD9D4; */ /* box-shadow: inset 2px 2px 20px #5CD9D4; */
color: #fff; color: #fff;
} }
.menu-item-div{ .menu-item-div {
width: 2px; width: 2px;
height: 30px; height: 30px;
margin-top: 25px; margin-top: 25px;
background-color: rgb(190, 189, 189); background-color: rgb(190, 189, 189);
float: left; float: left;
background: linear-gradient(130deg, rgba(0, 0, 0, 0) 0%,rgba(255,255,255,0.7) 50%, rgba(0, 0, 0, 0) 100%); background: linear-gradient(
130deg,
rgba(0, 0, 0, 0) 0%,
rgba(255, 255, 255, 0.7) 50%,
rgba(0, 0, 0, 0) 100%
);
&:last-child { &:last-child {
width: 0px; width: 0px;
height: 0px; height: 0px;
} }
} }
</style> </style>
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
<app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)"> <app-link v-if="onlyOneChild.meta" :to="resolvePath(onlyOneChild.path)">
<el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}"> <el-menu-item :index="resolvePath(onlyOneChild.path)" :class="{'submenu-title-noDropdown':!isNest}">
<item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)"/><br> <item :icon="onlyOneChild.meta.icon||(item.meta&&item.meta.icon)"/><br>
<item :title="onlyOneChild.meta.title" /> <!-- <item :title="onlyOneChild.meta.title" /> -->
{{onlyOneChild.meta.title}}
</el-menu-item> </el-menu-item>
</app-link> </app-link>
</template> </template>
......
<template> <template>
<div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}"> <div :class="classObj" class="app-wrapper" :style="{'--current-color': theme}">
<div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" /> <div v-if="device==='mobile'&&sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
<sidebar class="sidebar-container" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" /> <Sidebar class="sidebar-container" :style="{ backgroundColor: sideTheme === 'theme-dark' ? variables.menuBg : variables.menuLightBg }" />
<div :class="{hasTagsView:needTagsView}" class="main-container"> <div :class="{hasTagsView:needTagsView}" class="main-container">
<div :class="{'fixed-header':fixedHeader}"> <div :class="{'fixed-header':fixedHeader}">
<navbar /> <navbar />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment