github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-17 15:52:32 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of github.com:jumpserver/lina into dev

Browse Source
This commit is contained in:
Bai
2020-06-15 17:08:11 +08:00
parent bf79d40c00 a0ca717aa2
commit ca34ef5ac9
4 changed files with 7 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/AutoDataZTree/index.vue
View File

@@ -209,6 +209,7 @@ export default {
if (!parentNode) { if (!parentNode) {
return return
} }
this.zTree.expandNode(parentNode, true, false, true, false)
// http://localhost/api/v1/assets/nodes/85aa4ee2-0bd9-41db-9079-aa3646448d0c/children/ // http://localhost/api/v1/assets/nodes/85aa4ee2-0bd9-41db-9079-aa3646448d0c/children/
const url = `${this.treeSetting.nodeUrl}${parentNode.meta.node.id}/children/` const url = `${this.treeSetting.nodeUrl}${parentNode.meta.node.id}/children/`
this.$axios.post(url, {}).then(data => { this.$axios.post(url, {}).then(data => {

12
src/views/assets/Asset/AssetDetail/Detail.vue
View File

@@ -130,11 +130,7 @@ export default {
items.map(v => { items.map(v => {
newData.push(v.value) newData.push(v.value)
}) })
return this.$axios.patch(relationUrl, { nodes: newData }).then(res => { return this.$axios.patch(relationUrl, { nodes: newData })
this.$message.success(this.$t('common.updateSuccessMsg'))
}).catch(err => {
this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
})
}, },
performDelete: (item) => { performDelete: (item) => {
const itemId = item.value const itemId = item.value
@@ -146,11 +142,7 @@ export default {
} }
}) })
const relationUrl = `/api/v1/assets/assets/${this.object.id}/` const relationUrl = `/api/v1/assets/assets/${this.object.id}/`
return this.$axios.patch(relationUrl, { nodes: newData }).then(res => { return this.$axios.patch(relationUrl, { nodes: newData })
this.$message.success(this.$t('common.updateSuccessMsg'))
}).catch(err => {
this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
})
} }
}, },
labelConfig: { labelConfig: {

12
src/views/assets/CommandFilter/CommandFilterDetail/Detail.vue
View File

@@ -55,11 +55,7 @@ export default {
items.map(v => { items.map(v => {
newData.push(v.value) newData.push(v.value)
}) })
return this.$axios.patch(relationUrl, { system_users: newData }).then(res => { return this.$axios.patch(relationUrl, { system_users: newData })
this.$message.success(this.$t('common.updateSuccessMsg'))
}).catch(err => {
this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
})
}, },
performDelete: (item) => { performDelete: (item) => {
const itemId = item.value const itemId = item.value
@@ -71,11 +67,7 @@ export default {
} }
}) })
const relationUrl = `/api/v1/assets/cmd-filters/${this.object.id}/` const relationUrl = `/api/v1/assets/cmd-filters/${this.object.id}/`
return this.$axios.patch(relationUrl, { system_users: newData }).then(res => { return this.$axios.patch(relationUrl, { system_users: newData })
this.$message.success(this.$t('common.deleteSuccessMsg'))
}).catch(err => {
this.$message.error(this.$t('common.deleteErrorMsg' + ' ' + err))
})
} }
} }
} }

12
src/views/assets/SystemUser/SystemUserDetail/AssetList.vue
View File

@@ -127,21 +127,13 @@ export default {
node: v.value node: v.value
} }
}) })
return this.$axios.post(relationUrl, data).then(res => { return this.$axios.post(relationUrl, data)
this.$message.success(this.$t('common.updateSuccessMsg'))
}).catch(err => {
this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
})
}, },
performDelete: (item) => { performDelete: (item) => {
const itemId = item.value const itemId = item.value
const objectId = this.object.id const objectId = this.object.id
const relationUrl = `/api/v1/assets/system-users-nodes-relations/?systemuser=${objectId}&node=${itemId}` const relationUrl = `/api/v1/assets/system-users-nodes-relations/?systemuser=${objectId}&node=${itemId}`
return this.$axios.delete(relationUrl).then(res => { return this.$axios.delete(relationUrl)
this.$message.success(this.$t('common.updateSuccessMsg'))
}).catch(err => {
this.$message.error(this.$t('common.updateErrorMsg' + ' ' + err))
})
} }
} }
} }