From dfb809638727baaf4aff07f2f17d542fa6d87532 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期三, 29 十一月 2023 12:43:28 +0800
Subject: [PATCH] 优化代码
---
src/plugins/tab.js | 2 +-
src/components/TopNav/index.vue | 25 +++++++++++++------------
src/components/FileUpload/index.vue | 3 ++-
src/views/monitor/operlog/index.vue | 6 +++---
4 files changed, 19 insertions(+), 17 deletions(-)
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 getFileName(name) {
+ // 濡傛灉鏄痷rl閭ｄ箞鍙栨渶鍚庣殑鍚嶅瓧 濡傛灉涓嶆槸鐩存帴杩斿洖
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"
>
<template v-for="(item, index) in topMenus">
- <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber"
- ><svg-icon
- v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
- :icon-class="item.meta.icon"
- />
- {{ item.meta.title }}</el-menu-item
- >
+ <el-menu-item :style="{'--theme': theme}" :index="item.path" :key="index" v-if="index < visibleNumber">
+ <svg-icon
+ v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+ :icon-class="item.meta.icon"/>
+ {{ item.meta.title }}
+ </el-menu-item>
</template>
<!-- 椤堕儴鑿滃崟瓒呭嚭鏁伴噺鎶樺彔 -->
@@ -22,10 +21,12 @@
<el-menu-item
:index="item.path"
:key="index"
- v-if="index >= visibleNumber"
- ><svg-icon :icon-class="item.meta.icon" />
- {{ item.meta.title }}</el-menu-item
- >
+ v-if="index >= visibleNumber">
+ <svg-icon
+ v-if="item.meta && item.meta.icon && item.meta.icon !== '#'"
+ :icon-class="item.meta.icon"/>
+ {{ item.meta.title }}
+ </el-menu-item>
</template>
</el-sub-menu>
</el-menu>
@@ -195,7 +196,7 @@
/* 鑳屾櫙鑹查殣钘� */
.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 @@
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 @@
/>
<!-- 鎿嶄綔鏃ュ織璇︾粏 -->
- <el-dialog title="鎿嶄綔鏃ュ織璇︾粏" v-model="open" width="700px" append-to-body>
+ <el-dialog title="鎿嶄綔鏃ュ織璇︾粏" v-model="open" width="800px" append-to-body>
<el-form :model="form" label-width="100px">
<el-row>
<el-col :span="12">
@@ -171,7 +171,7 @@
<el-col :span="24">
<el-form-item label="杩斿洖鍙傛暟锛�">{{ form.jsonResult }}</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="鎿嶄綔鐘舵�侊細">
<div v-if="form.status === 0">姝ｅ父</div>
<div v-else-if="form.status === 1">澶辫触</div>
@@ -180,7 +180,7 @@
<el-col :span="8">
<el-form-item label="娑堣�楁椂闂达細">{{ form.costTime }}姣</el-form-item>
</el-col>
- <el-col :span="10">
+ <el-col :span="8">
<el-form-item label="鎿嶄綔鏃堕棿锛�">{{ parseTime(form.operTime) }}</el-form-item>
</el-col>
<el-col :span="24">
--
Gitblit v1.9.3