diff --git a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue index 56c63ac36..fe46264d4 100644 --- a/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/software/softwareAssetBox.vue @@ -21,9 +21,6 @@ - - - { + this.editSoftwareAsset.assetId = this.obj.assetId + '' + }, 500) }, methods: { clickOutside () { this.esc(false) }, iconActive (subItem) { - console.log(subItem, this.editSoftwareAsset.icon) if (this.editSoftwareAsset.icon === subItem.value) { this.editSoftwareAsset.icon = undefined this.$set(this.editSoftwareAsset, 'icon', '') @@ -299,7 +298,13 @@ export default { } params.params = {} params.paramObj.forEach(item => { - params.params[item.name] = item.value + if (item.type === 'CHECKBOX') { + params.params[item.name] = item.value + } else if (item.type === 'DATETIME' && JSON.parse(item.param).interval) { + params.params[item.name] = item.value + } else { + params.params[item.name] = item.value[0] + } }) params.icon = this.imageUrl if (this.editSoftwareAsset.id) { @@ -367,10 +372,15 @@ export default { const findItem = this.softwareTypeArr.find(item => item.id == this.editSoftwareAsset.typeId) if (findItem.params) { Object.keys(findItem.params).forEach(key => { - findItem.params[key].value = this.editSoftwareAsset.params[key] ? this.editSoftwareAsset.params[key].value : findItem.params[key].value + if (findItem.params[key].type === 'CHECKBOX') { + findItem.params[key].value = this.editSoftwareAsset.params[key] ? this.editSoftwareAsset.params[key] : findItem.params[key].value + } else if (findItem.params[key].type === 'DATETIME' && JSON.parse(findItem.params[key].param).interval) { + findItem.params[key].value = this.editSoftwareAsset.params[key] ? this.editSoftwareAsset.params[key] : findItem.params[key].value + } else { + findItem.params[key].value = this.editSoftwareAsset.params[key] ? [this.editSoftwareAsset.params[key]] : findItem.params[key].value + } this.editSoftwareAsset.paramObj.push(findItem.params[key]) }) - console.log(this.editSoftwareAsset.paramObj) } } } diff --git a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue index 938f77ccc..613f27a71 100644 --- a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue +++ b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue @@ -67,6 +67,9 @@ + {{scope.row[item.prop]}} -