From dae8cdecc05c1d64189d261364ce7fda9c4f505b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 21:14:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/RightToolbar/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index 35563f4..f0f9310 100644
--- a/src/components/RightToolbar/index.vue
+++ b/src/components/RightToolbar/index.vue
@@ -7,14 +7,14 @@
<el-tooltip class="item" effect="dark" content="鍒锋柊" placement="top">
<el-button size="mini" circle icon="el-icon-refresh" @click="refresh()" />
</el-tooltip>
- <el-tooltip class="item" effect="dark" content="鑷畾涔夊垪" placement="top">
+ <el-tooltip v-show="$route.path.includes('equipment')" class="item" effect="dark" content="鑷畾涔夊垪" placement="top">
<el-button size="mini" circle icon="el-icon-collection-tag" @click="addDynamicColumn()" />
</el-tooltip>
<el-tooltip class="item" effect="dark" content="鏄鹃殣鍒�" placement="top" v-if="columns">
<el-button size="mini" circle icon="el-icon-menu" @click="showColumn()" v-if="showColumnsType == 'transfer'"/>
<el-dropdown trigger="click" :hide-on-click="false" style="padding-left: 12px" v-if="showColumnsType == 'checkbox'">
<el-button size="mini" circle icon="el-icon-menu" />
- <el-dropdown-menu slot="dropdown">
+ <el-dropdown-menu slot="dropdown" style="max-height: 650px;overflow-y: auto">
<template v-for="item in columns">
<el-dropdown-item :key="item.key">
<el-checkbox :checked="item.visible" @change="checkboxChange($event, item.label)" :label="item.label" />
@@ -115,7 +115,7 @@
}
},
created() {
- if (this.$route.path.concat("equipment")) {
+ if (this.$route.path.includes("equipment")) {
this.getDyColumn()
}
if (this.showColumnsType == 'transfer') {
--
Gitblit v1.8.0