diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 2deb0b4..ad67460 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -164,10 +164,11 @@ function uploadedSuccessfully() { // 获取文件名称 function getFileName(name) { + // 如果是url那么取最后的名字 如果不是直接返回 if (name.lastIndexOf("/") > -1) { return name.slice(name.lastIndexOf("/") + 1); } else { - return ""; + return name; } } diff --git a/src/components/TopNav/index.vue b/src/components/TopNav/index.vue index efd6b9c..e628094 100644 --- a/src/components/TopNav/index.vue +++ b/src/components/TopNav/index.vue @@ -6,13 +6,12 @@ :ellipsis="false" > @@ -22,10 +21,12 @@ - {{ item.meta.title }} + v-if="index >= visibleNumber"> + + {{ item.meta.title }} + @@ -195,7 +196,7 @@ onMounted(() => { /* 背景色隐藏 */ .topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):focus, .topmenu-container.el-menu--horizontal>.el-menu-item:not(.is-disabled):hover, .topmenu-container.el-menu--horizontal>.el-submenu .el-submenu__title:hover { - background-color: #ffffff !important; + background-color: #ffffff !important; } /* 图标右间距 */ diff --git a/src/plugins/tab.js b/src/plugins/tab.js index 407f634..004aa86 100644 --- a/src/plugins/tab.js +++ b/src/plugins/tab.js @@ -35,7 +35,7 @@ export default { return useTagsViewStore().delView(router.currentRoute.value).then(({ visitedViews }) => { const latestView = visitedViews.slice(-1)[0] if (latestView) { - return router.push(latestView.fullPath) + return router.push(latestView.fullPath) } return router.push('/'); }); diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index c5f9501..f177ed2 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -149,7 +149,7 @@ /> - + @@ -171,7 +171,7 @@ {{ form.jsonResult }} - +
正常
失败
@@ -180,7 +180,7 @@ {{ form.costTime }}毫秒 - + {{ parseTime(form.operTime) }}