From d95b36a88357d018f76d926e9074c521eb8335a7 Mon Sep 17 00:00:00 2001
From: lohir <3399054449@qq.com>
Date: 星期三, 23 十月 2024 11:24:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/RightToolbar/index.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/components/RightToolbar/index.vue b/src/components/RightToolbar/index.vue
index cdf4983..a56bab7 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 v-show="$route.path.includes('equipment')" class="item" effect="dark" content="鑷畾涔夊垪" placement="top">
+ <el-tooltip v-show="$route.path.includes('point')" 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" />
@@ -77,6 +77,7 @@
title: "鏄剧ず/闅愯棌",
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
+ tableKey: 0,
};
},
props: {
@@ -115,7 +116,7 @@
}
},
created() {
- if (this.$route.path.includes("equipment")) {
+ if (this.$route.path.includes("point")) {
this.getDyColumn()
}
if (this.showColumnsType == 'transfer') {
@@ -131,18 +132,20 @@
getDyColumn() {
// 鏌ヨ鍔ㄦ�佸垪
let params = {
- tableName: 't_monitor'
+ tableName: 't_yw_point'
}
getDynamicColumnList(params).then(res => {
this.dynamicColumnList = res.data
})
},
addDynamicColumn() {
+ this.getDyColumn()
this.showDynamicColumn = true
},
saveColumns() {
editDynamicColumn(this.dynamicColumnList).then(res => {
this.$message.success("淇濆瓨鎴愬姛")
+ this.$emit('refreshHeader');
this.showDynamicColumn = false
})
},
@@ -153,13 +156,10 @@
})
},
delColumn(id, index) {
- if (! id) {
- this.dynamicColumnList.splice(index, 1)
- return
- }
deleteDynamicColumnById(id).then(res => {
this.$message.success("鍒犻櫎鎴愬姛")
this.getDyColumn();
+ this.$emit('refreshHeader');
})
},
dynamicColumnClose() {
--
Gitblit v1.8.0