gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev-2.0' of https://git.mesalab.cn/nezha/nezha-fronted into dev-2.0

Browse Source
This commit is contained in:
zhangyu
2021-07-13 10:33:10 +08:00
parent eb1ff745b9 7a23f62af3
commit e75b459eaf
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/components/common/language/cn.js
View File

@@ -71,7 +71,7 @@ const cn = {
createProject: '新增系统', createProject: '新增系统',
createEndpoint: '新增 Endpoint', createEndpoint: '新增 Endpoint',
batchEndpoint: '批量修改Endpoint', batchEndpoint: '批量修改Endpoint',
createAsset: '新增资产', createAsset: '新增图表',
createAlertRule: '新增告警规则', createAlertRule: '新增告警规则',
createUser: '新增用户', createUser: '新增用户',
createRole: '新增角色', createRole: '新增角色',

2
nezha-fronted/src/components/common/language/en.js
View File

@@ -77,7 +77,7 @@ const en = {
createProject: 'New project', createProject: 'New project',
createEndpoint: 'New endpoint', createEndpoint: 'New endpoint',
batchEndpoint: 'Batch modify endpoint', batchEndpoint: 'Batch modify endpoint',
createAsset: 'New asset', createAsset: 'New chart',
createAlertRule: 'New alert rule', createAlertRule: 'New alert rule',
createUser: 'New user', createUser: 'New user',
createRole: 'New role', createRole: 'New role',

2
nezha-fronted/src/components/common/rightBox/asset/assetBox.vue
View File

@@ -330,7 +330,7 @@ export default {
lazyLoad (node, resolve) { lazyLoad (node, resolve) {
const { level } = node const { level } = node
if (node && node.data) { if (node && node.data) {
vm.$get('asset/field/meta', { groupIds: node.data.id }).then(response => { vm.$get('asset/field/meta', { groupIds: node.data.id, pageSize: -1 }).then(response => {
if (response.code === 200) { if (response.code === 200) {
const meta = response.data.list.map(item => ({ const meta = response.data.list.map(item => ({
...item, ...item,

10
nezha-fronted/src/components/page/config/assetMeta.vue
View File

@@ -135,7 +135,7 @@ export default {
id: '', id: '',
name: '', name: '',
metaKey: '', metaKey: '',
groupId: '', groupIds: '',
group: {}, group: {},
search: '0', search: '0',
display: '0', display: '0',
@@ -172,8 +172,8 @@ export default {
this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo) this.$set(this.searchLabel, 'pageNo', this.pageObj.pageNo)
this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize) this.$set(this.searchLabel, 'pageSize', this.pageObj.pageSize)
this.tools.loading = true this.tools.loading = true
if (!this.searchLabel.groupId) { if (!this.searchLabel.groupIds) {
delete this.searchLabel.groupId delete this.searchLabel.groupIds
} }
this.$get(this.url, this.searchLabel).then(response => { this.$get(this.url, this.searchLabel).then(response => {
this.tools.loading = false this.tools.loading = false
@@ -217,7 +217,7 @@ export default {
if (selectKey === group.id) { if (selectKey === group.id) {
this.showGroup = -1 this.showGroup = -1
this.searchLabel.groupId = '' this.searchLabel.groupIds = ''
this.getTableData() this.getTableData()
this.$refs.selectGroup.$refs.tree.setCurrentKey(this.showGroup) this.$refs.selectGroup.$refs.tree.setCurrentKey(this.showGroup)
} }
@@ -231,7 +231,7 @@ export default {
}, },
groupChange (item) { groupChange (item) {
this.showGroup = item this.showGroup = item
this.searchLabel.groupId = item.id !== -1 ? item.id : '' this.searchLabel.groupIds = item.id !== -1 ? item.id : ''
this.getTableData() this.getTableData()
}, },
add () { add () {